Merged r10476 from trunk (#11922)

fix number_to_currency() raises exception on Rails3 bs and de locale.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10479 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-09-26 11:09:24 +00:00
parent 21a16e0958
commit 35584bc53a
3 changed files with 21 additions and 6 deletions

View File

@ -80,9 +80,8 @@ bs:
format:
unit: 'KM'
format: '%u %n'
separator:
delimiter:
precision:
negative_format: '%u -%n'
delimiter: ''
percentage:
format:
delimiter: ""

View File

@ -84,9 +84,7 @@ de:
format:
unit: '€'
format: '%n %u'
separator:
delimiter:
precision:
delimiter: ''
percentage:
format:
delimiter: ""

View File

@ -171,6 +171,24 @@ class Redmine::I18nTest < ActiveSupport::TestCase
assert_equal 'j', day_letter(4)
end
def test_number_to_currency_for_each_language
valid_languages.each do |lang|
set_language_if_valid lang
assert_nothing_raised "#{lang} failure" do
number_to_currency(-1000.2)
end
end
end
def test_number_to_currency_default
set_language_if_valid 'bs'
assert_equal "KM -1000,20", number_to_currency(-1000.2)
set_language_if_valid 'de'
euro_sign = "\xe2\x82\xac"
euro_sign.force_encoding('UTF-8') if euro_sign.respond_to?(:force_encoding)
assert_equal "-1000,20 #{euro_sign}", number_to_currency(-1000.2)
end
def test_valid_languages
assert valid_languages.is_a?(Array)
assert valid_languages.first.is_a?(Symbol)