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] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E6=A8=A1?=
 =?UTF-8?q?=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: 需求描述