From 8ef716b920caf1ad5c254761302b4d39e20bc8fb Mon Sep 17 00:00:00 2001 From: nwb Date: Thu, 15 May 2014 13:37:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81=E7=95=99?= =?UTF-8?q?=E8=A8=80=E6=98=BE=E7=A4=BA=E5=87=BA=E7=95=99=E8=A8=80=E4=BA=BA?= =?UTF-8?q?=202.=E7=95=99=E8=A8=80=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/show.html.erb | 9 ++++++--- config/locales/en.yml | 3 +++ config/locales/zh.yml | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index dd912cfe..2774ea4d 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -33,14 +33,17 @@ <% when 'JournalsForMessage' %> <% if User.current.login == @user.login %> <%# if e.user_id == act.jour.id %> - <%= link_to("#{e.user.name}", user_path(e.user_id)) %> 有了<%= link_to("#{e.act.user.name}", user_path(e.user.id))%>的留言 + <%= link_to("#{e.user.name}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %><%= + link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <%# else %> <%# end %> <% else %> - <%= link_to("#{@user.name}", user_path(e.user_id)) %> 有了新的动态 + <%= link_to("#{e.user.name}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %><%= + link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <% end %> -

<%=textilizable act.notes %>

+

<%=textilizable act.notes %> + <%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %>

<%=(l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 4f995d79..9e7e4901 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1306,6 +1306,7 @@ en: label_have_respond: had a respond label_welcome: Welcome + label_goto: Go to>> label_join: join Trustie！ label_repository_new: link to existing SVN repository label_repository_path: path of repository @@ -1411,6 +1412,8 @@ en: label_user_activity_myself: About me label_user_all_respond: All replies label_layouts_feedback: Messages + label_have_feedback: Have + label_of_feedback: Of label_welcome_participate: participates #modify by men label_x_welcome_participate: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 6b4a925c..c39bd7c2 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1495,6 +1495,7 @@ zh: label_issue_praise_over: 我刚才顶过了~ label_issue_tread_over: 我刚才踩过了~ #end + label_goto: 前往>> label_issue_appraise_over: 只能评价一次哦！ label_welcome_my_respond: 请在此留下你的意见和建议！ label_no_current_fans: 该用户暂无粉丝 @@ -1575,6 +1576,8 @@ zh: label_my_honework_no_homework: 暂无任何作业！ label_user_all_respond: 所有反馈 label_layouts_feedback: 留言 + label_have_feedback: 有了 + label_of_feedback: 的 label_welcome_participate: 参与了 #modify by men label_x_welcome_participate: