From 381e7156c2e0e802d5cc4354c3e6690d765f95e2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 9 Jun 2012 14:19:13 +0000 Subject: [PATCH] Merged r9782, r9784, r9794 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9795 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/ar.yml | 4 ++-- config/locales/bg.yml | 2 +- config/locales/bs.yml | 2 +- config/locales/ca.yml | 2 +- config/locales/cs.yml | 4 ++-- config/locales/da.yml | 2 +- config/locales/de.yml | 2 +- config/locales/el.yml | 2 +- config/locales/en-GB.yml | 4 ++-- config/locales/en.yml | 4 ++-- config/locales/es.yml | 2 +- config/locales/et.yml | 2 +- config/locales/eu.yml | 2 +- config/locales/fa.yml | 2 +- config/locales/fi.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/gl.yml | 2 +- config/locales/hr.yml | 2 +- config/locales/hu.yml | 2 +- config/locales/id.yml | 2 +- config/locales/ja.yml | 2 +- config/locales/ko.yml | 2 +- config/locales/lt.yml | 2 +- config/locales/lv.yml | 2 +- config/locales/mk.yml | 2 +- config/locales/mn.yml | 2 +- config/locales/nl.yml | 2 +- config/locales/no.yml | 2 +- config/locales/pl.yml | 2 +- config/locales/pt-BR.yml | 2 +- config/locales/pt.yml | 2 +- config/locales/ro.yml | 2 +- config/locales/ru.yml | 2 +- config/locales/sk.yml | 2 +- config/locales/sl.yml | 2 +- config/locales/sq.yml | 4 ++-- config/locales/sr-YU.yml | 2 +- config/locales/sr.yml | 2 +- config/locales/sv.yml | 4 ++-- config/locales/th.yml | 2 +- config/locales/tr.yml | 2 +- config/locales/uk.yml | 2 +- config/locales/vi.yml | 2 +- config/locales/zh-TW.yml | 2 +- config/locales/zh.yml | 4 ++-- test/unit/lib/redmine/i18n_test.rb | 3 ++- 46 files changed, 54 insertions(+), 53 deletions(-) diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 7dbdb5646..84912640a 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -76,14 +76,14 @@ ar: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: byte: one: "Byte" other: "Bytes" - kb: "kB" + kb: "KB" mb: "MB" gb: "GB" tb: "TB" diff --git a/config/locales/bg.yml b/config/locales/bg.yml index db574321f..130e9d51e 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -78,7 +78,7 @@ bg: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 7e80c3b0a..c3a72e521 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -89,7 +89,7 @@ bs: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 304c5123d..845774c39 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -80,7 +80,7 @@ ca: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 1e6a8c668..d37131b37 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -81,14 +81,14 @@ cs: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: byte: one: "Bajt" other: "Bajtů" - kb: "kB" + kb: "KB" mb: "MB" gb: "GB" tb: "TB" diff --git a/config/locales/da.yml b/config/locales/da.yml index 5cb6d9084..54abf8487 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -91,7 +91,7 @@ da: format: # separator: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/de.yml b/config/locales/de.yml index 49d38e657..28af280c2 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -93,7 +93,7 @@ de: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/el.yml b/config/locales/el.yml index 88e135808..8836550b8 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -77,7 +77,7 @@ el: precision: 3 human: format: - precision: 1 + precision: 3 delimiter: "" storage_units: format: "%n %u" diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 9b885ec2a..ce6b5c67d 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -81,14 +81,14 @@ en-GB: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: byte: one: "Byte" other: "Bytes" - kb: "kB" + kb: "KB" mb: "MB" gb: "GB" tb: "TB" diff --git a/config/locales/en.yml b/config/locales/en.yml index 6c13393fc..d1718a77b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -77,14 +77,14 @@ en: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: byte: one: "Byte" other: "Bytes" - kb: "kB" + kb: "KB" mb: "MB" gb: "GB" tb: "TB" diff --git a/config/locales/es.yml b/config/locales/es.yml index 9a0a9096a..64123b9f3 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -48,7 +48,7 @@ es: # These three are to override number.format and are optional # separator: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/et.yml b/config/locales/et.yml index c17fb64ff..3fcc8d290 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -94,7 +94,7 @@ et: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 2c6eaec4d..7df380898 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -79,7 +79,7 @@ eu: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 7d071aa7f..c91cfe67b 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -77,7 +77,7 @@ fa: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 5b43fa875..d6b71723d 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -64,7 +64,7 @@ fi: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d3e2a5473..e53698ef3 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -91,7 +91,7 @@ fr: format: '%n %u' human: format: - precision: 2 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 94df2918f..dd6a61168 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -32,7 +32,7 @@ gl: format: # separator: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index e6efe76f7..778ca9405 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -72,7 +72,7 @@ hr: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 85d7aa3f9..6e161f90a 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -97,7 +97,7 @@ human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/id.yml b/config/locales/id.yml index 15b38c945..6beb3859d 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -78,7 +78,7 @@ id: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index c65cdec90..35bdfb8c3 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -96,7 +96,7 @@ ja: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 0ceebd145..8bb22df07 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -119,7 +119,7 @@ ko: # These three are to override number.format and are optional # separator: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 9e6d434bc..fb26e3f9e 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -109,7 +109,7 @@ lt: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: # Storage units output formatting. # %u is the storage unit, %n is the number (default: 2 MB) diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 6933d45de..5bb429db9 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -72,7 +72,7 @@ lv: human: format: delimiter: " " - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index f88ab87cc..fe5fa575b 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -77,7 +77,7 @@ mk: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 5e3013563..e00c9f075 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -75,7 +75,7 @@ mn: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 8b6c2e658..371040fe5 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -74,7 +74,7 @@ nl: precision: 3 human: format: - precision: 1 + precision: 3 delimiter: "" storage_units: format: "%n %u" diff --git a/config/locales/no.yml b/config/locales/no.yml index 404a44404..fb937f062 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -63,7 +63,7 @@ other: "nesten %{count} år" number: format: - precision: 2 + precision: 3 separator: "." delimiter: "," currency: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 1869cdafa..3451f65e2 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -21,7 +21,7 @@ pl: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 3796a3651..531fa3f7b 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -97,7 +97,7 @@ pt-BR: delimiter: '.' human: format: - precision: 1 + precision: 3 delimiter: '.' storage_units: format: "%n %u" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index ae1fed497..ab20eb1f5 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -89,7 +89,7 @@ pt: delimiter: '' human: format: - precision: 1 + precision: 3 delimiter: '' storage_units: format: "%n %u" diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 14c8a63c5..9092ccb88 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -73,7 +73,7 @@ ro: human: format: - precision: 1 + precision: 3 delimiter: "" storage_units: format: "%n %u" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index de1260e6a..568211b24 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -68,7 +68,7 @@ ru: human: format: delimiter: "" - precision: 2 + precision: 3 # Rails 2.2 # storage_units: [байт, КБ, МБ, ГБ, ТБ] diff --git a/config/locales/sk.yml b/config/locales/sk.yml index bc66a0ca0..d7c2bf4c2 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -75,7 +75,7 @@ sk: human: format: - precision: 1 + precision: 3 delimiter: "" storage_units: format: "%n %u" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index ca8269d18..98ea5a2d3 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -75,7 +75,7 @@ sl: precision: 3 human: format: - precision: 1 + precision: 3 delimiter: "" storage_units: format: "%n %u" diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 353278dcf..5b000d31e 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -77,14 +77,14 @@ sq: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: byte: one: "Byte" other: "Bytes" - kb: "kB" + kb: "KB" mb: "MB" gb: "GB" tb: "TB" diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index 06e4df19c..92a7cd7a0 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -77,7 +77,7 @@ sr-YU: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index c7a2e692e..f3369a919 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -77,7 +77,7 @@ sr: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index b7fc051b6..9931eafc5 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -47,14 +47,14 @@ sv: # These three are to override number.format and are optional # separator: delimiter: "" - # precision: 1 + precision: 3 storage_units: format: "%n %u" units: byte: one: "Byte" other: "Bytes" - kb: "kB" + kb: "KB" mb: "MB" gb: "GB" tb: "TB" diff --git a/config/locales/th.yml b/config/locales/th.yml index 2cb817142..29005f911 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -74,7 +74,7 @@ th: precision: 3 human: format: - precision: 1 + precision: 3 delimiter: "" storage_units: format: "%n %u" diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 65ad2bba5..8503750b0 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -99,7 +99,7 @@ tr: format: delimiter: '.' separator: ',' - precision: 2 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index b2536ea1e..a629c4dae 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -74,7 +74,7 @@ uk: precision: 3 human: format: - precision: 1 + precision: 3 delimiter: "" storage_units: format: "%n %u" diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 75e821b42..725023269 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -48,7 +48,7 @@ vi: # These three are to override number.format and are optional # separator: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 62579d305..e66bedf76 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -87,7 +87,7 @@ # 下列三個選項設定, 若有設定值將會取代 number.format 成為預設值 # separator: delimiter: "" - precision: 1 + precision: 3 # 儲存單位輸出格式. # %u 是儲存單位, %n 是數值 (預設值: 2 MB) storage_units: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 6d84ebc31..61bb111ca 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -79,14 +79,14 @@ zh: human: format: delimiter: "" - precision: 1 + precision: 3 storage_units: format: "%n %u" units: byte: one: "Byte" other: "Bytes" - kb: "kB" + kb: "KB" mb: "MB" gb: "GB" tb: "TB" diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index 9c7d92849..0b7ee20f0 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -121,7 +121,8 @@ class Redmine::I18nTest < ActiveSupport::TestCase valid_languages.each do |lang| set_language_if_valid lang assert_nothing_raised "#{lang} failure" do - number_to_human_size(1024*1024*4) + size = number_to_human_size(257024) + assert_match /251/, size end end end