From e83ebedd0060122285bb6cbb35ec4a3b7bcdbffd Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 12 Sep 2014 11:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E6=A0=A1=E9=A1=B5=E9=9D=A2=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=9A1=E3=80=81=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96=E3=80=822=E3=80=81?=
 =?UTF-8?q?=E5=86=99=E6=AD=BB=E7=9A=84=E9=93=BE=E6=8E=A5=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=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 @@
 <script type="text/javascript">
 	$(document).ready(function() {
 		$("#province").html("<option value='0' selected = true style='display: none;'></option>");
-
-
-
-
 		$.ajax({
 			type :"POST",
 			url :'/school/get_province',
@@ -43,7 +39,7 @@
 
 <script type="text/javascript">
 	function test(id){
-        location.href = encodeURI('http://course.trustie.net/?school_id='+id);
+        location.href = encodeURI('http://<%= Setting.host_course %>/?school_id='+id);
 	}
 
 </script>
@@ -55,7 +51,7 @@
         //alert(value);
         if(value == "")
         {
-            alert("搜索条件不能为空");
+            alert("<%= l(:label_search_conditions_not_null) %>");
             return;
         }
 		//alert(province);
@@ -82,17 +78,17 @@
 <div>
 	<p>
 
-		<%= link_to "全部学校",school_index_path  %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<%= link_to l(:label_all_schol),school_index_path  %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <% if User.current.logged? %>
-          <a href="http://course.trustie.net">我的学校</a>
+          <a href="http://<%= Setting.host_course %>"><%= l(:label_my_school) %></a>
         <% end %>
 	</p>
 		<ul>
-			<li style="width: 40%; float: left">请选择省份:
+			<li style="width: 40%; float: left"><%= l(:label_select_province) %>:
 				<select id="province" name="province" onchange="get_school(this.value)"></select>
 			</li>
 			<li style="width: 50%; float: left"><input type="text" id="key_word" name="key_word"  onkeydown="word_keydown(event);"/>
-				<input type="button" class="enterprise" value="搜索" onclick="ssearch()"></li>
+				<input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="ssearch()"></li>
 		</ul>
 
 </div>
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