From: Alberto Mardegan Date: Thu, 24 Jan 2019 19:32:25 +0000 (+0300) Subject: Download CLDR 34.0 X-Git-Tag: v2.7.0~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09528e5e7096ef047b87893ff55f31adffb5d598;p=thirdparty%2Fbabel.git Download CLDR 34.0 --- diff --git a/babel/numbers.py b/babel/numbers.py index 4306e936..e5650dd5 100644 --- a/babel/numbers.py +++ b/babel/numbers.py @@ -448,7 +448,7 @@ def format_currency( >>> format_currency(1099.98, 'JPY', locale='en_US') u'\\xa51,100' >>> format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES') - u'1.100' + u'1.099,98' However, the number of decimal digits can be overriden from the currency information, by setting the last parameter to ``False``: diff --git a/babel/units.py b/babel/units.py index be851c23..e58bf81c 100644 --- a/babel/units.py +++ b/babel/units.py @@ -82,7 +82,7 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N >>> from babel._compat import decimal >>> format_unit(decimal.Decimal("-42.774"), 'temperature-celsius', 'short', format='#.0', locale='fr') - u'-42,8 \\xb0C' + u'-42,8\\u202f\\xb0C' The locale's usual pluralization rules are respected. diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py index b6e6f430..f0d9b10b 100755 --- a/scripts/download_import_cldr.py +++ b/scripts/download_import_cldr.py @@ -13,9 +13,9 @@ except ImportError: from urllib import urlretrieve -URL = 'https://unicode.org/Public/cldr/33/core.zip' -FILENAME = 'core-33.0.zip' -FILESUM = 'fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9' +URL = 'https://unicode.org/Public/cldr/34/core.zip' +FILENAME = 'cldr-core-34.0.zip' +FILESUM = '1d79f6ce294ff350a3ee59d7dd69451fd24776f7105fd6a55c255ffb813c03ba' BLKSIZE = 131072 diff --git a/tests/test_numbers.py b/tests/test_numbers.py index d0f24bd5..29bdc244 100644 --- a/tests/test_numbers.py +++ b/tests/test_numbers.py @@ -209,7 +209,7 @@ def test_list_currencies(): assert list_currencies(locale='pa_Arab') == {'PKR', 'INR', 'EUR'} - assert len(list_currencies()) == 300 + assert len(list_currencies()) == 303 def test_validate_currency(): @@ -412,7 +412,7 @@ def test_format_currency_format_type(): assert (numbers.format_currency(1099.98, 'JPY', locale='en_US') == u'\xa51,100') assert (numbers.format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES') - == u'1.100') + == u'1.099,98') assert (numbers.format_currency(1099.98, 'JPY', locale='en_US', currency_digits=False) == u'\xa51,099.98')