From 49c68d335f8443ba5fee0a5201dd8c2d033e59ff Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Tue, 31 Dec 2019 09:37:50 +0200 Subject: [PATCH 1/3] Download CLDR 36.0 --- scripts/download_import_cldr.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py index f118c6900..434b04f80 100755 --- a/scripts/download_import_cldr.py +++ b/scripts/download_import_cldr.py @@ -13,9 +13,9 @@ from urllib import urlretrieve -URL = 'https://unicode.org/Public/cldr/35.1/core.zip' -FILENAME = 'cldr-core-35.1.zip' -FILESUM = 'e2ede8cb8f9c29157e281ee9e696ce540a72c598841bed595a406b710eea87b0' +URL = 'http://unicode.org/Public/cldr/36/core.zip' +FILENAME = 'cldr-core-36.zip' +FILESUM = '07279e56c1f4266d140b907ef3ec379dce0a99542303a9628562ac5fe460ba43' BLKSIZE = 131072 From fab99b8924ad37e9f04798f464f37e2359ebafeb Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Tue, 31 Dec 2019 09:58:03 +0200 Subject: [PATCH 2/3] CLDR import: assume files without revision tags to be new --- scripts/import_cldr.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py index 4188055a6..8993b68e4 100755 --- a/scripts/import_cldr.py +++ b/scripts/import_cldr.py @@ -77,8 +77,10 @@ def error(message, *args): def need_conversion(dst_filename, data_dict, source_filename): with open(source_filename, 'rb') as f: blob = f.read(4096) - version = int(re.search(b'version number="\\$Revision: (\\d+)', - blob).group(1)) + version_match = re.search(b'version number="\\$Revision: (\\d+)', blob) + if not version_match: # CLDR 36.0 was shipped without proper revision numbers + return True + version = int(version_match.group(1)) data_dict['_version'] = version if not os.path.isfile(dst_filename): From d4a7c266ba119ee8564a14575a60948f723a15cb Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Tue, 31 Dec 2019 10:02:04 +0200 Subject: [PATCH 3/3] Correct format_unit test based on new Welsh data --- babel/units.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/babel/units.py b/babel/units.py index e58bf81c2..89c491365 100644 --- a/babel/units.py +++ b/babel/units.py @@ -88,12 +88,12 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N >>> format_unit(1, 'length-meter', locale='ro_RO') u'1 metru' - >>> format_unit(0, 'length-picometer', locale='cy') - u'0 picometr' - >>> format_unit(2, 'length-picometer', locale='cy') - u'2 bicometr' - >>> format_unit(3, 'length-picometer', locale='cy') - u'3 phicometr' + >>> format_unit(0, 'length-mile', locale='cy') + u'0 mi' + >>> format_unit(1, 'length-mile', locale='cy') + u'1 filltir' + >>> format_unit(3, 'length-mile', locale='cy') + u'3 milltir' >>> format_unit(15, 'length-horse', locale='fi') Traceback (most recent call last):