| @@ -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}文字までです。" | |
| @@ -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} часов" | |
| @@ -199,10 +199,16 module Redmine | |||
|
|
199 | 199 | while starting < max && line_left[starting] == line_right[starting] |
|
|
200 | 200 | starting += 1 |
|
|
201 | 201 | end |
|
|
202 | while line_left[starting].ord.between?(128, 191) && starting > 0 | |
|
|
203 | starting -= 1 | |
|
|
204 | end | |
|
|
202 | 205 | ending = -1 |
|
|
203 | 206 | while ending >= -(max - starting) && line_left[ending] == line_right[ending] |
|
|
204 | 207 | ending -= 1 |
|
|
205 | 208 | end |
|
|
209 | while line_left[ending].ord.between?(128, 191) && ending > -1 | |
|
|
210 | ending -= 1 | |
|
|
211 | end | |
|
|
206 | 212 | unless starting == 0 && ending == -1 |
|
|
207 | 213 | [starting, ending] |
|
|
208 | 214 | end |
| @@ -221,6 +221,29 DIFF | |||
|
|
221 | 221 | assert_equal "test02.txt", diff[0].file_name |
|
|
222 | 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 | 247 | private |
|
|
225 | 248 | |
|
|
226 | 249 | def read_diff_fixture(filename) |
General Comments 0
You need to be logged in to leave comments.
Login now