From e83ebedd0060122285bb6cbb35ec4a3b7bcdbffd Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 12 Sep 2014 11:34:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=AB=98=E6=A0=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=9A1=E3=80=81?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96=E3=80=822?= =?UTF-8?q?=E3=80=81=E5=86=99=E6=AD=BB=E7=9A=84=E9=93=BE=E6=8E=A5=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BB=8E=E9=85=8D=E7=BD=AE=E4=B8=AD=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/school/index.html.erb | 16 ++++++---------- config/locales/en.yml | 8 ++++++-- config/locales/zh.yml | 4 ++++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb index 6c1eafd6d..02b934581 100644 --- a/app/views/school/index.html.erb +++ b/app/views/school/index.html.erb @@ -3,10 +3,6 @@ @@ -55,7 +51,7 @@ //alert(value); if(value == "") { - alert("搜索条件不能为空"); + alert("<%= l(:label_search_conditions_not_null) %>"); return; } //alert(province); @@ -82,17 +78,17 @@

- <%= link_to "全部学校",school_index_path %>      + <%= link_to l(:label_all_schol),school_index_path %>      <% if User.current.logged? %> - 我的学校 + <%= l(:label_my_school) %> <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 987acabc4..c28dd8555 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1816,5 +1816,9 @@ en: label_forums_max_length: Post Bar describing the maximum length of 65535 characters label_unknow_type: Unknow type label_score_less_than_zero: Score less than 0, revised to 0 - review_assignments: review assignments - label_private: private \ No newline at end of file + review_assignments: Review assignments + label_private: private + label_my_school: My school + label_all_schol: All school + label_select_province: Please select the provinces + label_search_conditions_not_null: The search conditions can not be empty \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index c24787d26..8c3741deb 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2119,3 +2119,7 @@ zh: label_score_less_than_zero: 得分小于0，修正为0 review_assignments: 评审任务 label_private: 私有 + label_my_school: 我的学校 + label_all_schol: 全部学校 + label_select_province: 请选择省份 + label_search_conditions_not_null: 搜索条件不能为空 \ No newline at end of file From c40ede1101976957c3f46d8c5f95e9c1bb6165b8 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 12 Sep 2014 15:19:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#1219=E7=82=B9=E5=87=BB=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BF=94=E5=9B=9E=E5=BC=82=E5=B8=B8=EF=BC=9B?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E9=93=BE=E6=8E=A5=E6=8C=87=E5=90=91=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84action?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=AD=A3=EF=BC=8C=E4=BD=BF=E4=B9=8B=E6=8C=87?= =?UTF-8?q?=E5=90=91=E6=AD=A3=E7=A1=AE=E7=9A=84action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/tags/_show_contests.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/tags/_show_contests.html.erb b/app/views/tags/_show_contests.html.erb index bc2682fb8..891f65901 100644 --- a/app/views/tags/_show_contests.html.erb +++ b/app/views/tags/_show_contests.html.erb @@ -4,7 +4,7 @@ <% contests_results.each do |contest| %>

<%= l(:label_tags_contest) %>:<%= link_to "#{contest.name}", - :controller => "contests",:action => "show",:id => contest.id %> + :controller => "contests",:action => "show_contest",:id => contest.id %>
<%= l(:label_tags_contest_description) %>:<%= contest.description %> <%= contest.updated_on %>