jro_apps/redmine Commit - r11321:a4b6928a261e

Merged r11544, r11545, r11546, r11547, r11549 from trunk to 2.3-stable (#12641)...

Toshi MARUYAMA -

r11321:a4b6928a261e

parent child

Context file:

r11321:a4b6928a261e

Collapse all files

test/fixtures/diffs/issue-12641-ja.diff created 644 +25 0

@@ -0,0 +1,25
	1	# HG changeset patch
	2	# User tmaruyama
	3	# Date 1362559296 0
	4	# Node ID ee54942e0289c30bea1b1973750b698b1ee7c466
	5	# Parent 738777832f379f6f099c25251593fc57bc17f586
	6	fix some Japanese "issue" translations (#13350)
	7
	8	Contributed by Go MAEDA.
	9
	10	diff --git a/config/locales/ja.yml b/config/locales/ja.yml
	11	--- a/config/locales/ja.yml
	12	+++ b/config/locales/ja.yml
	13	@@ -904,9 +904,9 @@ ja:
	14	text_journal_set_to: "%{label} を %{value} にセット"
	15	text_journal_deleted: "%{label} を削除 (%{old})"
	16	text_journal_added: "%{label} %{value} を追加"
	17	- text_tip_issue_begin_day: この日に開始するタスク
	18	- text_tip_issue_end_day: この日に終了するタスク
	19	- text_tip_issue_begin_end_day: この日のうちに開始して終了するタスク
	20	+ text_tip_issue_begin_day: この日に開始するチケット
	21	+ text_tip_issue_end_day: この日に終了するチケット
	22	+ text_tip_issue_begin_end_day: この日に開始・終了するチケット
	23	text_caracters_maximum: "最大%{count}文字です。"
	24	text_caracters_minimum: "最低%{count}文字の長さが必要です"
	25	text_length_between: "長さは%{min}から%{max}文字までです。"

test/fixtures/diffs/issue-12641-ru.diff created 644 +19 0

@@ -0,0 +1,19
	1	# HG changeset patch
	2	# User tmaruyama
	3	# Date 1355872765 0
	4	# Node ID 8a13ebed1779c2e85fa644ecdd0de81996c969c4
	5	# Parent 5c3c5f917ae92f278fe42c6978366996595b0796
	6	Russian "about_x_hours" translation changed by Mikhail Velkin (#12640)
	7
	8	diff --git a/config/locales/ru.yml b/config/locales/ru.yml
	9	--- a/config/locales/ru.yml
	10	+++ b/config/locales/ru.yml
	11	@@ -115,7 +115,7 @@ ru:
	12	one: "около %{count} часа"
	13	few: "около %{count} часов"
	14	many: "около %{count} часов"
	15	- other: "около %{count} часа"
	16	+ other: "около %{count} часов"
	17	x_hours:
	18	one: "1 час"
	19	other: "%{count} часов"

app/views/common/_diff.html.erb +5 -5

             <thead>
             <tr>
               <th colspan="4" class="filename">
-                <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
+                <%= table_file.file_name %>
               </th>
             </tr>
             </thead>
             <tr>
               <th class="line-num"><%= line.nb_line_left %></th>
               <td class="line-code <%= line.type_diff_left %>">
-                <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left).html_safe %></pre>
+                <pre><%= line.html_line_left.html_safe %></pre>
               </td>
               <th class="line-num"><%= line.nb_line_right %></th>
               <td class="line-code <%= line.type_diff_right %>">
-                <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right).html_safe %></pre>
+                <pre><%= line.html_line_right.html_safe %></pre>
               </td>
             </tr>
             <% end -%>
             <thead>
               <tr>
                 <th colspan="3" class="filename">
-                  <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
+                  <%= table_file.file_name %>
                 </th>
               </tr>
             </thead>
               <th class="line-num"><%= line.nb_line_left %></th>
               <th class="line-num"><%= line.nb_line_right %></th>
               <td class="line-code <%= line.type_diff %>">
-                <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line).html_safe %></pre>
+                <pre><%= line.html_line.html_safe %></pre>
               </td>
             </tr>
             <% end -%>

lib/redmine/unified_diff.rb +15 -11

                   lines = 0
                   @truncated = false
                   diff_table = DiffTable.new(diff_type, diff_style)
-                  diff.each do |line|
+                  diff.each do |line_raw|
-                    line_encoding = nil
+                    line = Redmine::CodesetUtil.to_utf8_by_setting(line_raw)
-                    if line.respond_to?(:force_encoding)
+                    unless diff_table.add_line(line)
-                      line_encoding = line.encoding
-                      # TODO: UTF-16 and Japanese CP932 which is imcompatible with ASCII
-                      #       In Japan, diffrence between file path encoding
-                      #       and file contents encoding is popular.
-                      line.force_encoding('ASCII-8BIT')
-                    end
-                    unless diff_table.add_line line
-                      line.force_encoding(line_encoding) if line_encoding
                       self << diff_table if diff_table.length > 0
                       diff_table = DiffTable.new(diff_type, diff_style)
                     end
                     while starting < max && line_left[starting] == line_right[starting]
                       starting += 1
                     end
+                    while line_left[starting].ord.between?(128, 191) && starting > 0
+                      starting -= 1
+                    end
                     ending = -1
                     while ending >= -(max - starting) && line_left[ending] == line_right[ending]
                       ending -= 1
                     end
+                    while line_left[ending].ord.between?(128, 191) && ending > -1
+                      ending -= 1
+                    end
                     unless starting == 0 && ending == -1
                       [starting, ending]
                     end
                 private
                 def line_to_html(line, offsets)
+                  html = line_to_html_raw(line, offsets)
+                  html.force_encoding('UTF-8') if html.respond_to?(:force_encoding)
+                  html
+                end
+                def line_to_html_raw(line, offsets)
                   if offsets
                     s = ''
                     unless offsets.first == 0

test/unit/lib/redmine/unified_diff_test.rb +23 0

@@ -221,6 +221,29 DIFF
221	assert_equal "test02.txt", diff[0].file_name	221	assert_equal "test02.txt", diff[0].file_name
222	end	222	end
223		223
		224	def test_utf8_ja
		225	ja = " text_tip_issue_end_day: "
		226	ja += "\xe3\x81\x93\xe3\x81\xae\xe6\x97\xa5\xe3\x81\xab\xe7\xb5\x82\xe4\xba\x86\xe3\x81\x99\xe3\x82\x8b<span>\xe3\x82\xbf\xe3\x82\xb9\xe3\x82\xaf</span>"
		227	ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
		228	with_settings :repositories_encodings => '' do
		229	diff = Redmine::UnifiedDiff.new(read_diff_fixture('issue-12641-ja.diff'), :type => 'inline')
		230	assert_equal 1, diff.size
		231	assert_equal 12, diff.first.size
		232	assert_equal ja, diff.first[4].html_line_left
		233	end
		234	end
		235
		236	def test_utf8_ru
		237	ru = " other: "\xd0\xbe\xd0\xba\xd0\xbe\xd0\xbb\xd0\xbe %{count} \xd1\x87\xd0\xb0\xd1\x81<span>\xd0\xb0</span>""
		238	ru.force_encoding('UTF-8') if ru.respond_to?(:force_encoding)
		239	with_settings :repositories_encodings => '' do
		240	diff = Redmine::UnifiedDiff.new(read_diff_fixture('issue-12641-ru.diff'), :type => 'inline')
		241	assert_equal 1, diff.size
		242	assert_equal 8, diff.first.size
		243	assert_equal ru, diff.first[3].html_line_left
		244	end
		245	end
		246
224	private	247	private
225		248
226	def read_diff_fixture(filename)	249	def read_diff_fixture(filename)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages