From 48a0f2f40932c77e123ca8cc5cca3b7ce4f286fc Mon Sep 17 00:00:00 2001 From: wanglinchun <123@163.com> Date: Thu, 10 Oct 2013 17:06:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9B=B8=E5=85=B3=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 4 +- app/helpers/users_helper.rb | 8 +- app/helpers/watchers_helper.rb | 2 +- app/views/account/register.html.erb | 2 +- app/views/bids/_bid_show.html.erb | 2 +- app/views/bids/contest.html.erb | 2 +- app/views/bids/index.html.erb | 2 +- app/views/layouts/_base_header.html.erb | 4 +- app/views/layouts/base_courses.html.erb | 4 +- app/views/layouts/base_homework.html.erb | 2 +- app/views/my/account.html.erb | 20 ++-- app/views/projects/_new_join.html.erb | 7 +- app/views/projects/_project.html.erb | 8 +- app/views/users/_my_create_homework.html.erb | 2 +- app/views/users/_my_homework.html.erb | 2 +- config/locales/en.yml | 111 ++++++++++++++++++- config/locales/zh.yml | 64 +++++++++-- 17 files changed, 199 insertions(+), 47 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 7e6760bc2..e18aa8f2a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -207,9 +207,9 @@ module ProjectsHelper type = [] option1 = [] option2 = [] - option1 << '作业最终以附件形式提交' + option1 << l(:label_task_submit_form_accessory) option1 << 1 - option2 << '作业最终以项目形式提交' + option2 << l(:label_task_submit_form_project) option2 << 2 type << option1 type << option2 diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 14919d79a..1f1ae692d 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -97,13 +97,13 @@ module UsersHelper if @user.user_extensions.identity == 0 case state when 0 - s = content_tag('span', '我执教的课程', :class => "current-page") + s = content_tag('span', l(:label_teaching_course), :class => "current-page") content << content_tag('li', s) - content << content_tag('li', link_to('我发布的作业', {:controller => 'users', :action => 'user_courses', :type => 1})) + content << content_tag('li', link_to(l(:label_release_homework), {:controller => 'users', :action => 'user_courses', :type => 1})) content_tag('div', content, :class => "pagination") when 1 - s = content_tag('span', '我发布的作业', :class => "current-page") - content << content_tag('li', link_to('我执教的课程', {:controller => 'users', :action => 'user_courses'})) + s = content_tag('span', l(:label_release_homework), :class => "current-page") + content << content_tag('li', link_to(l(:label_teaching_course), {:controller => 'users', :action => 'user_courses'})) content << content_tag('li', s, :class => "current-page") content_tag('div', content, :class => "pagination") end diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index a42921300..38e917120 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -50,7 +50,7 @@ module WatchersHelper def join_in_course(course, user) return '' unless user && user.logged? joined = user.member_of?(course) - text = joined ? '退出课程 ' : '加入课程' + text = joined ? l(:label_exit_course) : l(:label_join_course) url_t = join_path(:object_id => course.id) url_f = try_join_path(:object_id => course.id) method = joined ? 'delete' : 'post' diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 140a748a4..1f877bbef 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -198,7 +198,7 @@ $('#enterprise').hide() $('#gender').show() var technical_titleOptions = new Array( - "教授","副教授","讲师","助教"); + "<%= l(:label_label_technicl_title_professor) %>","<%= l(:label_technicl_title_associate_professor) %>","<%= l(:label_technicl_title_lecturer) %>","<%= l(:label_technicl_title_teaching_assistant) %>"); break; case '1' : diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb index 5b9ed304f..af7edea87 100644 --- a/app/views/bids/_bid_show.html.erb +++ b/app/views/bids/_bid_show.html.erb @@ -29,7 +29,7 @@ <% unless bid.courses.empty? %> <% teacher = Course.find_by_extra(bid.courses.first.identifier).teacher %> - 课程名称：<%= link_to bid.courses.first.name, project_path(bid.courses.first)%>  教师：<%= link_to teacher.lastname+teacher.firstname, user_path(teacher) %> + <%= l(:label_bid_show_course_name) %>：<%= link_to bid.courses.first.name, project_path(bid.courses.first)%>  <%= l(:label_bid_show_teacher_name) %>：<%= link_to teacher.lastname+teacher.firstname, user_path(teacher) %> <% end %> <% end %> diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb index 5f5c5f5a7..51c6817ac 100644 --- a/app/views/bids/contest.html.erb +++ b/app/views/bids/contest.html.erb @@ -4,7 +4,7 @@ diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 4f696a18e..edcdb772e 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -7,8 +7,8 @@ <%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %> <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> - <%= content_tag('li', "#{link_to(l(:label_enterprise_college), :controller =>'projects', :action => 'course_enterprise', :project_type => 1 )}".html_safe, :id=> 'account-enterprise') %> - <%= content_tag('li', "#{link_to(l(:lable_college_enterprise), :controller => 'projects', :action =>'enterprise_course', :project_type => 0)}".html_safe, :id=> 'account-college') %> + <%= content_tag('li', "#{link_to(l(:label_enter_college), :controller =>'projects', :action => 'course_enterprise', :project_type => 1 )}".html_safe, :id=> 'account-enterprise') %> + <%= content_tag('li', "#{link_to(l(:lable_enter_enterprise), :controller => 'projects', :action =>'enterprise_course', :project_type => 0)}".html_safe, :id=> 'account-college') %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 35c36cee2..128f4bdaf 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -83,9 +83,9 @@ - + - +
- 竞赛列表 + <%= l(:label_contest_list) %> <% if User.current.logged? %> diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index 25208b824..3ef6c4772 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -5,7 +5,7 @@
<% if @project_type == '1' %> - 作业列表 + <%= l(:label_bids_task_list) %> <% else %> <%= l(:label_call_list)%> <% end %><%= link_to files_count, project_files_path(@project) %>
<%= "成员" %> <%= l(:label_x_base_courses_member, :count => @project.members.count) %><%= l(:label_course_data) %><%= l(:label_x_course_data, :count => files_count) %>
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 926126518..909661a00 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -63,7 +63,7 @@ <% unless @bid.parent_id.nil?%>
- 作业来源：<%= link_to(Bid.find(@bid.parent_id).name, respond_path(Bid.find(@bid.parent_id))) %>
+ <%= l(:label_homework_source) %>：<%= link_to(Bid.find(@bid.parent_id).name, respond_path(Bid.find(@bid.parent_id))) %> <% end %> diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index d516dd706..aa0c2fa7a 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -368,7 +368,7 @@ $().ready(function(){ $('#enterprise').hide() $('#gender').show() var technical_titleOptions = new Array( - "教授","副教授","讲师","助教"); + "<%= l(:label_technicl_title_professor) %>","<%= l(:label_technicl_title_associate_professor) %>","<%= l(:label_technicl_title_lecturer) %>","<%= l(:label_technicl_title_teaching_assistant) %>"); break; case '1' : @@ -419,10 +419,10 @@ $().ready(function(){

<%= l(:label_identity) %>

+ <%= submit_tag l(:label_new_join), :name => nil, :class => "bid_btn", :onclick => "hideModal(this);" %> <%= submit_tag l(:button_cancel), :name => nil, :class => "bid_btn", :onclick => "hideModal(this);", :type => 'button' %> diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index 0e27ace8f..405d945e8 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -44,17 +44,17 @@ <%= content_tag('span', @project.watcher_users.count, :class => "info") %><%= content_tag('span', l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>

- <%= content_tag('span', "#{@project.homeworks.count}", :class => "info") %><%= content_tag('span', l(:label_x_task, :count => @project.users.count)) %> + <%= content_tag('span', "#{@project.homeworks.count}", :class => "info") %><%= content_tag('span', l(:label_x_task, :count => @project.homeworks.count)) %>

- <%= content_tag('span', "#{@project.members.count}", :class => "info") %><%= content_tag('span', l(:label_x_member)) %> + <%= content_tag('span', "#{@project.members.count}", :class => "info") %><%= content_tag('span', l(:label_x_member, :count => @project.members.count)) %>

<% files_count = @project.attachments.count %> <% @project.versions.each do |version| %> <% files_count += version.attachments.count %> <% end %> - <%= content_tag('span', files_count, :class => "info") %><%= content_tag('span', l(:label_x_data)) %> + <%= content_tag('span', files_count, :class => "info") %><%= content_tag('span', l(:label_x_data,:count => files_count)) %>

@@ -76,7 +76,7 @@ <%= content_tag('a', @admin.collect{|u| link_to(u.user.lastname+u.user.firstname, user_path(u.user_id))}.join(", ").html_safe) %> <% end %> <% if(@project.project_type==1)%> -    大学： +    <%= l(:label_course_college) %>： <%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%> <%= @admin.first.user.user_extensions.occupation %> <% end %> diff --git a/app/views/users/_my_create_homework.html.erb b/app/views/users/_my_create_homework.html.erb index 79c631d56..2b92606a4 100644 --- a/app/views/users/_my_create_homework.html.erb +++ b/app/views/users/_my_create_homework.html.erb @@ -45,5 +45,5 @@ <% end %> <% else %> -

暂无任何作业

+

<%= l(:label_my_create_honework_no_homework) %>

<% end %> \ No newline at end of file diff --git a/app/views/users/_my_homework.html.erb b/app/views/users/_my_homework.html.erb index f34fed314..1d39bb21c 100644 --- a/app/views/users/_my_homework.html.erb +++ b/app/views/users/_my_homework.html.erb @@ -50,5 +50,5 @@ <% end %> <% else %> -

暂无任何作业

+

<%= l(:label_my_honework_no_homework) %>

<% end %> \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index e4f9941f2..e07bd5fee 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1340,7 +1340,7 @@ en: field_birthday: Birthday field_brief_introduction: Info field_location: Location - field_occupation: Occupation + field_occupation: Position field_work_experience: Work experience(year) field_zip_code: Zip code label_reward: reward： @@ -1356,6 +1356,7 @@ en: label_tags_related: Related Tags button_project_tags_add: Add label_issue_query_condition: Query condition + label_homework_source: Task label_issue_query: Query label_issue_cancel_query: Cancel query field_reward_type: The type of reward @@ -1426,9 +1427,111 @@ en: label_course_new: New course label_public_info: If you don't choose public, only the project's members can see the project. label_course_student: Student - label_homework: Homework + label_homework: Task label_course_new_homework: New homework label_course_homework_list: Homework List label_course_homework_new: new homework - label_course_data: Data - + + label_x_course_data: + zero: File + one: File + other: Files + #add by men + label_brief_introduction: Personality words + label_technical_title: Title + label_technicl_title_professor: Professor + label_technicl_title_associate_professor: Associate professor + label_technicl_title_lecturer: Lecturer + label_technicl_title_teaching_assistant: Teaching assistant + label_account_identity_teacher: Teacher + label_account_identity_student: Student + label_account_identity_developer: Developer + label_account_identity_enterprise: Enterprise + label_account_identity_choose: --Please choose your identity-- + label_enter_college: College Entrance + lable_enter_enterprise: Enterprise Entrance + label_homework_info: Status + label_question_student: Feedback + label_student_response: Feedback + label_my_question: Please raise your questions here！ + label_teacher_homework: Teacher's name + label_course_homework: Corresponding course + label_limit_time: Deadline + label_commit_homework: Submitted Task + label_no_course_project: No submitted work！ + button_clear_requirement: Cancel +#end + label_x_bids_responses: #modify by huang + zero: response + one: response + other: responses + #end + label_teaching_course: My Courses + label_release_homework: Released Tasks + label_term: Term + label_spring: spring term + label_summer: summer term + label_autumn: autumn term + label_winter: winter term + text_command: The password is required when applying a course, and it will be released by the teacher of. + label_enterprise_into: Enterprise Entrance + label_college_into: College Entrance + label_user_course: Courses + label_new_course: Courses + field_tea_name: Teacher + label_course_college: College + label_x_task: + zero: Task + one: Task + other: Tasks + label_project_course_unadd: You have no course,creat one now！ + label_my_create_honework_no_homework: no task now！ + label_my_homework_no_homework: no task now！ + label_x_member: + zero: member + one: member + other: members + label_x_data: + zero: file + one: file + other: files + label_bid_show_course_name: Course + label_bid_show_teacher_name: Teacher + label_bid_contest_show_course_name: Course + label_bid_contest_show_teacher_name: Teacher + label_x_homework_project: + zero: submitted task + one: submitted task + other: submitted tasks + label_new_homework: Tasks + label_new_contest: Contests + label_contest_list: Contests list + label_newtype_contest: Release contest + label_question_requirement: introduce a question！ + button_bidding_homework: To take part in contest + label_bids_form_contest_new_description: Enterprise or college can release a contest here. + label_contest_name: Input the name of the contest + label_contest_description: Content：description your contest + label_main_teacher: Main teacher + label_main_term: Term + label_teacher_work_unit: Position + label_course_overview: Status + label_course_file: File + label_course_news: News + + label_x_base_courses_member: + zero: member + one: member + other: members + + label_bids_task_list: Tasks list + label_join_course: join course + label_exit_course: exit course + label_new_join: Join + label_new_join_order: Please input the course order. + label_homeworks_form_new_description: Release a task,the submit form of the task may be accessory or project,setting in the task form. + label_course_settings: Setting + field_homework_type: Submit form + label_task_submit_form_accessory: Submitted as accessory + label_task_submit_form_project: Submitted as project + label_news_notice: Release course news diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 1678e35d3..e302272d2 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -218,7 +218,6 @@ zh: field_name: 名称 #added by huang field_tea_name: 教师 - field_location: 工作单位 field_couurse_time: 学时 field_course_code: 学分 field_state: 加入课程口令 @@ -530,9 +529,9 @@ zh: #end #by huang # modified by bai label_college: 高校进入 - label_enterprise_college: 进入高校 + label_enter_college: 进入高校 label_enterprise: 企业进入 - lable_college_enterprise: 进入企业 + lable_enter_enterprise: 进入企业 label_term: 学期 label_spring: 春季学期 label_summer: 夏季学期 @@ -608,7 +607,6 @@ zh: label_question_student: 学生反馈 #huang label_homework_commit: 提交作业 #huang label_homework_info: 作业情况 #huang - label_course_file: 资料下载 label_course_news: 课程通知 label_version: 版本 label_version_new: 新建版本 @@ -1552,7 +1550,12 @@ zh: label_course_homework_list: 作业列表 label_course_homework_new: 发布作业 label_fork_homework_new: 选为作业 - label_course_data: 资料 + + label_x_course_data: + zero: 资料 + one: 资料 + other: 资料 + label_homework_statistics: 作业统计 label_technical_title: 职称 @@ -1568,6 +1571,51 @@ zh: label_course_settings: 课程设置 #added by nie - label_x_task: 份作业 - label_x_member: 个成员 - label_x_data: 份资料 + label_x_task: + zero: 份作业 + one: 份作业 + other: 份作业 + label_x_member: + zero: 个成员 + one: 个成员 + other: 个成员 + label_x_data: + zero: 份资料 + one: 份资料 + other: 份资料 + + #add by men + label_technicl_title_professor: 教授 + label_technicl_title_associate_professor: 副教授 + label_technicl_title_lecturer: 讲师 + label_technicl_title_teaching_assistant: 助教 + label_account_identity_teacher: 教师 + label_account_identity_student: 学生 + label_account_identity_developer: 开发者 + label_account_identity_enterprise: 企业 + label_account_identity_choose: --请选择身份-- + label_teaching_course: 我执教的课程 + label_release_homework: 我发布的作业 + label_enterprise_into: 进入企业 + label_homework_source: 作业来源 + label_course_college: 大学 + label_my_create_honework_no_homework: 暂无任何作业 + label_my_homework_no_homework: 暂无任何作业 + label_bid_show_course_name: 课程名称 + label_bid_show_teacher_name: 教师 + label_bid_contest_show_course_name: 课程名称 + label_bid_contest_show_teacher_name: 教师 + label_contest_list: 竞赛列表 + + label_x_base_courses_member: + zero: 成员 + one: 成员 + other: 成员 + + label_bids_task_list: 作业列表 + label_join_course: 加入课程 + label_exit_course: 退出课程 + label_new_join: 加入 + label_new_join_order: 请输入课程密码 + label_task_submit_form_accessory: 作业最终以附件形式提交 + label_task_submit_form_project: 作业最终以项目形式提交 \ No newline at end of file