From d7f4363db6e60496761596e80144bbb8f8c6425a Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Thu, 22 Aug 2013 20:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=9C=80=E6=B1=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=9B=BD=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        |  8 ++++----
 app/views/bids/_new_bid.html.erb     |  2 +-
 app/views/layouts/base_bids.html.erb |  2 +-
 app/views/users/show.html.erb        |  7 +++++--
 config/locales/en.yml                | 16 ++++++++--------
 config/locales/zh.yml                | 16 ++++++++--------
 6 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/views/bids/_form.html.erb b/app/views/bids/_form.html.erb
index a952931d6..da3e3b35b 100644
--- a/app/views/bids/_form.html.erb
+++ b/app/views/bids/_form.html.erb
@@ -1,7 +1,7 @@
 <!-- fq -->
 
 <script type="text/javascript" language="javascript">
-	function show(id, id_t, label_reward, label_money, label_grade, label_content) {
+	function show(id, id_t, label_reward, label_money, label_credit, label_content) {
 		var text = $('#' + id);
 		var text_t = $('#' + id_t);
 		if (text.val() == 0) {
@@ -11,7 +11,7 @@
 			text_t.attr("placeholder", label_money);
 		}
 		if (text.val() == 3) {
-			text_t.attr("placeholder", label_grade);
+			text_t.attr("placeholder", label_credit);
 		}
 		if (text.val() == 2) {
 			text_t.attr("placeholder", label_content);
@@ -26,8 +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', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_grade)+"','"+l(:label_bids_new_content)+"')" %>
+<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_credit)}</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_credit)+"','"+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/app/views/bids/_new_bid.html.erb b/app/views/bids/_new_bid.html.erb
index dde224393..50bad5360 100644
--- a/app/views/bids/_new_bid.html.erb
+++ b/app/views/bids/_new_bid.html.erb
@@ -59,7 +59,7 @@ border-top: 1px solid #acaeb1; border-bottom: 1px solid #acaeb1; margin-top: 30p
 		<td colspan="2"><div class="tableline"></div></td>
 	</tr>
 	<tr>
-		<td width="22%"><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '2'>#{l(:label_reward_1)}</option><option value = '3'>#{l(:label_bids_grade)}</option>".html_safe, :class => 'noline' %></td>
+		<td width="22%"><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '2'>#{l(:label_reward_1)}</option><option value = '3'>#{l(:label_bids_credit)}</option>".html_safe, :class => 'noline' %></td>
 		<td><%= text_field_tag 'bid_budget', "#{l(:label_requirement_bargain_money)}", :class => 'noline', :required => true,
 		:onfocus => "clearInfo('bid_budget', '#{l(:label_requirement_bargain_money)}')", :onblur => "showInfo('bid_budget', '#{l(:label_requirement_bargain_money)}')" %>
 		</td>
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb
index 4e38fe754..2acb18d37 100644
--- a/app/views/layouts/base_bids.html.erb
+++ b/app/views/layouts/base_bids.html.erb
@@ -53,7 +53,7 @@
 				<% elsif @bid.reward_type == 2%>
 				<td><%= l(:label_bids_reward_method) %><%= @bid.budget%></td>
 				<% else %>
-				<td><%= l(:label_bids_reward_method) %><%= l(:label_bids_grade) %>&nbsp;<%= @bid.budget%><%= l(:label_bids_grade_number) %></td>
+				<td><%= l(:label_bids_reward_method) %><%= l(:label_bids_credit) %>&nbsp;<%= @bid.budget%><%= l(:label_bids_credit_number) %></td>
 				<% end %>											
 											</tr>
 											<tr>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index c88ea171d..30abc6503 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -135,8 +135,11 @@
 		<ul>
 </div>
 <% else %>
+<% if @user == User.current %>
+<%= l(:label_user_activities) %>
+<% else %>
 <p class="font_description">
-	<%= l(:label_user_activities) %>
+	<%= l(:label_user_activities_other) %>
 </p>
-
+<% end %>
 <% end %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a54d1766a..81e859688 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1122,6 +1122,7 @@ en:
   label_user_mail: "E-mail:"
   label_user_joinin: "Join date:"
   label_user_activities: "You have no activities,come and join us!"
+  label_user_activities_other: The user has no activities now！
   label_project_overview: "Overview"
   label_project_tool: "Tool"
   label_project_issues: "Issues"
@@ -1152,7 +1153,6 @@ en:
   label_user_response: User responses
   label_bidding_project: projects
   button_bidding: I will participate in it
-  button_new_bid: New call
   label_new_call: New call
   label_user_information: "My information"
   
@@ -1189,7 +1189,7 @@ en:
   label_investment_budget: Investment budget：
   label_investment_time_limit: Investment time limit：
   label_my_respond: My respond：
-  label_respond_requirement: has respond to the requirement
+  label_respond_requirement: has commented this call
   label_deadline: deadline yyyy-mm-dd
   label_requirement_name: give your requirement a name ~~
   label_requirement_description: content：descript your requirement
@@ -1255,7 +1255,7 @@ en:
   label_upassword_info: The password can be shared in the group
   label_how_commit_code: How to commit code：
   label_how_commit_code_chinese: Chinese
-  label_welcome_leave_message: Hi！System is currently being beta，there are comments and suggestions please
+  label_welcome_leave_message: Hi!The platform is currently in beta version.If you have any comments and suggentions,please
   label_welcome_click_me: Click me
   label_issue_praise: Good question，praise！
   label_issue_tread: Poor question，tread！
@@ -1280,12 +1280,12 @@ en:
   field_work_experience: Work experience(year)
   field_zip_code: Zip code
   label_reward: reward：
-  label_grade: grade：
+  label_credit: credit：
   label_choose_reward: choose reward
   label_money: money
   label_reward_1: others
-  label_bids_grade: grade
-  label_bids_grade_number: numbers
+  label_bids_credit: credit
+  label_bids_credit_number: numbers
   field_budget: reward
   field_deadline: deadline
   label_tags_selected: Selected Tags
@@ -1303,9 +1303,9 @@ en:
   label_bids_reward_method: method of reward：
   label_bids_reward_what: input what for reward
   label_call_bonus: bonus
-  label_bids_form_new_description: Here you can create a course,competition or publish a requirement,question or ask master for help etc.
+  label_bids_form_new_description: Publish a requirement,a competition or a course work.
   label_bids_new_money: input the award money,such as 500,2.5 etc.
-  label_bids_new_grade: input the award grades,such as 3,2.5 etc.
+  label_bids_new_credit: input the work corresponding course credits,such as 3,2.5 etc.
   label_bids_new_content: input the award content,such as certificate,things etc.
   label_user_login_tips: You havn't logged in,for leaving message please login first
   label_user_login_new: login
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index adb8c20ef..372029914 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -771,7 +771,8 @@ zh:
   label_user_login: "最后登录:"
   label_user_mail: "邮件地址:"
   label_user_joinin: "加入时间:"
-  label_user_activities: "您当前还没有活动，快来加入我们吧！"
+  label_user_activities: 您当前还没有活动，快来加入我们吧！
+  label_user_activities_other: 该用户暂无任何动态！
   label_project_overview: "概述"
   label_project_tool: "工具"
   label_project_issues: "缺陷"
@@ -779,7 +780,7 @@ zh:
   label_project_newshare: "分享了"
   label_project_newadd: "添加了"
   label_project_unadd: "暂无项目，赶快去创建吧！"
-  label_project_un: "该用户暂未参入任何项目！"
+  label_project_un: "该用户暂未参与任何项目！"
   
   
   #end by huang
@@ -1188,7 +1189,6 @@ zh:
   label_bidding_project: 参与项目 
   button_bidding: 我要参加
 
-  label_new_call: 发布需求
   label_new_call: 发布需求
   label_user_information: "与我相关"
   label_bid_succeed: "需求发布成功"
@@ -1301,12 +1301,12 @@ zh:
   field_work_experience: 工作经验(年)
   field_zip_code: 邮编
   label_reward: 奖励：
-  label_grade: 学分：
+  label_credit: 学分：
   label_choose_reward: 选择奖励方式
   label_money: 货币
   label_reward_1: 其他  
-  label_bids_grade: 学分
-  label_bids_grade_number: 分
+  label_bids_credit: 学分
+  label_bids_credit_number: 分
   field_budget: 奖励
   field_deadline: 截止日期
   label_tags_selected: 已选标签
@@ -1324,7 +1324,7 @@ zh:
   label_bids_reward_method: 奖励方式 ：
   label_bids_reward_what: 输入奖励内容
   label_call_bonus: 奖金
-  label_bids_form_new_description: 您可以在此创建一个课程、竞赛，或者发布一个需求、问题，求助高手等等
+  label_bids_form_new_description: 发布一个需求，一次竞赛或者一个课程的作业
   label_bids_new_money: 输入奖励金额，如 500,2.5等
-  label_bids_new_grade: 输入奖励学分，如 3,2.5等
+  label_bids_new_credit: 输入该作业对应课程的学分，如 3,2.5等
   label_bids_new_content: 输入奖励内容，如 奖项，物品等
\ No newline at end of file