From a6b5c8fc2b48ef4f2577b6a29dbaf3ba3bf861b8 Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Sun, 11 Aug 2013 15:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E4=B8=AD=E4=B8=8E=E6=88=91=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/info.html.erb | 15 +++++++++------
 config/locales/zh.yml         |  6 +++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/views/users/info.html.erb b/app/views/users/info.html.erb
index af72f8f25..4191ca6c4 100644
--- a/app/views/users/info.html.erb
+++ b/app/views/users/info.html.erb
@@ -9,22 +9,25 @@
 			<td>
 			<table width="580" border="0">
 				<tr>
-					<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user)) %></strong><span class="font_lighter">
+					<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user)) %></strong><span class="font_lighter"> 
 						<% if e.instance_of?(JournalsForMessage)%>
 							<% if e.reply_id == User.current.id%>
-								<%= l(:label_quote_my_words) %><%if e.jour_type == 'Bid'%><%= link_to('link', respond_path(e.jour))%><% else %><%= link_to('link', feedback_path(e.jour))%><% end %>						
+								<%if e.jour_type == 'Bid'%>
+									<%= l(:label_in_bids)%><%= link_to(e.jour.name, respond_path(e.jour))%><%= l(:label_quote_my_words) %>
+								<% else %>
+									<%= l(:label_in_users)%><%= link_to(e.jour.firstname, feedback_path(e.jour))%><%= l(:label_quote_my_words) %>
+								<% end %>
 							<% else %>
 								<%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id))%><%= l(:label_have_respond) %>
 							<% end %>
 						<% else %>
 							<% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %>
 								<%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id))%><%= l(:label_have_respond) %>
-								
+
 							<% else %>
-								<%= l(:label_quote_my_words) %><%= link_to('link', issue_path(e.issue))%>
+								<%= l(:label_in_issues)%><%= link_to(e.issue.subject, issue_path(e.issue))%><%= l(:label_quote_my_words) %>
 							<% end %>
-						<% end %>						
-						</span></td>
+						<% end %> </span></td>
 				</tr>
 				<tr>
 					<td colspan="2" width="580" >
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 30e6ce658..b5a52c0e5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1224,5 +1224,9 @@ zh:
   label_password: 密码：
   label_about_requirement: 对需求：
   label_about_issue: 对问题：
-  label_quote_my_words: 对我的话进行了引用
+  label_quote_my_words: 中对我的话进行了引用
   label_have_respond: 进行了反馈
+  label_in_issues: 在问题：
+  label_in_bids: 在需求：
+  label_in_users: 在用户：
+      label_have_respond: 进行了反馈
\ No newline at end of file