From 5afcb73624bddc0763ec190bd16f3d401fb1cc34 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 Aug 2014 11:06:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=202.=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B=E5=B7=AE?=
 =?UTF-8?q?=E5=88=AB=E9=A1=B5=E9=9D=A2=E4=BC=9A=E8=B6=85=E5=87=BA=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/issues_helper.rb     | 2 +-
 app/views/journals/diff.html.erb | 2 +-
 config/locales/zh.yml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 315a86340..637c92db3 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -326,7 +326,7 @@ module IssuesHelper
     if detail.property == 'attr' && detail.prop_key == 'description'
       s = l(:text_journal_changed_no_detail, :label => label)
       unless no_html
-        diff_link = link_to 'diff',
+        diff_link = link_to l(:label_diff),
           {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
            :detail_id => detail.id, :only_path => options[:only_path]},
           :title => l(:label_view_diff)
diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb
index d846b9d19..6e67f0544 100644
--- a/app/views/journals/diff.html.erb
+++ b/app/views/journals/diff.html.erb
@@ -1,7 +1,7 @@
 <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
 <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 %>
 </div>
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 4f0744d86..674b88dbe 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1214,7 +1214,7 @@ zh:
   notice_issue_successful_create: 问题 %{id} 已创建。
   label_between: 介于
   setting_issue_group_assignment: 允许问题被分配给组
-  label_diff: diff
+  label_diff: 查看差别
   description_query_sort_criteria_direction: 排序方式
   description_project_scope: 搜索范围
   description_filter: 过滤器