From 47e1427ead9914ac07f9ded8e72883dce411664b Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 12 Mar 2015 19:29:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E7=BB=9F=E8=AE=A1=E6=95=B0=E7=9B=AE=E4=B8=BA=E9=9B=B6?= =?UTF-8?q?=E7=9A=84=E6=89=8B=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 69c37d2b3..23f0be5e6 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -140,12 +140,16 @@ <% end %>
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> - (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> + (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% end %>
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
- <%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %>(<%= @project.issues.count %>) - + <%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %> + <% unless @project.issues.count == 0 %> + (<%= @project.issues.count %>) + <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> <% end %> @@ -154,7 +158,9 @@ <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
<%= link_to l(:project_module_boards), project_boards_path(@project), :style => "color:#3CA5C6" %> - (<%= @project.boards.first.topics.count %>) + <% unless @project.boards.first.topics.count == 0 %> + (<%= @project.boards.first.topics.count %>) + <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> <% end %> @@ -162,7 +168,10 @@ <% end%> <% unless @project.enabled_modules.where("name = 'files'").empty? %>
- <%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %>(<%= @project.attachments.count %>) + <%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %> + <% unless @project.attachments.count == 0 %> + (<%= @project.attachments.count %>) + <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> <% end %> @@ -171,7 +180,9 @@ <% unless @project.enabled_modules.where("name = 'repository'").empty? %>
<%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> - (<%= @project.repositories.count %>) + <% unless @project.repositories.count == 0 %> + (<%= @project.repositories.count %>) + <% end %> <%# if User.current.member_of?(@project) %> <%#= link_to "+"+l(:project_module_create_repository), new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> <%# end %> From cef923b8a8788b9ad86b75c6d27656e234748059 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 13 Mar 2015 09:46:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/invite_members_by_mail.html.erb | 6 +++--- config/locales/projects/en.yml | 16 ++++++++-------- config/locales/projects/zh.yml | 8 ++++++-- config/locales/zh.yml | 4 +--- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index 42a27376b..e8e77be8f 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -23,7 +23,7 @@ // }
-

邀请加入

+

<%= l(:label_invite_join)%>

@@ -31,9 +31,9 @@
-

发送邮件邀请新用户

+

<%= l(:label_invite_new_user)%>

- 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！ + <%= l(:label_invite_email_tips)%>

<%= render :partial => 'regested', locals: { :isregisted => false} %> diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index bc4395df0..1fda000ff 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -82,16 +82,16 @@ en: # # 邀请 # - label_invite_new_user: "发送邮件邀请新用户" - label_invite_join: 邀请加入 - label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！ - label_email: 邮箱 - notice_registed_success: 您所填写的电子邮件格式不正确或者该邮箱已被注册! - label_send_email_free: 免费发送 - label_email_format_error: 您所填写的电子邮件格式不正确 + 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_success: Email address is blank or has been registered! + label_email_format_error: Email format is incorrect! + label_send_email: Send + label_input_email: Please input email address - label_invite_trustie_user: "邀请Trustie注册用户" + label_invite_trustie_user: "Invite Trustie registered users" # diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index d6e03fc14..29cf540f8 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -76,6 +76,10 @@ zh: label_issue_category_plural: 问题类别 label_repository_plural: 版本库 enumeration_activities: 活动（时间跟踪） + + + text_select_project_modules: '请选择此项目可以使用的模块：' + # # 项目托管平台 @@ -86,9 +90,9 @@ zh: label_invite_join: 邀请加入 label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！ notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! - label_send_email_free: 免费发送 label_email_format_error: 您所填写的电子邮件格式不正确 - + label_send_email: 免费发送 + label_input_email: 请输入邮箱地址 label_invite_trustie_user: "邀请Trustie注册用户" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 8858b0a38..6b80553de 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -989,7 +989,6 @@ zh: text_status_changed_by_changeset: "已应用到变更列表 %{value}." text_time_logged_by_changeset: "已应用到修订版本 %{value}." text_issues_destroy_confirmation: '您确定要删除选中的问题吗？' - text_select_project_modules: '请选择此项目可以使用的模块：' text_default_administrator_account_changed: 默认的管理员帐号已改变 text_file_repository_writable: 附件路径可写 text_plugin_assets_writable: 插件的附件路径可写 @@ -2082,6 +2081,5 @@ zh: label_recently_updated_courseware: 最近更新了课件 label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！ label_end_time: 截止时间 - label_send_email: 免费发送 - label_input_email: 请输入邮箱地址 + From baa854c5a909b791643767e8a348216f26b9b794 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 13 Mar 2015 10:26:10 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/commons/zh.yml | 163 +++++++++++++++++++++++++++++++++- config/locales/zh.yml | 3 - 2 files changed, 160 insertions(+), 6 deletions(-) diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index b06ec3a71..a0eb6e74a 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -1,12 +1,169 @@ - -# Chinese (China) translations for Ruby on Rails -# 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: "该班名已存在" + + 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: 请选择 + # # Trustie公共标签 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 6b80553de..7af41945c 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -8,9 +8,6 @@ zh: jquery: locale: "zh-CN" - label_approve: 批准 - label_refusal: 拒绝 - notice_account_updated: 帐号更新成功 notice_account_wrong_password: 密码错误 name_can_be_empty: 可以不填写真实姓名[保密所需] From be75bcef473dbb99d59829019bc31719dd98bd94 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 13 Mar 2015 11:51:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BE=97=E5=88=86?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/projects/en.yml | 24 ++++++++++++------------ config/locales/projects/zh.yml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 1fda000ff..fdc426ca5 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -131,23 +131,23 @@ en: # # 项目得分 # - label_projects_score: 项目综合得分 + label_projects_score: Project Total Score - label_issue_score: issue得分 - label_issue_number: issue的数量 - label_issue_journal_number: issue的留言数量 + label_issue_score: Issue Score + label_issue_number: issues + label_issue_journal_number: messages of issue - label_news_score: 新闻得分 - label_new_number: 新闻的数量 + label_news_score: News Score + label_new_number: news - label_file_score: 文档得分 - label_file_number: 文档的数量 + label_file_score: Document Scores + label_file_number: documents - label_code_submit_score: 代码提交得分 - label_code_submit_number: 代码提交数量 + label_code_submit_score: Code Commit Score + label_code_submit_number: commit code frequency - label_topic_score: 讨论区得分 - label_topic_number: 讨论区帖子数量 + label_topic_score: Forum Score + label_topic_number: posts diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 29cf540f8..b0a122dd1 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -146,7 +146,7 @@ zh: label_file_number: 文档的数量 label_code_submit_score: 代码提交得分 - label_code_submit_number: 代码提交数量 + label_code_submit_number: 代码提交频率 label_topic_score: 讨论区得分 label_topic_number: 讨论区帖子数量 From ed674d960c2a0fa934a5b9d6e43a627495e91eaf Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 13 Mar 2015 11:55:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index c9ea1ca80..2cfbc550b 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -381,7 +381,7 @@ class CoursesService end latest_bid_message = messages.first unless latest_bid_message.nil? - latest_course_dynamics << {:type => 4,:time => latest_bid_message.created_on,:message => '最近更新了作业'}#l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)} + latest_course_dynamics << {:type => 4,:time => latest_bid_message.created_on,:message => l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)} end #每个作业中学生最后提交的作业 homeworks = [] @@ -396,7 +396,7 @@ class CoursesService end latest_homework_attach = homeworks.first unless latest_homework_attach.nil? - latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message => '最近更新了作业'}#l(:label_recently_updated_homework,:locale => current_user.language.nil? ? 'zh':current_user.language)} + latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message => l(:label_recently_updated_homework,:locale => current_user.language.nil? ? 'zh':current_user.language)} end latest_course_dynamics.sort!{|order,newer| newer[:time] <=> order[:time]} latest_course_dynamic = latest_course_dynamics.first From e165dd6572774f243c60a1cdff6da1750ebb33c9 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 13 Mar 2015 13:41:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 2cfbc550b..1ec8a0ef0 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -1,3 +1,4 @@ +#coding=utf-8 class CoursesService include ApplicationHelper include CoursesHelper