From 36554aa90a5795dd38107463d68c0ef077aa9205 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 17 Mar 2015 10:11:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?#2041=20=E9=A1=B9=E7=9B=AE--=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=B7=9F=E8=B8=AA=EF=BC=9A=E6=88=90=E5=8A=9F=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E7=BC=BA=E9=99=B7=E7=BB=99=E5=87=BA=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6a251a80c..da2855582 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -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?}

From 274295c948afe13fc5326283e3b932bbfffc1030 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 17 Mar 2015 14:55:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?#2033=20=E9=A1=B9=E7=9B=AE--=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A--=E6=96=B0=E9=97=BB=EF=BC=9A=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=96=B0=E9=97=BB=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form.html.erb  | 18 ++++++++++++++++++
 app/views/news/_form.html.erb         |  2 +-
 app/views/news/_project_show.html.erb |  4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 0949899dd..22dc447f2 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -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('&nbsp;'.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'>
diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb
index 5e5cdf532..024360597 100644
--- a/app/views/news/_form.html.erb
+++ b/app/views/news/_form.html.erb
@@ -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>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 874e89e1f..bde061f31 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -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>

From 50fe8f2bb77ddb7ca9f7993d52cb17694769c0b4 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Tue, 17 Mar 2015 15:06:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb  |  4 ++--
 config/locales/en.yml          |  7 ++-----
 config/locales/projects/en.yml | 22 ++++++++++++++++++++++
 config/locales/projects/zh.yml |  5 ++++-
 config/locales/zh.yml          |  9 ---------
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index db547061f..bd017757a 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -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
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cf37867b5..f0f953f11 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index 56177bea3..d3743a247 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -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  
+  
+  
   #   
   #  项目托管平台
   #
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index c70392171..2e6c06366 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -79,7 +79,10 @@ zh:
 
 
   text_select_project_modules: '请选择此项目可以使用的模块：'
-
+  project_module_issue_tracking: 问题跟踪
+  project_moule_boards_show: 项目论坛
+  project_module_time_tracking: 时间跟踪
+  project_module_course: 课程
   
   #   
   #  项目托管平台
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b040d0da5..73ea02114 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -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: 需求描述