From ebcdd2cc9e761b88aedf1f075ce9bc0034d0de12 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 10:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 2 +-
 config/locales/en.yml              | 3 ++-
 config/locales/zh.yml              | 9 ++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 6e0d6e919..b0432156c 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -124,7 +124,7 @@
 <!--搜索框-->	
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">		
 		<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>	
-			<%= text_field_tag 'name', params[:name], placeholder:<%=l(:label_searching_intimation)%>, name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
+			<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
 			&nbsp;
 			<%= hidden_field_tag 'project_type', params[:project_type] %>
 			<%= submit_tag l(:label_search), :class => "enterprise" , :name => nil%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 072dd9ecb..3d9349f57 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1631,7 +1631,8 @@ en:
   label_question_sponsor: Sponsor
   label_final_reply: Final-reply
   label_reply: Reply  
-
+  label_weixin:　WeiXin
+  label_searching_intimation: please input the keywords
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b958362c4..9b77a5f57 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1962,7 +1962,8 @@ zh:
   label_attendingcontestwork_sorting_intimation: 您可以重新打分，打分结果以最后一次打分为主！
   
   label_contest_notification: 竞赛通知
-  
+
+  #english site translation
   label_current_hot_contest: 最新热门竞赛
   label_current_attendingcontest_work: 最新参赛作品
   label_issue_feedback_activities: 问题和反馈动态
@@ -1973,8 +1974,10 @@ zh:
   label_question_sponsor: 楼主
   label_final_reply: 最后回复
   label_reply: 回复
-  label_weixin:　微信扫码
-  label_searching_intimation: 请输入要搜索的关键字
+  label_weixin: 微信扫码
+  label_search_intimation: 请输入要搜索的关键字
+  #end  
+
   #end
   
   # ajax异步验证