jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改了用户主页中与我相关部分的显示问题

This commit is contained in:
fanqiang 2013-08-11 15:53:41 +08:00
parent 2db0b87e6e
commit a6b5c8fc2b
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/users/info.html.erb
View File

@ -9,22 +9,25 @@
<td> <td>
<table width="580" border="0"> <table width="580" border="0">
<tr> <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.instance_of?(JournalsForMessage)%>
<% if e.reply_id == User.current.id%> <% 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 %> <% else %>
<%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id))%><%= l(:label_have_respond) %> <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id))%><%= l(:label_have_respond) %>
<% end %> <% end %>
<% else %> <% else %>
<% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %> <% 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) %> <%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id))%><%= l(:label_have_respond) %>
<% else %> <% 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 %>
<% end %> <% end %> </span></td>
</span></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" > <td colspan="2" width="580" >

6
config/locales/zh.yml
View File

@ -1224,5 +1224,9 @@ zh:
label_password: 密码： label_password: 密码：
label_about_requirement: 对需求： label_about_requirement: 对需求：
label_about_issue: 对问题： label_about_issue: 对问题：
label_quote_my_words: 对我的话进行了引用 label_quote_my_words: 中对我的话进行了引用
label_have_respond: 进行了反馈 label_have_respond: 进行了反馈
label_in_issues: 在问题：
label_in_bids: 在需求：
label_in_users: 在用户：
label_have_respond: 进行了反馈