diff options
author | Aarni Koskela <akx@iki.fi> | 2016-11-21 16:38:54 +0200 |
---|---|---|
committer | Aarni Koskela <akx@iki.fi> | 2018-01-17 09:14:18 +0200 |
commit | 63741104da581fbed53ad854d00835cf5f87a8d6 (patch) | |
tree | 7bb4aa190129449a158e074db4066ed17414aae0 | |
parent | 7dca6fad8e46cd6c491d1ff1f84f3c297f3f5ddd (diff) | |
download | babel-63741104da581fbed53ad854d00835cf5f87a8d6.tar.gz |
cldr: use CLDR 30.0.2 (and fix test changes)
-rw-r--r-- | babel/units.py | 2 | ||||
-rwxr-xr-x | scripts/download_import_cldr.py | 6 | ||||
-rwxr-xr-x | scripts/import_cldr.py | 12 | ||||
-rw-r--r-- | tests/test_date_intervals.py | 2 | ||||
-rw-r--r-- | tests/test_lists.py | 2 |
5 files changed, 14 insertions, 10 deletions
diff --git a/babel/units.py b/babel/units.py index 1ea5b17..4260b3d 100644 --- a/babel/units.py +++ b/babel/units.py @@ -201,7 +201,7 @@ def format_compound_unit( '150 kilometer per timme' >>> format_compound_unit(150, "kilowatt", denominator_unit="year", locale="fi") - '150 kilowattia vuodessa' + '150 kilowattia / vuosi' >>> format_compound_unit(32.5, "ton", 15, denominator_unit="hour", locale="en") '32.5 tons per 15 hours' diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py index 4cc6a4b..9914a11 100755 --- a/scripts/download_import_cldr.py +++ b/scripts/download_import_cldr.py @@ -13,9 +13,9 @@ except ImportError: from urllib import urlretrieve -URL = 'http://unicode.org/Public/cldr/29/core.zip' -FILENAME = 'core-29.zip' -FILESUM = '44d117e6e591a8f9655602ff0abdee105df3cabe' +URL = 'http://unicode.org/Public/cldr/30.0.2/core.zip' +FILENAME = 'core-30.0.2.zip' +FILESUM = '7d21d5f34a2b94f78f737d9279bcaae85ccc5332' BLKSIZE = 131072 diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py index 7b9e773..4f49491 100755 --- a/scripts/import_cldr.py +++ b/scripts/import_cldr.py @@ -708,14 +708,18 @@ def parse_number_symbols(data, tree): def parse_decimal_formats(data, tree): decimal_formats = data.setdefault('decimal_formats', {}) for elem in tree.findall('.//decimalFormats/decimalFormatLength'): - type = elem.attrib.get('type') - if _should_skip_elem(elem, type, decimal_formats): + length_type = elem.attrib.get('type') + if _should_skip_elem(elem, length_type, decimal_formats): continue if elem.findall('./alias'): # TODO map the alias to its target continue - pattern = text_type(elem.findtext('./decimalFormat/pattern')) - decimal_formats[type] = numbers.parse_pattern(pattern) + for pattern_el in elem.findall('./decimalFormat/pattern'): + pattern_type = pattern_el.attrib.get('type') + pattern = numbers.parse_pattern(text_type(pattern_el.text)) + if not pattern_type: + # Regular decimal format. + decimal_formats[length_type] = pattern def parse_scientific_formats(data, tree): diff --git a/tests/test_date_intervals.py b/tests/test_date_intervals.py index e5a797a..2e5f0d6 100644 --- a/tests/test_date_intervals.py +++ b/tests/test_date_intervals.py @@ -13,7 +13,7 @@ TEST_DATE = TEST_DT.date() def test_format_interval_same_instant_1(): - assert dates.format_interval(TEST_DT, TEST_DT, "yMMMd", fuzzy=False, locale="fi") == "8. tammikuuta 2016" + assert dates.format_interval(TEST_DT, TEST_DT, "yMMMd", fuzzy=False, locale="fi") == "8. tammik. 2016" def test_format_interval_same_instant_2(): diff --git a/tests/test_lists.py b/tests/test_lists.py index f5021ea..bd297ec 100644 --- a/tests/test_lists.py +++ b/tests/test_lists.py @@ -9,6 +9,6 @@ def test_format_list(): (['string1', 'string2'], 'en', u'string1 and string2'), (['string1', 'string2', 'string3'], 'en', u'string1, string2, and string3'), (['string1', 'string2', 'string3'], 'zh', u'string1、string2和string3'), - (['string1', 'string2', 'string3', 'string4'], 'ne', u'string1 र string2, string3 र string4'), + (['string1', 'string2', 'string3', 'string4'], 'ne', u'string1,string2, string3 र string4'), ]: assert lists.format_list(list, locale=locale) == expected |