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