Merge branch 'develop' into szzh

10 years ago · 5a438f9059
parent 79d1a069c2 ab18dfcaa8
commit 5a438f9059
2 changed files with 2 additions and 1 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1774,7 +1774,7 @@ en:
  label_project_deposit: Projects
  label_course_practice: Courses
  label_forum_all: Forums
-  label_school_all: Schools 
+#  label_school_all: Schools
  label_contest_innovate: Competition community  
  label_software_user: Users
  label_requirement_enterprise: Requirements
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -2421,6 +2421,7 @@ zh:
  review_assignments: 评审任务
  label_my_school: 我的学校
  label_all_schol: 全部学校
+  label_school_all: 中国高校
  label_select_province: 请选择省份
  label_search_conditions_not_null: 搜索条件不能为空