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

1.修改中英提示 

2.修改查看差别页面会超出界面的BUG
This commit is contained in:
sw 2014-08-28 11:06:01 +08:00
parent a77b07a99b
commit 5afcb73624
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/issues_helper.rb
View File

@ -326,7 +326,7 @@ module IssuesHelper
if detail.property == 'attr' && detail.prop_key == 'description' if detail.property == 'attr' && detail.prop_key == 'description'
s = l(:text_journal_changed_no_detail, :label => label) s = l(:text_journal_changed_no_detail, :label => label)
unless no_html unless no_html
diff_link = link_to 'diff', diff_link = link_to l(:label_diff),
{:controller => 'journals', :action => 'diff', :id => detail.journal_id, {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
:detail_id => detail.id, :only_path => options[:only_path]}, :detail_id => detail.id, :only_path => options[:only_path]},
:title => l(:label_view_diff) :title => l(:label_view_diff)

2
app/views/journals/diff.html.erb
View File

@ -1,7 +1,7 @@
<h3><%=h @issue.tracker %> #<%= @issue.id %></h3> <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
<p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p> <p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
<div class="text-diff"> <div class="text-diff" style="word-break: break-all;width: 100%;">
<%= simple_format_without_paragraph @diff.to_html %> <%= simple_format_without_paragraph @diff.to_html %>
</div> </div>

2
config/locales/zh.yml
View File

@ -1214,7 +1214,7 @@ zh:
notice_issue_successful_create: 问题 %{id} 已创建。 notice_issue_successful_create: 问题 %{id} 已创建。
label_between: 介于 label_between: 介于
setting_issue_group_assignment: 允许问题被分配给组 setting_issue_group_assignment: 允许问题被分配给组
label_diff: diff label_diff: 查看差别
description_query_sort_criteria_direction: 排序方式 description_query_sort_criteria_direction: 排序方式
description_project_scope: 搜索范围 description_project_scope: 搜索范围
description_filter: 过滤器 description_filter: 过滤器