From 971c278de57be2ac52d1a0f89d74d270747ad566 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 12 Mar 2015 17:02:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20#2026=20=E4=BD=9C=E4=B8=9A=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4->=E6=88=AA=E8=87=B3=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_bid_homework_show.html.erb | 4 ++-- config/locales/zh.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index 1009f405f..6b3f91587 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -172,9 +172,9 @@ - <%= l(:label_create_time) %> + <%= l(:label_end_time) %> :  - <%=format_time bid.created_on %> + <%= bid.deadline %> <% if betweentime(bid.deadline) < 0 %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 82caa1a96..94e8cf31e 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2081,4 +2081,5 @@ zh: label_recently_updated_message: 最近更新了留言 label_recently_updated_courseware: 最近更新了课件 label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！ + label_end_time: 截止时间 From 5f88ffc5d00475a46518e15f2b24e756f22b8afd Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 12 Mar 2015 17:13:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8Cjs?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=82=AE=E4=BB=B6=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/invite_members_by_mail.html.erb | 26 ++++++++++--------- config/locales/projects/en.yml | 9 ++++++- config/locales/projects/zh.yml | 19 ++++++++++---- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index e0ba05f18..2b7c23736 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -1,14 +1,16 @@
-

邀请加入

+

<%= l(:label_invite_join)%>

@@ -16,18 +18,18 @@
-

发送邮件邀请新用户

+

<%= l(:label_invite_new_user)%>

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

<%= render :partial => 'regested', locals: { :isregisted => false} %>
<%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %> - <%= text_field_tag 'mail', '邮箱', :class => "fb_item fl" %> +

<%= text_field_tag 'mail', l(:label_email), :class => "fb_item fl" %>

- <%= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %> + <%= submit_tag l(:label_send_email_free), :onclick => "verifyAddress(this);" , :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %> <% end %>
\ No newline at end of file diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 53791f2b8..a7c88eb19 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -77,6 +77,13 @@ en: label_repository_plural: Repositories enumeration_activities: Activities + # + # 项目托管平台 + # + # 邀请 + # + notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! + # # 项目托管平台 @@ -88,7 +95,7 @@ en: field_description: Description field_identifier: Identifier field_enterprise_name: Enterprise - + 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." diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 597ce4f57..2b866a9e6 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -43,9 +43,7 @@ zh: project_module_attachments: 资源 label_invite: 邀请 - label_invite_new_user: "发送邮件邀请新用户" - label_invite_trustie_user: "邀请Trustie注册用户" - + label_issue_tracking: 问题跟踪 label_release_issue: 发布问题 @@ -79,6 +77,18 @@ zh: label_repository_plural: 版本库 enumeration_activities: 活动（时间跟踪） + # + # 项目托管平台 + # + # 邀请 + # + label_invite_new_user: "发送邮件邀请新用户" + label_invite_trustie_user: "邀请Trustie注册用户" + label_invite_join: 邀请加入 + label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！ + notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! + + # # 项目托管平台 @@ -90,10 +100,9 @@ zh: field_description: 描述 field_identifier: 标识 field_enterprise_name: 组织名称 - + label_organization_choose: --请选择组织-- text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。" text_project_identifier_info: "小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。
一旦保存，标识无法修改。" - field_is_public: 公开 field_hidden_repo: 隐藏代码库 button_create: 提交 From 362bad594f54e270e1644e0eb5f360f449c4c12c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 12 Mar 2015 17:18:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/invite_members_by_mail.html.erb | 11 +++++++---- config/locales/zh.yml | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index e0ba05f18..f1cae8b21 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -24,10 +24,13 @@ <%= render :partial => 'regested', locals: { :isregisted => false} %> <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %> - <%= text_field_tag 'mail', '邮箱', :class => "fb_item fl" %> -
-
- <%= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %> + <%= text_field_tag 'mail', '', :class => "fb_item fl", :placeholder => l(:label_input_email) %> +
+
+ + <%= l(:label_send_email)%> + + <%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %> <% end %> \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 94e8cf31e..8858b0a38 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2082,4 +2082,6 @@ zh: label_recently_updated_courseware: 最近更新了课件 label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！ label_end_time: 截止时间 + label_send_email: 免费发送 + label_input_email: 请输入邮箱地址