From 2a35e771c2767040b70d5df07fabf9fc2b28e5c4 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 10 Apr 2015 12:48:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=8F=8A=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=9B=E6=A0=87=E7=AD=BE=E6=A8=A1=E5=9D=97=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E5=8F=8A=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_project_show.html.erb | 22 ++- app/views/issues/index.html.erb | 2 +- app/views/projects/files_tags.html.erb | 2 +- app/views/projects/settings/_modules.html.erb | 2 +- app/views/repositories/show.html.erb | 2 +- app/views/tags/_show_attachments.html.erb | 10 +- app/views/tags/_show_issues.html.erb | 2 +- .../tags/_show_open_source_projects.html.erb | 2 +- app/views/tags/show_all.html.erb | 2 +- app/views/welcome/contest.html.erb | 4 +- app/views/welcome/course.html.erb | 4 +- app/views/welcome/index.html.erb | 10 +- config/locales/commons/en.yml | 97 +++++----- config/locales/commons/zh.yml | 25 +-- config/locales/en.yml | 20 +-- config/locales/my/en.yml | 4 +- config/locales/navigatiors/en.yml | 35 ++-- config/locales/navigatiors/zh.yml | 5 +- config/locales/projects/en.yml | 166 ++++++++++-------- config/locales/projects/zh.yml | 22 ++- config/locales/zh.yml | 21 +-- 21 files changed, 250 insertions(+), 209 deletions(-) diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index e69fa2730..765cb2a65 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -10,7 +10,7 @@
<% if User.current.logged? %>
-

<%= l(:label_message_new) %>

+

<%= l(:project_module_boards_post) %>

<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'messages/form', :locals => {:f => f} %> @@ -39,12 +39,18 @@
-

<%= h @board.name %>

+

+ <% if User.current.language == "zh"%> + <%= h @board.name %> + <% else %> + <%= l(:project_module_boards) %> + <% end %> +

-
项目讨论区共有<%= @topic_count %>个帖子
+
<%= l(:label_project_board_count , :count => @topic_count)%>
<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %> - <%= link_to l(:label_message_new), new_board_message_path(@board), + <%= link_to l(:project_module_boards_post), new_board_message_path(@board), :class => 'problem_new_btn fl', :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> <% end %> @@ -61,15 +67,15 @@
<%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %> <% if topic.sticky? %> - 置顶 + <%= l(:label_board_sticky)%> <% end %>
- 由<%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %> - 添加于<%= format_time topic.created_on %> + <%= l(:label_post_by)%><%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %> +  <%= l(:label_post_by_time)%><%= format_time topic.created_on %>
- <%= link_to (l(:label_reply) + topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;" %> + <%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;line-height: 18px;" %>
<% end %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 012178ae2..682ff4c99 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -12,7 +12,7 @@ :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %> <% end %> - <%= l(:label_issues_sum) %>：<%= @project.issues.count %> <%= l(:lable_issues_undo) %> <%= @project.issues.where('status_id in (1,2,4,6)').count %> + <%= l(:label_issues_sum) %>：<%= @project.issues.count %> <%= l(:lable_issues_undo) %>：<%= @project.issues.where('status_id in (1,2,4,6)').count %>
<% if !@query.new_record? && @query.editable_by?(User.current) %> diff --git a/app/views/projects/files_tags.html.erb b/app/views/projects/files_tags.html.erb index f451a59f5..3e40d8d83 100644 --- a/app/views/projects/files_tags.html.erb +++ b/app/views/projects/files_tags.html.erb @@ -7,7 +7,7 @@

<%= l(:label_tags_search_result) %>

- <%= l(:label_tags_numbers) %> + <%= l(:label_tags_numbers) %>： <%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) | <%= l(:label_project_plural) %>(<%= @projects_tags_num %>) | <%= l(:label_user_plural) %>(<%= @users_tags_num %>) | diff --git a/app/views/projects/settings/_modules.html.erb b/app/views/projects/settings/_modules.html.erb index 7b8ff3e6e..77a7321ec 100644 --- a/app/views/projects/settings/_modules.html.erb +++ b/app/views/projects/settings/_modules.html.erb @@ -4,7 +4,7 @@ :method => :post} do |f| %>
-<%= l(:text_select_project_modules) %> +<%= l(:text_select_project_modules) %>： <% Redmine::AccessControl.available_project_modules.each do |m| %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 427ecddc1..df91056a0 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -1,6 +1,6 @@ <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-

版本库

+

<%=l(:project_module_repository)%>

<%= render :partial => 'navigation' %> diff --git a/app/views/tags/_show_attachments.html.erb b/app/views/tags/_show_attachments.html.erb index ca6a2dd7a..1c8224029 100644 --- a/app/views/tags/_show_attachments.html.erb +++ b/app/views/tags/_show_attachments.html.erb @@ -24,19 +24,19 @@    <%= file.description %>
- <%= l('attachment.category')%> + <%= l('attachment.category')%>： <%=result_come_from file%>
- <%= l('attachment.download_num')%> + <%= l('attachment.download_num')%>： <%= file.downloads%>| - <%= l('attachment.size')%> + <%= l('attachment.size')%>： <%= number_to_human_size(file.filesize) %>| - <%= l('attachment.sharer')%> + <%= l('attachment.sharer')%>： <%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %> | - <%= l('attachment.upload_time')%> + <%= l('attachment.upload_time')%>： <%= format_time(file.created_on) %>
diff --git a/app/views/tags/_show_issues.html.erb b/app/views/tags/_show_issues.html.erb index d02737e21..6a465a257 100644 --- a/app/views/tags/_show_issues.html.erb +++ b/app/views/tags/_show_issues.html.erb @@ -3,7 +3,7 @@
<% issues_results.each do |issue| %>

- <%= l(:label_tags_issue) %><%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %> + <%= l(:label_tags_issue) %>：<%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %>
<%= l(:label_tags_issue_description) %>：<%= textilizable issue.description %>

diff --git a/app/views/tags/_show_open_source_projects.html.erb b/app/views/tags/_show_open_source_projects.html.erb index 311863885..f255515b8 100644 --- a/app/views/tags/_show_open_source_projects.html.erb +++ b/app/views/tags/_show_open_source_projects.html.erb @@ -4,7 +4,7 @@ <% projects_results.each do |prj| %>

- <%= l(:label_tags_project_name) %><%= link_to "#{prj.name}",:controller => "open_source_projects",:action => "show",:id => prj.id %> + <%= l(:label_tags_project_name) %>：<%= link_to "#{prj.name}",:controller => "open_source_projects",:action => "show",:id => prj.id %>
<%= l(:label_tags_project_description) %><%= textilizable prj.short_description %>

diff --git a/app/views/tags/show_all.html.erb b/app/views/tags/show_all.html.erb index e906c9dd9..58fe1fb1f 100644 --- a/app/views/tags/show_all.html.erb +++ b/app/views/tags/show_all.html.erb @@ -1,5 +1,5 @@ <% content_for :content do %> -

<%= l(:label_tags_count) %><%= @tags.size %>个

+

<%= l(:label_tags_count) %>：<%= @tags.size %>个

<% i = 0 %>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 9bf0d3b9d..ab79eeec7 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -277,11 +277,11 @@ <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %> - <%=l(:label_question_sponsor)%>: <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> + <%=l(:label_question_sponsor)%> <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %> - <%=l(:label_final_reply)%>:  + <%=l(:label_final_reply)%>  <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%> <% end %> diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index dc4679b14..91fa2110c 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -203,12 +203,12 @@ <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %> - <%= l(:label_question_sponsor)%>： + <%= l(:label_question_sponsor)%> <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %> - <%= l(:label_final_reply)%>： + <%= l(:label_final_reply)%> <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%> <% end %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index ba0002eff..dc8ef7f35 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -44,7 +44,11 @@
<% if @organization.nil? %> <% unless @first_page.nil? %> - <%= @first_page.description.html_safe %> + + <%= l(:label_welcome_trustie_project)%>,  + <%= l(:label_welcome_trustie_project_description)%> <% end %> <% else %> @@ -132,12 +136,12 @@ <%= format_time topic_last_time topic %> - <%= l(:label_question_sponsor)%>： + <%= l(:label_question_sponsor)%> <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %> - <%= l(:label_final_reply)%>： + <%= l(:label_final_reply)%> <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%> <% end %> diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml index 0de058a0f..806e52720 100644 --- a/config/locales/commons/en.yml +++ b/config/locales/commons/en.yml @@ -176,16 +176,16 @@ en: label_loading: Loading... - label_create_time: Created time - label_update_time: Update time + label_create_time: Created at + label_update_time: Update at label_reply: Reply label_anonymous: Anonymous #作业和留言 模块 text_are_you_sure: Are you sure? #js 提示 - text_are_you_sure_out: 你确定要退出该课程吗？ - text_are_you_sure_out_group: 你确定要退出该分班吗？ + text_are_you_sure_out: Are you sure to quit from this course? + text_are_you_sure_out_group: Are you sure to quit from this group? @@ -225,9 +225,9 @@ en: # # button_upload_photo: Upload photo - button_delete_file: delete - error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})" - error_pic_type: "Only supports the following image formats:" + button_delete_file: Delete + error_attachment_too_big: "Cannot be uploaded when exceeding (%{max_size})" + error_pic_type: "Only supports the following image formats: " # @@ -240,47 +240,47 @@ en: label_more_tags: More label_add_tag: "+ Add tags" - label_tags_count: "The total number of tags：" + label_tags_count: "Total number of tags" label_tags_selected: Selected Tags label_tags_related: Related Tags label_tags_search_result: Search Results - label_tags_numbers: "Tag numbers：" + label_tags_numbers: "Tags" label_tags_call: Calls - label_tags_contest: Competition tag - label_tags_opensource: Open source projects + label_tags_contest: Competitions + label_tags_opensource: Projects - label_tags_all_objects: all objects + label_tags_all_objects: All objects - label_tags_bid: Call name - label_tags_bid_description: call description + label_tags_bid: Name + label_tags_bid_description: Description - label_tags_course_name: Course Title + label_tags_course_name: Title label_new_course_description: Description - label_tags_issue: "issue：" - label_tags_issue_description: issue description + label_tags_issue: Issue + label_tags_issue_description: Description - label_tags_project_name: "Project name：" - label_tags_project_description: "Project description：" + label_tags_project_name: "Project name" + label_tags_project_description: "Description" label_tags_user_mail: "User E-mail：" label_tags_user_name: "User Name：" - label_tags_contest_name: Contest name - label_tags_contest_description: Contest description + label_tags_contest_name: Name + label_tags_contest_description: Description - label_tags_forum_description: Forum description - label_tags_forum: Call forum + label_tags_forum_description: Description + label_tags_forum: Forum label_attachment: Files attachment: - category: "From：" - download_num: "Downloads:" - size: "Size:" - sharer: "Sharer：" - upload_time: "Upload time:" + category: "From" + download_num: "Downloads" + size: "Size" + sharer: "Sharer" + upload_time: "Upload time" # @@ -316,14 +316,18 @@ en: # "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}" # "缺陷 #1869 (已解决):subject" # tracker.name和status在数据库中以中文字段形式存储 - - # 项目托管平台主页 > 贴吧动态栏 - lable_bar_active: Question&Feedback - label_my_question: My-question - label_my_feedback: My-feedback + + # + # 项目托管平台主页 + # + # 贴吧动态栏 + # + lable_bar_active: Feedbacks + label_my_question: Ask + label_my_feedback: Comment label_updated_time: "Updated %{value} ago" - label_question_sponsor: Sponsor - label_final_reply: Last-reply + label_question_sponsor: Created by + label_final_reply: Updated by # @@ -334,17 +338,30 @@ en: label_feedback: Feedback label_feedback_tips: "Anything you want to say， roar it here ~~" label_technical_support: "Support: " - label_feedback_success: "Your comments have been posted back to the bar of discussion by newbie(in the Public Post Bar), we will be the first time to solve your problem, thanks for your support!" - label_feedback_value: "The posts comes from user feedback！" + label_feedback_success: "Your comments have been sent to the public bar in the home page, thanks for your support!" + label_feedback_value: "The post comes from user feedback box!" + + # + # + # + # 评论 + # + label_find_all_comments: view all comments + label_comments_count: + zero: "(%{count} comment)" + one: "(%{count} comment)" + other: "(%{count} comments)" + + + - # # Trustie # # 新闻 # - label_news: 新闻 - + label_news: News + label_news_description: Track the latest activities of projects, and obtain the latest information！ # # Trustie diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index c7d025f28..8219d4445 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -244,12 +244,12 @@ zh: label_more_tags: 更多 label_add_tag: "+ 添加标签" - label_tags_count: "总标签数：" + label_tags_count: "总标签数" label_tags_selected: 已选标签 label_tags_related: 相关标签 label_tags_search_result: 搜索结果 - label_tags_numbers: "Tag统计：" + label_tags_numbers: "Tag统计" label_issue_plural: 问题跟踪 label_project_plural: 项目列表 @@ -270,11 +270,11 @@ zh: label_tags_course_name: 课程名称 label_new_course_description: 课程描述 - label_tags_issue: "问题名称：" + label_tags_issue: "问题名称" label_tags_issue_description: 问题描述 label_tags_project_name: "项目名称：" - label_tags_project_description: "项目描述：" + label_tags_project_description: "项目描述" label_tags_user_mail: "用户邮箱：" label_tags_user_name: "用户名：" @@ -287,11 +287,11 @@ zh: label_attachment: 文件 attachment: - category: "所属分类：" - download_num: "下载:" - size: "大小:" - sharer: "共享者：" - upload_time: "上传时间:" + category: "所属分类" + download_num: "下载" + size: "大小" + sharer: "共享者" + upload_time: "上传时间" # # 项目托管平台主页 @@ -355,7 +355,10 @@ zh: # 评论 # label_find_all_comments: 查看所有评论 - label_comments_count: (%{count}条评论) + label_comments_count: + zero: (%{count}条评论) + one: (%{count}条评论) + other: (%{count}条评论) # # @@ -363,7 +366,7 @@ zh: # 新闻 # label_news: 新闻 - + label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！ # # diff --git a/config/locales/en.yml b/config/locales/en.yml index f5e0fc63d..445c0b2e6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -570,10 +570,7 @@ en: label_copied: copied label_renamed: renamed label_deleted: deleted - label_latest_revision: Latest revision - label_latest_revision_plural: Latest revisions - label_view_revisions: View revisions - label_view_all_revisions: View all revisions + label_sort_highest: Move to top label_sort_higher: Move up label_sort_lower: Move down @@ -637,7 +634,7 @@ en: label_board_new: New forum label_board_plural: Forums label_board_locked: Locked - label_board_sticky: Sticky + label_topic_plural: Topics field_sticky: '' field_locked: '' @@ -654,7 +651,7 @@ en: label_date_from: From label_date_to: To label_language_based: Based on user's language - label_sort_by: "Sort by %{value}" + label_send_test_email: Send a test email label_feeds_access_key: RSS access key label_missing_feeds_access_key: Missing a RSS access key @@ -971,9 +968,6 @@ en: label_delete_confirm: Confirm delete？ - label_exit_project: Exit Project - label_apply_project_waiting: "Application has been submitted, please wait for administrator review." - label_unapply_project: Unsubscribe #fq @@ -1029,9 +1023,8 @@ en: label_priority_as: Priority as label_author_name: Posted by %{author_name} - label_comments_count: (%{count} comments) label_post_on: posts on - label_find_all_comments: view all comments + label_updated_time_on: " Updated on %{value} " label_call_list: Calls list @@ -1082,8 +1075,7 @@ en: label_create_new_projects_description: Create a new project, you will open a magical journey of collaborative creation and development！ label_call_for_bids_description: Publish your call for anything, feel the excitement of hundreds respond to a single call！ label_create_course_description: Create a new course, let us share the public resources in the course community which are more than you can imagine！ - label_news: News - label_news_description: Track the latest activities of projects, and obtain the latest information！ + label_milestone: Milestone label_milestone_description: Review the commits, branches and versions of your project！ label_features: Features @@ -1124,7 +1116,7 @@ en: label_follow_no_requirement: You don't have followed any requirements！ - label_all_revisions: All revisions： + label_repository_name: Repository name label_upassword_info: The password can be shared in the group label_how_commit_code: How to commit code： diff --git a/config/locales/my/en.yml b/config/locales/my/en.yml index a1a3dd275..3933c61f1 100644 --- a/config/locales/my/en.yml +++ b/config/locales/my/en.yml @@ -13,9 +13,9 @@ en: label_location: Location label_identity: Identity # top_menu 个人相关 - label_my_course: My Course + label_my_course: My Courses label_my_message: Msgs - label_my_projects: My projectsed + label_my_projects: My Projects # diff --git a/config/locales/navigatiors/en.yml b/config/locales/navigatiors/en.yml index 52ee1a4a7..087f759e8 100644 --- a/config/locales/navigatiors/en.yml +++ b/config/locales/navigatiors/en.yml @@ -11,10 +11,10 @@ en: label_course_practice: Courses label_forum_all: Forums label_school_all: Schools - label_contest_innovate: Competition community + label_contest_innovate: Competitions label_software_user: Users # 删除 label_requirement_enterprise: Requirements # 删除 - label_stores_index: Resource search + label_stores_index: Search label_login: Login @@ -23,8 +23,8 @@ en: # # 主旨 # - label_welcome_trustie_project: Trustie online projects hosting platform - label_welcome_trustie_project_description: "Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange." + label_welcome_trustie_project: Trustie online projects hosting services + label_welcome_trustie_project_description: "Socialized research & development communities for distributed collaboration, resource sharing, code hosting and acitivity analysis." # @@ -32,8 +32,8 @@ en: # # 主旨 # - label_welcome_trustie_course: Trustie online courses practice platform - label_welcome_trustie_course_description: Teachers and Students for Chinese universities to provide social-oriented curriculum management, resource sharing, cooperation achieved, collaborative research. + label_welcome_trustie_course: "Trustie online course & practice hosting services" + label_welcome_trustie_course_description: "Socialized innovative practicing communities for classroom hosting, resource sharing, collaborative homeworking and ranking." # @@ -41,9 +41,8 @@ en: # # 主旨 # - label_welcome_trustie_contest: Trustie online contests practice platform - label_welcome_trustie_contest_description: Software for Chinese college students and practitioners to provide social-oriented contest management, code hosting, resource sharing, cooperation and exchange. - + label_welcome_trustie_contest: "Trustie online contest hosting services" + label_welcome_trustie_contest_description: "Socialized competition communities for contest management, demo destration and ranking." # # Trustie平台导航 @@ -53,7 +52,7 @@ en: label_search: Search welcome: search: - information: "Please input the keywords!" # 搜索提示信息 + information: "Please input the keywords :)" # 搜索提示信息 select: # 下拉列表 project: project course: course @@ -63,17 +62,17 @@ en: showname: name email: email - label_search_conditions_not_null: The search conditions cannot be blank - label_resources_search_all: "Search all files in the website, while will not search the contents of private items." # 资源搜索提示信息 + label_search_conditions_not_null: Search conditions cannot be blank + label_resources_search_all: "Search all public resources in the website." # 资源搜索提示信息 # # Trustie平台导航 # # 下方托管平台链接 # - label_projects_management_platform: Projects-platform - label_courses_management_platform: Courses-platform - label_contests_management_platform: Competitions-platform + label_projects_management_platform: Projects + label_courses_management_platform: Courses + label_contests_management_platform: Competitions # @@ -81,7 +80,7 @@ en: # # 各模块内导航 # - label_courses_community: Universities Curriculum Communities of Practice - label_projects_community: Software Project Communities of Hosting - label_contest_innovate_community: Innovation Communities of Competition + label_courses_community: Project hosting communities + label_projects_community: Course & practice hosting communities + label_contest_innovate_community: Innovative competition communities label_user_location: Location \ No newline at end of file diff --git a/config/locales/navigatiors/zh.yml b/config/locales/navigatiors/zh.yml index bfda10a85..76131a001 100644 --- a/config/locales/navigatiors/zh.yml +++ b/config/locales/navigatiors/zh.yml @@ -15,8 +15,8 @@ zh: label_forum_all: 公共贴吧 label_school_all: 中国高校 label_contest_innovate: 创新竞赛 - label_software_user: 软件创客 - label_requirement_enterprise: 软件众包 + #label_software_user: 软件创客 + #label_requirement_enterprise: 软件众包 label_stores_index: 资源搜索 label_login: 登录 @@ -26,6 +26,7 @@ zh: # # 主旨 # + label_welcome_trustie_project: Trustie在线项目托管平台 label_welcome_trustie_project_description: "面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。" diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 90d8f2e2b..724fb66cd 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -7,7 +7,6 @@ en: # # 公共类 # - label_apply_project: Apply Project label_project_new: New project label_join_project: Join a project @@ -17,13 +16,13 @@ en: # # 热门项目栏 # - lable_hot_projects: Hot Projects - label_private: private + lable_hot_projects: "Hot Projects" + label_private: "private" label_project_member_amount: one: "%{count} member" other: "%{count} members" - label_project_score_tips: "Considering all activities of the project, project's score reflects the activity level of project" - label_project_score: Score + label_project_score_tips: "The score reflects the workload of this project" + label_project_score: "Score" # @@ -33,27 +32,30 @@ en: # label_project_id: "Projcet ID:" - label_apply_project: "+Apply to Join" - label_exit_project: Exit - label_apply_project_waiting: "Application has been processed, please wait for administrator review." - label_unapply_project: Cancel the application + label_apply_project: "+Join" + label_button_following: "+Follow" + + label_exit_project: "Exit" + label_apply_project_waiting: "Application is sent, please wait for the response of the administrator." + label_unapply_project: "Cancel the application" + lable_sure_exit_project: "Are you sure exit from the projcet" - label_member: Members - project_module_attachments: Resources + label_member: "Members" + project_module_attachments: "Resources" label_invite: Invitation - label_invite_new_user: "Send e-mail to invite new user" + label_invite_new_user: "Send email to invite new user" label_invite_trustie_user: "Invite the Trustie registered user" - label_issue_tracking: Issues - label_release_issue: New Issue + label_issue_tracking: "Issues" + label_release_issue: "New Issue" - project_module_boards: Forums - project_module_boards_post: New Post - project_module_files: Resources - label_upload_files: New File - project_module_repository: Repository - project_module_create_repository: New Repository + project_module_boards: "Forums" + project_module_boards_post: "New Post" + project_module_files: "Resources" + label_upload_files: "New Resource" + project_module_repository: "Repositories" + project_module_create_repository: "New Repository" label_project_more: More project_module_news: News @@ -66,8 +68,8 @@ en: label_project_tool_response: Feedback project_module_dts: DTS Test Tool - label_project_overview: "Profile:" - label_expend_information: More Information + label_project_overview: "Description:" + label_expend_information: More # @@ -106,20 +108,21 @@ en: # 资源库（附件）公用 label_relation_files: Select an existing resource label_search_by_keyword: "Search by keywords" - label_files_filter: "Filter Files:" + label_files_filter: Filter - attachment_all: "All" - attachment_browse: "By Attachment Content " - attachment_sufix_browse: "By Attachment Type " + attachment_all: All + attachment_browse: By Content + attachment_sufix_browse: By Type label_unknow_type: Unknow type field_filename: File field_filesize: Size field_filecontenttype: Content - field_filetype: File Typ + field_filetype: File Type field_downloads: Downloads - field_file_dense: Dense - + field_file_dense: Scope + label_sort_by: "Sort by %{value}" + # 资源库（附件）公用 > 上传文件 label_attachment_new: New file field_version: Version @@ -130,14 +133,14 @@ en: label_max_size: Maximum size label_optional_description: Description - label_file_count: "files were uploaded successfully" + label_file_count: "Uploaded successfully" # # 项目托管平台 # # 问题跟踪 - label_issues_sum: 'Total' - lable_issues_undo: 'Unresolved：' + label_issues_sum: "Total" + lable_issues_undo: "Unresolved" label_successful_create: Successfully created label_query: Custom query label_issue_new: New issue @@ -205,7 +208,14 @@ en: # 项目讨论区 # - + label_project_board_count: + zero: Displaying Topic(%{count} total) + one: Displaying Topic(%{count} total) + other: Displaying Topics(%{count} total) + label_board_sticky: Sticky + label_post_by: "Started by " + label_post_by_time: "on " + label_short_reply: "RE:" # # 项目托管平台 # @@ -218,23 +228,27 @@ en: # # 版本库 # - + lael_all_revisions: All revisions： + label_latest_revision: Latest revision + label_latest_revision_plural: Latest revisions + label_view_revisions: View revisions + label_view_all_revisions: View all revisions # # 项目托管平台 # # 项目配置 # - label_module_plural: Modules - label_version_plural: Versions - label_issue_category_plural: Issue categories - label_repository_plural: Repositories - enumeration_activities: Activities + label_module_plural: Tool + label_version_plural: Version + label_issue_category_plural: Issue type + label_repository_plural: Repository + enumeration_activities: Activity type - text_select_project_modules: "Select modules to enable for this project:" + text_select_project_modules: "Select tools to enable for this project" project_module_issue_tracking: Issue tracking project_module_time_tracking: Time tracking - project_module_course: 课程 + #project_module_course: 课程 project_module_boards: Forums # @@ -242,21 +256,19 @@ en: # # 邀请 # - label_invite_new_user: "Send email to invite users" - label_invite_join: Invite - label_invite_email_tips: Enter the email address, Trustie will automatically register a user for the email address! - notice_registed_error: Email address is blank or has been registered! - label_input_email_blank: Email address is blank! - label_email_format_error: Email format is incorrect! - label_send_email: Send - label_input_email: Please input email address - - label_invite_trustie_user: "Invite Trustie registered users" - label_invite_trustie_user_tips: "Type nickname to find users" - label_user_role_null: User and Role can not be blank！ + label_invite_join: "Invite" + label_invite_email_tips: "Enter the email address, Trustie will send invitation mail to the user!" + notice_registed_error: "Email address is blank or has been registered!" + label_input_email_blank: "Email address is blank!" + label_email_format_error: "Email format is incorrect!" + label_send_email: "Send" + label_input_email: "Please input email address" + + label_invite_trustie_user_tips: "Type to find users" + label_user_role_null: "User and Role can not be blank！" label_invite_project: "invites you to join the project" - label_invite_success: Successful invitation - label_invite_members: Invite + label_invite_success: "Invitation is successfully sent out!" + label_invite_members: "Invite" # @@ -264,17 +276,17 @@ en: # # 新建项目/项目配置 >信息 # - label_project_new_description: "A project can be used to do anything that requires distributed collaboration." - field_name: Name - field_description: Description - field_identifier: Identifier - field_enterprise_name: Enterprise + label_project_new_description: "A project is used for distributed collaboration." + field_name: "Name" + field_description: "Description" + #field_identifier: Identifier + field_enterprise_name: "Organization" label_organization_choose: "- Please select an organization -" text_length_between: "Length between %{min} and %{max} characters." text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.
Once saved, the identifier cannot be changed." - field_is_public: Public - field_hidden_repo: code protected + field_is_public: "Public" + field_hidden_repo: "Private repository" @@ -286,33 +298,33 @@ en: project: join: title: Quickly Join to Project - description: "Just hold the project ID, while you can quickly apply to join the project.Private projects can only join by this channel!" + description: "Input the project ID, then you can quickly apply to join the project. Private projects can only join by this way!" id: label: "Project ID:" - tips: "Project ID is the number within project URL" + tips: "Project ID is the unique number for each project" # # 项目托管平台 # # 项目得分 # - label_projects_score: Project Total Score + label_projects_score: "Total Score" - label_issue_score: Issue Score - label_issue_number: issues - label_issue_journal_number: messages of issue + label_issue_score: "Issue Score" + label_issue_number: "issues" + label_issue_journal_number: "messages of issue" - label_news_score: News Score - label_new_number: news + label_news_score: "News Score" + label_new_number: "news" - label_file_score: Document Scores - label_file_number: documents + label_file_score: "Document Score" + label_file_number: "documents" - label_code_submit_score: Code Commit Score - label_code_submit_number: commit code frequency + label_code_submit_score: "Code Commit Score" + label_code_submit_number: "commit code frequency" - label_topic_score: Forum Score - label_topic_number: posts + label_topic_score: "Forum Score" + label_topic_number: "posts" @@ -320,7 +332,7 @@ en: # # 项目托管平台 # - # 项目得分 + # 项目配置 # label_approve: Approve label_refusal: Refusal \ No newline at end of file diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 5a845c4d4..4c04063f2 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -52,7 +52,7 @@ zh: project_module_boards: 讨论区 - project_module_boards_post: 发帖 + project_module_boards_post: 发布新帖 project_module_files: 资源库 project_module_repository: 版本库 project_module_create_repository: 创建版本库 @@ -120,12 +120,13 @@ zh: field_filetype: 文件格式 field_file_dense: 是否公开 field_downloads: 下载次数 + label_sort_by: "根据 %{value} 排序" attachment_sufix_browse: "文件类型" attachment_browse: "内容类型" attachment_all: "全部" label_unknow_type: 未知类型 - + # 资源库（附件）公用 > 上传文件 label_attachment_new: 新建文件 field_version: 版本 @@ -256,8 +257,17 @@ zh: # # 项目讨论区 # - + label_user_login_project_board: 您还没有登录，请登录后参与项目讨论 + + label_project_board_count: + zero: 项目讨论区共有%{count}个帖子 + one: 项目讨论区共有%{count}个帖子 + other: 项目讨论区共有%{count}个帖子 + label_board_sticky: 置顶 + label_post_by: 由 + label_post_by_time: 添加于 + label_short_reply: "回复" # # 项目托管平台 # @@ -270,7 +280,11 @@ zh: # # 版本库 # - + label_all_revisions: "所有版本：" + label_latest_revision: 最近的修订版本 + label_latest_revision_plural: 最近的修订版本 + label_view_revisions: 查看修订 + label_view_all_revisions: 查看所有修订 # # 项目托管平台 # diff --git a/config/locales/zh.yml b/config/locales/zh.yml index dad1def81..76b7f998d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -474,7 +474,7 @@ zh: label_activities_settings: 显示设置 label_user_login_course_board: 您还没有登录，请登录后参与课程讨论 - label_user_login_project_board: 您还没有登录，请登录后参与项目讨论 + label_user_login_attending_contest: 您还没有登录，请登录后参赛 label_user_login_score_and_comment: 您还没有登录，请登录后对作品进行打分评价 label_user_login_notificationcomment: 您还没有登录，请登录后参加评论 @@ -710,7 +710,7 @@ zh: label_board_new: 新建讨论区 label_board_plural: 讨论区 label_board_locked: 锁定 - label_board_sticky: 置顶 + field_sticky: '' field_locked: '' field_lock: '' @@ -727,7 +727,7 @@ zh: label_date_from: 从 label_date_to: 到 label_language_based: 根据用户的语言 - label_sort_by: "根据 %{value} 排序" + label_send_test_email: 发送测试邮件 label_feeds_access_key: RSS存取键 label_missing_feeds_access_key: 缺少RSS存取键 @@ -1330,7 +1330,7 @@ zh: label_create_new_projects_description: 创建项目，让我们开启一次神奇的协同创作和开发之旅！ label_call_for_bids_description: 发布需求，征集解决方案，体验一呼百应的兴奋感觉！ - label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！ + label_milestone_description: 在这里您可以看见任何一个版本的工程！ label_welcome: 欢迎 @@ -1347,12 +1347,7 @@ zh: label_course_homework: 发布了作业 label_follow_no_requirement: 暂未关注任何需求！ - label_tags_issue: 问题名称： - label_tags_project_name: 项目名称： - label_tags_project_description: 项目描述： - label_tags_user_mail: 用户邮箱： - label_tags_user_name: 用户名： - label_tags_numbers: Tag统计： + label_your_course: 您的课程《 label_have_message : 》有新的留言 label_all_revisions: 所有版本： @@ -1370,8 +1365,7 @@ zh: label_welcome_my_respond: 请在此留下你的意见和建议！ label_course_feedback: 留言 - label_tags_search_result: 搜索结果 - label_tags_call: 需求 + label_user_extensions: 其他信息 label_boy: 男 @@ -1698,8 +1692,7 @@ zh: label_forum: 公共贴吧 label_forum_new: 新建贴吧 label_forum_set: 贴吧设置 - label_tags_forum_description: 贴吧描述 - label_tags_forum: 贴吧名称 + label_project_module_forums: 公共贴吧 label_memo_locked: 帖子已被锁定 label_downloads_list: 进入附件列表 From 1fae44b2013c2e053af9dd435ffcbffe4e744a40 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 10 Apr 2015 13:21:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users.html.erb | 2 +- .../master_apply.html.erb | 1 + app/views/projects/show.html.erb | 2 +- app/views/tags/index.html.erb | 2 +- app/views/users/_user_show.html.erb | 1 + app/views/users/show.html.erb | 4 +- app/views/users/user_fanslist.html.erb | 1 + config/locales/projects/en.yml | 4 +- config/locales/users/en.yml | 79 ++++++++++--------- 9 files changed, 50 insertions(+), 46 deletions(-) diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 3f603368a..651067475 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -173,7 +173,7 @@ @@ -215,7 +215,7 @@ <%= l(:label_new_activity) %>   - <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> + <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index f16e6d397..aa7a3155e 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -30,6 +30,7 @@

<% user_courses = user_courses_list(user) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %> + <%= "：" unless user_courses.empty? %> <% for course in user_courses %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %> <% end %> diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 724fb66cd..db2aa7801 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -94,8 +94,8 @@ en: # label_followers: Followers label_contribute_to: - one: "Participates %{count} project—" - other: "Participates %{count} projects—" + one: "Participates %{count} project" + other: "Participates %{count} projects" # diff --git a/config/locales/users/en.yml b/config/locales/users/en.yml index c68087efa..c96ff45b2 100644 --- a/config/locales/users/en.yml +++ b/config/locales/users/en.yml @@ -24,23 +24,23 @@ en: # # 左边栏 # - label_user_edit: Edit information - label_user_grade: Individual score + label_user_edit: Edit + label_user_grade: Score - label_user_score: Individual synthetic score - label_user_score_of_influence: Influence score - label_user_score_of_collaboration: Collaborative score - label_user_score_of_skill: Skill score - label_user_score_of_active: Project score + label_user_score: Total + label_user_score_of_influence: Influence + label_user_score_of_collaboration: Collaboration + label_user_score_of_skill: Skill + label_user_score_of_active: Workload userscore: collaboration: - memos: The number of Posts - message_for_issues: The number of messages to issues - issue_status: Times of change the issue state - reply_for_messages: The number of replies to messages - reply_for_memos: The number of replies to posts + memos: Posts + message_for_issues: Comments to issues + issue_status: Changes to issues + reply_for_messages: Replies to messages + reply_for_memos: Replies to posts influence: - followers: Followers + followers: Fans skill: tramples: 踩别人的帖子数量 like: @@ -53,26 +53,26 @@ en: level3: 帖子被三级会员踩的次数 active: commit: - codes: 提交代码次数 - documents: 提交文档次数 - attachments: 提交附件次数 - update_issues: 更新缺陷完成度次数 - release_issues: 发布缺陷数量 + codes: Commits + documents: Documents + attachments: Attachments + update_issues: Updates of issue states + release_issues: Issues label_score_less_than_zero: Score less than 0, revised to 0 - label_user_info: User information - label_user_watcher: Followers - label_user_fans: Followed by + label_user_info: Information + label_user_watcher: Following + label_user_fans: Followed label_x_user_fans: zero: Fan one: Fan other: Fans - label_brief_introduction: Personality words - label_my_brief_introduction: "How are feeling today? Leave your footprints ~" + label_brief_introduction: Feeling words + label_my_brief_introduction: "How are feeling today? Leave some words ~~" - label_user_joinin: Join date + label_user_join: Join label_user_login: Last login label_technical_title: Title @@ -113,7 +113,7 @@ en: label_goto: "Go to»" - label_activity_project: "Project：" + label_activity_project: "Project" label_active_call: call label_active_homework: homework # 评论、评论数在commons模块下 @@ -136,11 +136,11 @@ en: label_about_issue: "about the issue—" label_about_requirement: "about requirement—" - label_have_respond: had a respond + label_have_respond: " had a respond" label_in_issues: "in the issue—" - label_no_user_respond_you: "There is no respond for you！" + label_no_user_respond_you: "No responses for you now:)" # end @@ -149,12 +149,12 @@ en: # # 项目栏 # - label_project_unadd: "No project, go to creat it!" + label_project_unadd: "No project, creat one!" label_project_un: "You haven't joined any project yet!" - label_has_watched_project: "The projects of attention" - label_project_take: "The projects of participation" + label_has_watched_project: "Followed projects" + label_project_take: "Joined projects" label_project_take_in: "joined the project—" @@ -163,9 +163,9 @@ en: # # 课程栏 # - label_project_course_un: "The user is not enrolled in any course yet. " - label_project_course_unadd: "You have no course,creat one now!" - label_project_cousre_studentun: "You have not joined any course, come and join now!" + label_project_course_un: "Not joined any course yet." + label_project_course_unadd: "You have no course,creat one now:)" + label_project_cousre_studentun: "No courses, come and join now!" user: courses: doing: Strating @@ -178,13 +178,13 @@ en: # 留言栏 # label_responses: Messages - label_user_response: Feedback + label_user_response: Comment label_leave_a_message: "Leave him/her a message" button_leave_meassge: Submit button_clear_meassge: Reset label_user_login_new: Login - label_user_login_tips: "You haven't logged in, please login first to leave a message!" + label_user_login_tips: "Log in before leave a message:)" label_bid_respond_delete: Delete label_bid_respond_quote: Respond @@ -205,12 +205,13 @@ en: # # Followers & Fans # + label_user_joinin: Join at label_x_contribute_to: zero: "participates %{count} project" - one: "participates %{count} project—" - other: "participates %{count} projects—" + one: "participates %{count} project" + other: "participates %{count} projects" label_x_course_contribute_to: zero: "participates %{count} course" - one: "participates %{count} course—" - other: "participates %{count} courses—" + one: "participates %{count} course" + other: "participates %{count} courses"

- <%= l(:label_user_joinin) %>： + <%= l(:label_user_join) %>： <%= format_time(@user.created_on) %> diff --git a/app/views/open_source_projects/master_apply.html.erb b/app/views/open_source_projects/master_apply.html.erb index f99701932..48e8d275d 100644 --- a/app/views/open_source_projects/master_apply.html.erb +++ b/app/views/open_source_projects/master_apply.html.erb @@ -64,6 +64,7 @@ <% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %> <% memberships = user.memberships.all(:conditions => cond) %> <%= l(:label_x_course_contribute_to, :count => memberships.count) %> + <%= "：" unless user_courses.empty? %> <% for member in memberships %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <% end %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index f38595302..4b899ac5c 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -93,7 +93,7 @@ <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> - <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> + <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb index ede20fd78..947366eeb 100644 --- a/app/views/tags/index.html.erb +++ b/app/views/tags/index.html.erb @@ -17,7 +17,7 @@

<%= l(:label_tags_search_result) %>

- <%= l(:label_tags_numbers) %> + <%= l(:label_tags_numbers) %>： <%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) | <%= l(:label_project_plural) %>(<%= @projects_tags_num %>) | <%= l(:label_user_plural) %>(<%= @users_tags_num %>) | diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb index d0c9e204b..4a503f651 100644 --- a/app/views/users/_user_show.html.erb +++ b/app/views/users/_user_show.html.erb @@ -42,6 +42,7 @@ <%# memberships = user.memberships.all(:conditions => cond) %> <% user_courses = user_courses_list(user) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %> + <%= "：" unless user_courses.empty? %> <% for course in user_courses %> <%# if course.name != nil %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b16c017a7..673e01d72 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -201,7 +201,7 @@ <%= l(:label_i_new_activity) %>   - <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> + <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>