Merge remote-tracking branch 'origin/szzh' into szzh
This commit is contained in:
commit
7b9c006d95
|
|
@ -162,7 +162,7 @@ class IssuesController < ApplicationController
|
|||
respond_to do |format|
|
||||
format.html {
|
||||
render_attachment_warning_if_needed(@issue)
|
||||
flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.source_from}", issue_path(@issue), :title => @issue.subject))
|
||||
flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.subject}", issue_path(@issue), :title => @issue.subject))
|
||||
#flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
|
||||
if params[:continue]
|
||||
attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ module CoursesHelper
|
|||
# 课程time+term简写（2014.春/2014.秋）国际化输出
|
||||
def get_course_term course
|
||||
strterm = course.try(:term).to_s
|
||||
if !(User.current.language == 'zh')
|
||||
if !(User.current.language == 'zh'||User.current.language == '')
|
||||
strterm == '春季学期' ? strterm = 'spring term' : strterm = 'autumn term'
|
||||
str = ( course.try(:time).to_s << '.' << strterm )
|
||||
str[0..-6]
|
||||
|
|
@ -369,7 +369,7 @@ module CoursesHelper
|
|||
# 课程term（春季学期/秋季学期）国际化输出
|
||||
def get_course_term_locales course
|
||||
str = course.try(:term).to_s
|
||||
if !(User.current.language == 'zh')
|
||||
if !(User.current.language == 'zh'||User.current.language == '')
|
||||
str == '春季学期' ? str = ' ' + 'spring term' : str = ' ' + 'autumn term'
|
||||
end
|
||||
return str
|
||||
|
|
|
|||
|
|
@ -1,5 +1,22 @@
|
|||
<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
|
||||
<% if defined?(container) && container && container.saved_attachments %>
|
||||
<% container.attachments.each_with_index do |attachment, i| %>
|
||||
<span id="attachments_p<%= i %>" class="attachment">
|
||||
<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
|
||||
<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
|
||||
<span class="ispublic-label"><%= l(:field_is_public)%>:</span>
|
||||
<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
|
||||
<%= if attachment.id.nil?
|
||||
#待补充代码
|
||||
else
|
||||
link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
|
||||
end
|
||||
%>
|
||||
<%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
|
||||
|
||||
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
|
||||
</span>
|
||||
<% end %>
|
||||
<% container.saved_attachments.each_with_index do |attachment, i| %>
|
||||
<span id="attachments_p<%= i %>" class="attachment">
|
||||
<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
|
||||
|
|
@ -17,6 +34,7 @@
|
|||
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
|
||||
</span>
|
||||
<% end %>
|
||||
|
||||
<% end %>
|
||||
</span>
|
||||
<script type='text/javascript'>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<%= error_messages_for @news %>
|
||||
.<%= error_messages_for @news %>
|
||||
<div class="add_frame_header" >
|
||||
<%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -72,9 +72,9 @@
|
|||
:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
|
||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
||||
<%#= submit_tag l(:button_save) %>
|
||||
<%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'whiteButton m3p10' %>
|
||||
<%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'ButtonColor m3p10' %>
|
||||
<%#= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %>
|
||||
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
|
||||
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'ButtonColor m3p10'%>
|
||||
<% end %>
|
||||
<div id="preview" class="wiki"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -329,10 +329,7 @@ en:
|
|||
permission_notificationcomment_contestnotifications: Add the notice of contest comments
|
||||
permission_upload_attachments: Uploading resource
|
||||
|
||||
project_module_issue_tracking: Issue tracking
|
||||
project_module_time_tracking: Time tracking
|
||||
project_module_files: Files
|
||||
project_module_boards: Forums
|
||||
|
||||
# edit by meng
|
||||
lable_hot_course: Hot Courses
|
||||
label_course_join_student: Join a course
|
||||
|
|
@ -896,7 +893,7 @@ en:
|
|||
text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s)?'
|
||||
text_issues_destroy_descendants_confirmation: "This will also delete %{count} subtask(s)."
|
||||
text_time_entries_destroy_confirmation: 'Are you sure you want to delete the selected time entr(y/ies)?'
|
||||
text_select_project_modules: 'Select modules to enable for this project:'
|
||||
|
||||
text_default_administrator_account_changed: Default administrator account changed
|
||||
text_file_repository_writable: Attachments directory writable
|
||||
text_plugin_assets_writable: Plugin assets directory writable
|
||||
|
|
|
|||
|
|
@ -66,6 +66,20 @@ en:
|
|||
label_expend_information: More Information
|
||||
|
||||
|
||||
#
|
||||
# 项目托管平台
|
||||
#
|
||||
# 问题跟踪
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# 项目托管平台
|
||||
#
|
||||
# 项目讨论区
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# 项目托管平台
|
||||
#
|
||||
|
|
@ -77,6 +91,14 @@ en:
|
|||
label_repository_plural: Repositories
|
||||
enumeration_activities: Activities
|
||||
|
||||
text_select_project_modules: "Select modules to enable for this project:"
|
||||
project_module_issue_tracking: Issue tracking
|
||||
project_module_time_tracking: Time tracking
|
||||
project_module_course: 课程
|
||||
project_module_files: Files
|
||||
project_module_boards: Forums
|
||||
|
||||
|
||||
#
|
||||
# 项目托管平台
|
||||
#
|
||||
|
|
|
|||
|
|
@ -79,7 +79,10 @@ zh:
|
|||
|
||||
|
||||
text_select_project_modules: '请选择此项目可以使用的模块：'
|
||||
|
||||
project_module_issue_tracking: 问题跟踪
|
||||
project_moule_boards_show: 项目论坛
|
||||
project_module_time_tracking: 时间跟踪
|
||||
project_module_course: 课程
|
||||
|
||||
#
|
||||
# 项目托管平台
|
||||
|
|
|
|||
|
|
@ -350,17 +350,9 @@ zh:
|
|||
permission_contest_attachments_download: 竞赛附件下载
|
||||
permission_upload_attachments: 资源上传
|
||||
|
||||
project_module_issue_tracking: 问题跟踪
|
||||
project_moule_boards_show: 项目论坛
|
||||
project_module_time_tracking: 时间跟踪
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
project_module_course: 课程
|
||||
|
||||
|
||||
label_user: 用户
|
||||
label_user_plural: 用户列表
|
||||
|
||||
|
|
@ -1276,7 +1268,6 @@ zh:
|
|||
label_followers: 关注
|
||||
|
||||
label_delete_confirm: 确认删除？
|
||||
label_more_tags: 更多
|
||||
label_tags_bid: 需求名称
|
||||
label_tags_course_name: 课程名称
|
||||
label_tags_bid_description: 需求描述
|
||||
|
|
|
|||
Loading…
Reference in New Issue