diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f83580fba..4f84212b4 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -334,8 +334,7 @@ class ProjectsController < ApplicationController end def send_mail_to_member - - if !params[:mail].nil? && User.find_by_mail(params[:mail].to_s).nil? + if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil? email = params[:mail] Mailer.send_invite_in_project(email, @project, User.current).deliver @is_zhuce =false diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb index aace20e6c..9eff409ff 100644 --- a/app/helpers/files_helper.rb +++ b/app/helpers/files_helper.rb @@ -48,7 +48,7 @@ module FilesHelper def courses_check_box_tags(name,courses,current_course,attachment) s = '' courses.each do |course| - if !(attachment.container_type && attachment.container_id == course.id) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course) + if !course_contains_attachment?(course,attachment) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course) s << " [#{get_course_term course}]
" end end diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8c42298dd..4f5e10990 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -119,9 +119,14 @@ <% end %>
- <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project) %>） - | <%= l(:label_user_watcher) %>（<%= link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %>） - | <%= l(:project_module_attachments) %>（<%= link_to "#{@project.attachments.count}", project_files_path(@project) %>）
+ <%= l(:label_member) %>（ + <%= link_to "#{@project.members.count}", project_member_path(@project), :style => "color:#3CA5C6;font-weight:bold" %>） + | + <%= l(:label_user_watcher) %>（ + <%= link_to "#{@project.watcher_users.count}", :controller=>"projects", :action=>"watcherlist", :id => @project, :style => "color:#3CA5C6;font-weight:bold" %>） + | + <%= l(:project_module_attachments) %>（ + <%= link_to "#{@project.attachments.count}", project_files_path(@project), :style => "color:#3CA5C6;font-weight:bold" %>）
@@ -135,6 +140,7 @@ <% end %>
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> + (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index 70628094b..e0ba05f18 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -1,3 +1,12 @@ +

邀请加入

@@ -9,7 +18,7 @@

发送邮件邀请新用户

- 输入好友邮箱地址，Trustie帮您免费发送！ + 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！

<%= render :partial => 'regested', locals: { :isregisted => false} %> diff --git a/config/locales/account/en.yml b/config/locales/account/en.yml index ece7958b4..965272cd6 100644 --- a/config/locales/account/en.yml +++ b/config/locales/account/en.yml @@ -31,13 +31,13 @@ en: # lable_user_name: Username label_login_prompt: Email/Trustie account - label_stay_logged_in: "Keep me signed in" + label_stay_logged_in: "Remember me" label_password_lost: "Forget password？" button_login: Login # account_controller中判断用户名或密码输入有误的提示信息 notice_account_invalid_creditentials: "Invalid user or password." # account_controller中判断未激活的提示信息 - notice_account_invalid_creditentials_new: "Please check your email to activate your account." + notice_account_invalid_creditentials_new: "Please check your email to activate your account. Email verification helps our support team verify ownership if you lose account access and allows you to receive all the notifications you ask for. " # @@ -81,10 +81,10 @@ en: # # 激活 # - label_regiter_account: Registering for an account - label_email_valid: E-mail activation - notice_email_register_time: "Please click on the link in the email to continue to complete the registration within 24 hours" + label_regiter_account: Sign up for Trustie + label_email_valid: Email verification + notice_email_register_time: "Please click the link in verification email to complete the registration within 24 hours." notice_email_arrival: "An activation email has been sent to the email address you register." label_check_email: "Now check your email" - label_mail_resend: "Resend the activation email" + label_mail_resend: "Resend verification email" notice_account_activated: "Your Trustie account has been activated. You can now sign in." \ No newline at end of file diff --git a/config/locales/account/zh.yml b/config/locales/account/zh.yml index 243c95a29..97e6ae444 100644 --- a/config/locales/account/zh.yml +++ b/config/locales/account/zh.yml @@ -39,7 +39,7 @@ zh: # account_controller中判断用户名或密码输入有误的提示信息 notice_account_invalid_creditentials: "无效的用户名或密码" # account_controller中判断未激活的提示信息 - notice_account_invalid_creditentials_new: "您还未到邮箱激活" + notice_account_invalid_creditentials_new: "您还未到邮箱激活。如果您丢失帐户，电子邮件验证帮助我们的支持团队验证帐户的所有权，并允许您接收所有您要求的通知。" # @@ -84,7 +84,7 @@ zh: # label_regiter_account: 注册帐号 label_email_valid: 邮箱激活 - notice_email_register_time: 请在24小时内点击邮件中的链接继续完成注册 + notice_email_register_time: 请在24小时内点击邮件中的链接完成注册 notice_email_arrival: 邮件已发送到邮箱 label_check_email: 立即查收邮件 label_mail_resend: 重新发送激活邮件 diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml index 8d98552ed..5998ee875 100644 --- a/config/locales/commons/en.yml +++ b/config/locales/commons/en.yml @@ -188,7 +188,13 @@ en: label_anonymous: Anonymous #作业和留言 模块 text_are_you_sure: Are you sure? #js 提示 - + + + # 项目、课程、用户公用 + label_settings: Settings + label_information_plural: Information + label_member_plural: Members + # # Trustie按钮类 # diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 8febf8076..b06ec3a71 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -6,166 +6,6 @@ zh: direction: ltr jquery: locale: "zh-CN" - date: - formats: - # Use the strftime parameters for formats. - # When no format has been given, it uses default. - # You can provide other formats here if you like! - default: "%Y-%m-%d" - short: "%b%d日" - long: "%Y年%b%d日" - zh_date: - formats: - default: "%Y年%m月%d日" - - day_names: [星期天, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六] - abbr_day_names: [日, 一, 二, 三, 四, 五, 六] - - # Don't forget the nil at the beginning; there's no such thing as a 0th month - month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月] - abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月] - # Used in date_select and datime_select. - order: - - :year - - :month - - :day - - - errors: - messages: - email_verifier: - email_not_real: 必须指定一个真实的邮箱地址 - out_of_mail_server: 指向了一个已停用的邮箱服务器 - no_mail_server: 域名地址没有邮件功能 - failure: 邮箱地址不能被验证 - exception: 邮箱不能发送成功 - - - time: - formats: - default: "%Y年%b%d日 %A %H:%M:%S" - time: "%H:%M" - short: "%b%d日 %H:%M" - long: "%Y年%b%d日 %H:%M" - am: "上午" - pm: "下午" - - datetime: - distance_in_words: - half_a_minute: "半分钟" - less_than_x_seconds: - one: "1秒内" - other: "少于 %{count} 秒" - x_seconds: - one: "1秒" - other: "%{count} 秒" - less_than_x_minutes: - one: "1分钟内" - other: "少于 %{count} 分钟" - x_minutes: - one: "1分钟" - other: "%{count} 分钟" - about_x_hours: - one: "大约1小时" - other: "大约 %{count} 小时" - x_hours: - one: "1 小时" - other: "%{count} 小时" - x_days: - one: "1天" - other: "%{count} 天" - about_x_months: - one: "大约1个月" - other: "大约 %{count} 个月" - x_months: - one: "1个月" - other: "%{count} 个月" - about_x_years: - one: "大约1年" - other: "大约 %{count} 年" - over_x_years: - one: "超过1年" - other: "超过 %{count} 年" - almost_x_years: - one: "将近 1 年" - other: "将近 %{count} 年" - - number: - # Default format for numbers - format: - separator: "." - delimiter: "" - precision: 3 - human: - format: - delimiter: "" - precision: 3 - storage_units: - format: "%n %u" - units: - byte: - one: "Byte" - other: "Bytes" - kb: "KB" - mb: "MB" - gb: "GB" - tb: "TB" - - # Used in array.to_sentence. - support: - array: - sentence_connector: "和" - skip_last_comma: false - - activerecord: - errors: - template: - header: - one: "由于发生了一个错误 %{model} 无法保存" - other: "%{count} 个错误使得 %{model} 无法保存" - messages: - inclusion: "不包含于列表中" - exclusion: "是保留关键字" - invalid: "是无效的" - confirmation: "与确认值不匹配" - accepted: "必须是可被接受的" - empty: "不能留空" - blank: "不能为空字符" - too_long: "过长（最长为 %{count} 个字符）" - too_short: "过短（最短为 %{count} 个字符）" - wrong_length: "长度非法（必须为 %{count} 个字符）" - taken: "已经被使用" - not_a_number: "不是数字" - not_a_date: "不是合法日期" - greater_than: "必须大于 %{count}" - greater_than_or_equal_to: "必须大于或等于 %{count}" - equal_to: "必须等于 %{count}" - less_than: "必须小于 %{count}" - less_than_or_equal_to: "必须小于或等于 %{count}" - odd: "必须为单数" - even: "必须为双数" - greater_than_start_date: "必须在起始日期之后" - not_same_project: "不属于同一个项目" - circular_dependency: "此关联将导致循环依赖" - cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务" - groupname_repeat: "该班名已存在" - - attachment_all: "全部" - attachment_sufix_browse: "文件类型" - attachment_browse: "内容类型" - attachment_type: '分类' - general_text_No: '否' - general_text_Yes: '是' - general_text_no: '否' - general_text_yes: '是' - general_lang_name: 'Simplified Chinese (简体中文)' - general_csv_separator: ',' - general_csv_decimal_separator: '.' - general_csv_encoding: gb18030 - general_pdf_encoding: gb18030 - general_first_day_of_week: '7' - - actionview_instancetag_blank_option: 请选择 # @@ -194,6 +34,11 @@ zh: text_are_you_sure: 您确定要删除吗？ #js 提示 + # 项目、课程、用户公用 + label_settings: 配置 + label_information_plural: 信息 + label_member_plural: 成员 + # # Trustie按钮类 # diff --git a/config/locales/en.yml b/config/locales/en.yml index b9ddaa206..cf37867b5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -331,14 +331,8 @@ en: project_module_issue_tracking: Issue tracking project_module_time_tracking: Time tracking - project_module_news: News - project_module_documents: Documents project_module_files: Files - project_module_wiki: Wiki - project_module_boards: Forums - project_module_calendar: Calendar - project_module_gantt: Gantt - + project_module_boards: Forums # edit by meng lable_hot_course: Hot Courses label_course_join_student: Join a course @@ -382,8 +376,7 @@ en: label_commit_limit: Expired but can submit your work # steam the student label_current_group: Current group - # DTS Test tool - label_module_share: DTS Test tool + label_user_plural: Users @@ -438,7 +431,6 @@ en: label_role_non_member: Non member label_member: Members label_member_new: New member - label_member_plural: Members label_tracker: Tracker label_tracker_plural: Trackers label_tracker_new: New tracker @@ -447,15 +439,12 @@ en: label_issue_status_plural: Issue statuses label_issue_status_new: New status label_issue_category: Issue category - label_issue_category_plural: Issue categories label_issue_category_new: New category label_custom_field: Custom field label_custom_field_plural: Custom fields label_custom_field_new: New custom field label_enumerations: Enumerations label_enumeration_new: New value - label_information: Information - label_information_plural: Information label_please_login: Please log in label_home: Home label_my_page: My page @@ -513,7 +502,6 @@ en: label_overview: Activities label_version: Version label_version_new: New version - label_version_plural: Versions label_close_versions: Close completed versions label_confirmation: Confirmation label_export_to: 'Also available in:' @@ -613,7 +601,7 @@ en: label_repository_no: Have no repository？ label_repository_new_repos: New repository #end - label_repository_plural: Repositories + label_browse: Browse label_branch: Branch label_revision: Revision @@ -717,7 +705,6 @@ en: label_feeds_access_key: RSS access key label_missing_feeds_access_key: Missing a RSS access key label_feeds_access_key_created_on: "RSS access key created %{value} ago" - label_module_plural: Modules label_added_time_by: "Added by %{author} %{age} ago" label_updated_time_by: "Updated by %{author} %{age} ago" label_jump_to_a_project: Jump to a project... @@ -973,7 +960,6 @@ en: enumeration_issue_priorities: Issue priorities enumeration_doc_categories: Document categories - enumeration_activities: Activities enumeration_system_activity: System Activity description_filter: Filter description_search: Searchfield @@ -1213,7 +1199,6 @@ en: label_welcome_my_respond: Please leave your comments and suggestions here！ label_no_current_fans: The user has no fans now label_no_current_watchers: The user hasn't watched others - label_project_tool_response: Response label_course_feedback: Feedback @@ -1465,24 +1450,9 @@ en: label_issue_feedback_activities: Question&Feedback label_more_information: More... label_release_time: Release-time - label_question_sponsor: Sponsor - label_final_reply: Final-reply label_weixin: WeiXin - - - - # 项目托管平台 - - - - - - - - - label_work_quantity: work label_contest_work: Competition work @@ -1596,22 +1566,13 @@ en: label_bidding_user_studentname: name -# 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 - - - label_check_comment: Check comment label_notification: Notification label_must_answer: Will answer label_poll_title: The questionnaire survey _ questionnaire page label_question_number: 'question %{question_number}:' label_complete_question: The answer has been completed -#end + #end # ajax异步验证 modal_valid_passing: can be used. @@ -1642,8 +1603,6 @@ en: label_course_empty_select: You have not selected course！ label_enterprise_page_made: enterprise_page - label_add_tag: Add Tag - #api label_recently_updated_notification: Recently updated notification label_recently_updated_homework: Recently updated the homework diff --git a/config/locales/my/en.yml b/config/locales/my/en.yml index d2beaea97..6e17c3e62 100644 --- a/config/locales/my/en.yml +++ b/config/locales/my/en.yml @@ -26,8 +26,6 @@ en: label_my_account: My account label_my_photo: My photo - - label_information_plural: Information label_account_identity_teacher: Teacher label_account_identity_student: Student diff --git a/config/locales/my/zh.yml b/config/locales/my/zh.yml index 57c4ceac3..5a4a7c255 100644 --- a/config/locales/my/zh.yml +++ b/config/locales/my/zh.yml @@ -24,8 +24,6 @@ zh: label_my_account: 我的帐号 label_my_photo: 我的头像 - - label_information_plural: 信息 label_account_identity_choose: --请选择身份-- label_account_identity_teacher: 教师 diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 1ee904948..53791f2b8 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -52,10 +52,31 @@ en: project_module_repository: Repository project_module_create_repository: New Repository + + project_module_news: News + project_module_wiki: Wiki + project_module_code_review: Code Review + project_module_calendar: Calendar + project_module_gantt: Gantt + project_module_documents: Documents + label_project_tool_response: Response + label_module_share: DTS Test Tool + label_project_overview: "Profile:" label_expend_information: More Information + # + # 项目托管平台 + # + # 项目配置 + # + label_module_plural: Modules + label_version_plural: Versions + label_issue_category_plural: Issue categories + label_repository_plural: Repositories + enumeration_activities: Activities + # # 项目托管平台 @@ -66,7 +87,7 @@ en: field_name: Name field_description: Description field_identifier: Identifier - field_enterprise_name: Eterprise + field_enterprise_name: Enterprise 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." diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 952f6743b..64b0de952 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -15,11 +15,6 @@ zh: label_join_project: 加入项目 - - - - - # # 项目托管平台主页 # @@ -60,7 +55,6 @@ zh: project_module_repository: 版本库 project_module_create_repository: 创建版本库 - label_settings: 配置 project_module_news: 新闻 project_module_wiki: Wiki project_module_code_review: 代码审查 @@ -80,10 +74,13 @@ zh: # # 项目配置 # - - - - + label_module_plural: 模块 + label_version_plural: 版本 + label_issue_category_plural: 问题类别 + label_repository_plural: 版本库 + enumeration_activities: 活动（时间跟踪） + + # # 项目托管平台 # diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 1ceab9b28..82caa1a96 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -3,174 +3,10 @@ # by tsechingho (http://github.com/tsechingho) zh: - - - # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl) direction: ltr jquery: locale: "zh-CN" - date: - formats: - # Use the strftime parameters for formats. - # When no format has been given, it uses default. - # You can provide other formats here if you like! - default: "%Y-%m-%d" - short: "%b%d日" - long: "%Y年%b%d日" - zh_date: - formats: - default: "%Y年%m月%d日" - - day_names: [星期天, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六] - abbr_day_names: [日, 一, 二, 三, 四, 五, 六] - - # Don't forget the nil at the beginning; there's no such thing as a 0th month - month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月] - abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月] - # Used in date_select and datime_select. - order: - - :year - - :month - - :day - - - errors: - messages: - email_verifier: - email_not_real: 必须指定一个真实的邮箱地址 - out_of_mail_server: 指向了一个已停用的邮箱服务器 - no_mail_server: 域名地址没有邮件功能 - failure: 邮箱地址不能被验证 - exception: 邮箱不能发送成功 - - - time: - formats: - default: "%Y年%b%d日 %A %H:%M:%S" - time: "%H:%M" - short: "%b%d日 %H:%M" - long: "%Y年%b%d日 %H:%M" - am: "上午" - pm: "下午" - - datetime: - distance_in_words: - half_a_minute: "半分钟" - less_than_x_seconds: - one: "1秒内" - other: "少于 %{count} 秒" - x_seconds: - one: "1秒" - other: "%{count} 秒" - less_than_x_minutes: - one: "1分钟内" - other: "少于 %{count} 分钟" - x_minutes: - one: "1分钟" - other: "%{count} 分钟" - about_x_hours: - one: "大约1小时" - other: "大约 %{count} 小时" - x_hours: - one: "1 小时" - other: "%{count} 小时" - x_days: - one: "1天" - other: "%{count} 天" - about_x_months: - one: "大约1个月" - other: "大约 %{count} 个月" - x_months: - one: "1个月" - other: "%{count} 个月" - about_x_years: - one: "大约1年" - other: "大约 %{count} 年" - over_x_years: - one: "超过1年" - other: "超过 %{count} 年" - almost_x_years: - one: "将近 1 年" - other: "将近 %{count} 年" - - number: - # Default format for numbers - format: - separator: "." - delimiter: "" - precision: 3 - human: - format: - delimiter: "" - precision: 3 - storage_units: - format: "%n %u" - units: - byte: - one: "Byte" - other: "Bytes" - kb: "KB" - mb: "MB" - gb: "GB" - tb: "TB" - -# Used in array.to_sentence. - support: - array: - sentence_connector: "和" - skip_last_comma: false - - activerecord: - errors: - template: - header: - one: "由于发生了一个错误 %{model} 无法保存" - other: "%{count} 个错误使得 %{model} 无法保存" - messages: - inclusion: "不包含于列表中" - exclusion: "是保留关键字" - invalid: "是无效的" - confirmation: "与确认值不匹配" - accepted: "必须是可被接受的" - empty: "不能留空" - blank: "不能为空字符" - too_long: "过长（最长为 %{count} 个字符）" - too_short: "过短（最短为 %{count} 个字符）" - wrong_length: "长度非法（必须为 %{count} 个字符）" - taken: "已经被使用" - not_a_number: "不是数字" - not_a_date: "不是合法日期" - greater_than: "必须大于 %{count}" - greater_than_or_equal_to: "必须大于或等于 %{count}" - equal_to: "必须等于 %{count}" - less_than: "必须小于 %{count}" - less_than_or_equal_to: "必须小于或等于 %{count}" - odd: "必须为单数" - even: "必须为双数" - greater_than_start_date: "必须在起始日期之后" - not_same_project: "不属于同一个项目" - circular_dependency: "此关联将导致循环依赖" - cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务" - groupname_repeat: "该班名已存在" - - - actionview_instancetag_blank_option: 请选择 - - attachment_all: "全部" - attachment_sufix_browse: "文件类型" - attachment_browse: "内容类型" - attachment_type: '分类' - general_text_No: '否' - general_text_Yes: '是' - general_text_no: '否' - general_text_yes: '是' - general_lang_name: 'Simplified Chinese (简体中文)' - general_csv_separator: ',' - general_csv_decimal_separator: '.' - general_csv_encoding: gb18030 - general_pdf_encoding: gb18030 - general_first_day_of_week: '7' label_approve: 批准 label_refusal: 拒绝 @@ -181,7 +17,7 @@ zh: notice_successful_create: 创建成功 notice_successful_update: 更新成功 notice_successful_delete: 删除成功 - notice_registed_success: 该邮箱已被注册，请直接邀请注册用户 + notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! notice_failed_delete: 删除失败 notice_successful_connection: 连接成功 notice_successful_join: 加入成功 @@ -599,7 +435,6 @@ zh: label_groupname_repeat: 该班名已存在 label_limit_groupname_null: 班名不能为空 label_member_new: 添加成员 - label_member_plural: 成员 label_tracker: 跟踪标签 label_tracker_plural: 跟踪标签 label_tracker_new: 新建跟踪标签 @@ -608,15 +443,14 @@ zh: label_issue_status_plural: 问题状态 label_issue_status_new: 新建问题状态 label_issue_category: 问题类别 - label_issue_category_plural: 问题类别 + label_issue_category_new: 新建问题类别 label_custom_field: 自定义属性 label_custom_field_plural: 自定义属性 label_custom_field_new: 新建自定义属性 label_enumerations: 枚举值 label_enumeration_new: 新建枚举值 - label_information: 信息 - label_information_plural: 信息 + label_please_login: 请登录 label_login_with_open_id_option: 或使用OpenID登录 label_home: 主页 @@ -771,7 +605,7 @@ zh: label_course_board: 讨论区 label_version: 版本 label_version_new: 新建版本 - label_version_plural: 版本 + label_close_versions: 关闭已完成的版本 label_confirmation: 确认 label_export_to: 导出 @@ -853,7 +687,6 @@ zh: label_day_plural: 天 label_repository: 版本库 label_course_repository: 代码库 - label_repository_plural: 版本库 label_browse: 浏览 label_branch: 分支 label_tag: 标签 @@ -959,7 +792,6 @@ zh: label_feeds_access_key: RSS存取键 label_missing_feeds_access_key: 缺少RSS存取键 label_feeds_access_key_created_on: "RSS存取键是在 %{value} 之前建立的" - label_module_plural: 模块 label_added_time_by: "由 %{author} 在 %{age} 之前添加" label_added_time: "在 %{age} 之前添加" label_updated_time_by: "由 %{author} 更新于 %{age} 之前" @@ -1207,7 +1039,7 @@ zh: enumeration_issue_priorities: 问题优先级 enumeration_doc_categories: 文档类别 - enumeration_activities: 活动（时间跟踪） + enumeration_system_activity: 系统活动 field_warn_on_leaving_unsaved: 当离开未保存内容的页面时，提示我 @@ -2127,94 +1959,16 @@ zh: label_release_time: 发布时间 label_weixin: 微信扫码 - - - - # 项目托管平台 >新建项目 - label_project_new_description: '（项目为您和您的团队提供一个面向分布式协作的专有空间，可以设置为公开或私有。）' - field_name: 名称 - field_description: 描述 - field_identifier: 标识 - text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。" - text_project_identifier_info: "小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。
一旦保存，标识无法修改。" - field_is_public: 公开 - field_hidden_repo: 隐藏代码库 - button_create: 提交 - - # 项目托管平台 >加入项目 - - - - - - - # 课程托管平台 - # 课程托管平台主页 >主旨 - label_course_trustie: Trustie在线课程实践平台 - label_course_trustie_theme: ", 面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。" - # 课程托管平台主页 > - - - - - - # 竞赛托管平台 - # 竞赛托管平台主页 >主旨 - label_contest_trustie: Trustie在线竞赛实战平台 - label_contest_trustie_theme: ", 面向中国大学生与编程爱好者，提供社交化的竞赛管理、应用管理、代码托管、合作交流。" - # 竞赛托管平台主页 > - - - - - - # 邮件系统 - # 邮件 >激活邮件 - # edit by meng - # 邮件中文格式 - mail_issue_greetings: "亲爱的Trustie用户，您好！" - mail_issue_footer: "退订该邮件！" - mail_issue_title_userin: "在" - mail_issue_title_active: "中有了一个与您相关的最新活动，请您关注！" - mail_issue_subject: "标题：" - mail_issue_content: "内容：" - mail_issue_sent_from: "来源：" - mail_issue_from_project: "项目问题跟踪" - mail_issue_attachments: "附件：" - mail_issue_reply: "我要回复" - mail_footer: "退订Trustie社区任务提醒？" - # 课程资源上传 - # edit by meng - # 课程资源上传> - label_file_upload: 资源文件 - label_file_upload_error_messages: "上传出现错误，请您检查您的网络环境，并刷新页面重新上传。" - button_confirm: 确认 - - - - label_work_quantity: 个作品 -# label_organizers: 主办单位 -# label_organizers_information: 国防科学技术大学并行与分布处理国家重点实验室 -# label_organizers_information_institute: 计算机科学与技术系 -# label_copyright: 版权 -# label_contact_us: 联系我们 -# label_record: 湘ICP备09019772 - - - label_check_comment: 查看通知评论 label_notification: 通知公告 label_course_ad_description: 课程模块正在优化中，使用过程中如有问题请您与我们联系，感谢大家的支持！ label_course_adcolick: 请点击： label_coursejoin_tip: 提示：加入课程才有权限查看或提交作业，“加入”按钮见课程图标右侧！ - #end - - #end # ajax异步验证 modal_valid_passing: 可以使用 @@ -2313,7 +2067,6 @@ zh: label_enterprise_nil: 该模块为最新上线模块，目前还没有创建企业项目！ label_enterprises: 组织 - label_add_tag: 添加标签 label_tags_opensource: 开源项目 label_attachment_category: 所属分类 label_attachment_download_num: 下载 diff --git a/plugins/redmine_code_review/config/locales/zh.yml b/plugins/redmine_code_review/config/locales/zh.yml index 00141582a..b08b14eb2 100644 --- a/plugins/redmine_code_review/config/locales/zh.yml +++ b/plugins/redmine_code_review/config/locales/zh.yml @@ -55,10 +55,11 @@ zh: label_auto_assign_settings: 自动分派 label_candidates_of_reviewer: 候选评审员 label_auto_assignment_filters: 过滤器 - auto_assign_filter_expression: '路径(Regular expression:ex. "/src/.*\.java$")' + auto_assign_filter_expression: '路径(正则表达式:ex. "/src/.*\.java$")' auto_assign_filter_assign: 指派 auto_assign_filter_drop: 移除 - label_parent_suggestion: Maybe "%{issue_id}" ? + label_parent_suggestion: "可能是 '%{issue_id}' ?" - label_assign_review: "分配给" \ No newline at end of file + label_assign_review: "分配给" + field_tracker_in_review_dialog: "允许创建代码审查时选择跟踪者?" \ No newline at end of file