From 372de9932aa5537d50a35e4cd0f42298599f2610 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 11:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E5=AD=90=E7=AB=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb | 12 ++++++------
 config/locales/en.yml                   | 14 +++++++++++++-
 config/locales/zh.yml                   |  7 +++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index baf438cb2..d0ae0fbfb 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -7,12 +7,12 @@
 
    <!--gcm-->
    <p>
-    <span>主办单位:</span>
-    <span class="footer_text_link"><%= link_to "国防科学技术大学并行与分布处理国家重点实验室","http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
-    <span class="footer_text_link"><%= link_to "计算机科学与技术系", "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
-    <span id="copyright">版权@2007~2014</span>
-    <span id="contact_us" class="footer_text_link"><%= link_to "联系我们","http://forge.trustie.net/projects/2/member", :target=>"_blank" %></span>
-    <span id="record"class="footer_text_link"><%= link_to "湘ICP备09019772","http://www.miibeian.gov.cn/", :target => "_blank" %></span>
+    <span><%=l(:label_organizers)%></span>
+    <span class="footer_text_link"><%= link_to l(:label_organizers_information),"http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
+    <span class="footer_text_link"><%= link_to l(:label_organizers_information_institute), "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
+    <span id="copyright"><%=l(:label_copyright)%>@2007~2014</span>
+    <span id="contact_us" class="footer_text_link"><%= link_to l(:label_contact_us),"http://forge.trustie.net/projects/2/member", :target=>"_blank" %></span>
+    <span id="record"class="footer_text_link"><%= link_to l(:label_record),"http://www.miibeian.gov.cn/", :target => "_blank" %></span>
 
   </p>
   <div id="logo_link">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5421db83a..43c24d30b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1588,7 +1588,7 @@ en:
   label_user_location: Location
   label_requirement_enterprise: Requirements
   label_requirement_enterprise_list: Requirements List
-  label_contest_innovate: Competitions
+  label_contest_innovate: Competition community
   label_software_user: Users
   label_course_practice: Courses
   label_course_all: Teacher
@@ -1737,11 +1737,23 @@ en:
   label_search_intimation: please input the searching keywords!
   label_update_time: Update time
   label_project_notice: release the notice
+  label_no_file_uploaded: No file uploaded
+  label_forum_new: New forum
+  label_memo_new_from_forum: Release memo
   
   label_user_grade: Individual score
   label_active_homework: homework
   label_course_term: Semester
   label_comment_time: Comment time
+  label_bidding_user_studentcode: Student ID
+  
+  label_organizers: Organizer
+  label_organizers_information: National Key Laboratory of Parallel and Distributed Processing, NUDT
+  label_organizers_information_institute: Department of Computer Sciencer and Technology
+  label_copyright: Copyright
+  label_contact_us: Contact us
+  label_record: 湘ICP备09019772
+  
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f24d7467a..027fa726b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1980,6 +1980,13 @@ zh:
   label_projects_management_platform: 项目托管平台
   label_courses_management_platform: 课程实践平台
   label_contests_management_platform: 竞赛托管平台
+  
+  label_organizers: 主办单位
+  label_organizers_information: 国防科学技术大学并行与分布处理国家重点实验室
+  label_organizers_information_institute: 计算机科学与技术系
+  label_copyright: 版权
+  label_contact_us: 联系我们
+  label_record: 湘ICP备09019772
   #end  
 
   #end