From e53a9634a257ea3cd3711a5fa088adf45068db9b Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Wed, 21 Aug 2013 21:02:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=9C=80=E6=B1=82=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_form.html.erb | 13 +++++++------
 config/locales/zh.yml         |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/bids/_form.html.erb b/app/views/bids/_form.html.erb
index 4b78c308e..a952931d6 100644
--- a/app/views/bids/_form.html.erb
+++ b/app/views/bids/_form.html.erb
@@ -1,20 +1,20 @@
 <!-- fq -->
 
 <script type="text/javascript" language="javascript">
-	function show(id, id_t) {
+	function show(id, id_t, label_reward, label_money, label_grade, label_content) {
 		var text = $('#' + id);
 		var text_t = $('#' + id_t);
 		if (text.val() == 0) {
-			text_t.attr("placeholder", "输入奖励内容");
+			text_t.attr("placeholder", label_reward);
 		}
 		if (text.val() == 1) {
-			text_t.attr("placeholder", "输入奖励金额，如500， 2.5等");
+			text_t.attr("placeholder", label_money);
 		}
 		if (text.val() == 3) {
-			text_t.attr("placeholder", "输入奖励的学分，如3， 2.5");
+			text_t.attr("placeholder", label_grade);
 		}
 		if (text.val() == 2) {
-			text_t.attr("placeholder", "输入奖励的内容，可以是奖项，物品等");
+			text_t.attr("placeholder", label_content);
 		}
 		return content;
 	}
@@ -26,7 +26,8 @@
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :placeholder => "#{l(:label_requirement_name)}" %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT, :placeholder => "#{l(:label_requirement_description)}" %></p>
-<p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_grade)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, :onChange => "show('bid_reward_type', 'bid_budget')" %>
+<p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_grade)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, 
+	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_grade)+"','"+l(:label_bids_new_content)+"')" %>
 	<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p>
 <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;", :placeholder => "#{l(:label_deadline)}" %><%= calendar_for('bid_deadline')%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5770aa31d..adb8c20ef 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1283,7 +1283,7 @@ zh:
   label_issue_praise_over: 已顶！
   label_issue_tread_over: 已踩！
   label_issue_appraise_over: 已评价！
-  label_welcome_my_respond: 我要反馈：
+  label_welcome_my_respond: 请在此留下你的意见和建议！
   label_no_current_fans: 该用户暂无粉丝
   label_no_current_watchers: 该用户暂未关注其他用户
   label_project_tool_response: 用户反馈