Skip to content

Commit fe82fbc

Browse files
authored
Use CLDR 44 and adjust tests to match new data (#1071)
1 parent e0d1018 commit fe82fbc

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

babel/dates.py

-2
Original file line numberDiff line numberDiff line change
@@ -1511,8 +1511,6 @@ def format_period(self, char: str, num: int) -> str:
15111511
>>> format = DateTimeFormat(datetime(2022, 4, 28, 6, 27), 'zh_Hant')
15121512
>>> format.format_period('a', 1)
15131513
u'上午'
1514-
>>> format.format_period('b', 1)
1515-
u'清晨'
15161514
>>> format.format_period('B', 1)
15171515
u'清晨'
15181516

babel/numbers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ def get_exponential_symbol(
418418
>>> get_exponential_symbol('en_US')
419419
u'E'
420420
>>> get_exponential_symbol('ar_EG', numbering_system='default')
421-
u'اس'
421+
u'أس'
422422
>>> get_exponential_symbol('ar_EG', numbering_system='latn')
423423
u'E'
424424
@@ -956,7 +956,7 @@ def format_scientific(
956956
>>> format_scientific(10000, locale='en_US')
957957
u'1E4'
958958
>>> format_scientific(10000, locale='ar_EG', numbering_system='default')
959-
u'1اس4'
959+
u'1أس4'
960960
961961
The format pattern can also be specified explicitly:
962962

babel/units.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ def format_compound_unit(
248248
>>> format_compound_unit(4, "meter", "ratakisko", length="short", locale="fi")
249249
'4 m/ratakisko'
250250
251-
>>> format_compound_unit(35, "minute", denominator_unit="fathom", locale="sv")
252-
'35 minuter per famn'
251+
>>> format_compound_unit(35, "minute", denominator_unit="nautical-mile", locale="sv")
252+
'35 minuter per nautisk mil'
253253
254254
>>> from babel.numbers import format_currency
255255
>>> format_compound_unit(format_currency(35, "JPY", locale="de"), denominator_unit="liter", locale="de")

scripts/download_import_cldr.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import zipfile
1010
from urllib.request import urlretrieve
1111

12-
URL = 'http://unicode.org/Public/cldr/43/cldr-common-43.0.zip'
13-
FILENAME = 'cldr-common-43.0.zip'
14-
# Via https://unicode.org/Public/cldr/43/hashes/SHASUM512
15-
FILESUM = '930c64208d6f680d115bfa74a69445fb614910bb54233227b0b9ae85ddbce4db19e4ec863bf04ae9d4a11b2306aa7394e553384d7537487de8011f0e34877cef'
12+
URL = 'https://unicode.org/Public/cldr/44/cldr-common-44.0.zip'
13+
FILENAME = 'cldr-common-44.0.zip'
14+
# Via https://unicode.org/Public/cldr/44/hashes/SHASUM512
15+
FILESUM = 'f2cd8733948caf308d6e39eae21724da7f29f528f8969d456514e1e84ecd5f1e6936d0460414a968888bb1b597bc1ee723950ea47df5cba21a02bb14f96d18b6'
1616
BLKSIZE = 131072
1717

1818

tests/test_numbers.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def test_compact(self):
164164
assert numbers.format_compact_decimal(1000, locale='ja_JP', format_type="short") == '1000'
165165
assert numbers.format_compact_decimal(9123, locale='ja_JP', format_type="short") == '9123'
166166
assert numbers.format_compact_decimal(10000, locale='ja_JP', format_type="short") == '1万'
167-
assert numbers.format_compact_decimal(1234567, locale='ja_JP', format_type="long") == '123万'
167+
assert numbers.format_compact_decimal(1234567, locale='ja_JP', format_type="short") == '123万'
168168
assert numbers.format_compact_decimal(-1, locale='en_US', format_type="short") == '-1'
169169
assert numbers.format_compact_decimal(-1234, locale='en_US', format_type="short", fraction_digits=2) == '-1.23K'
170170
assert numbers.format_compact_decimal(-123456789, format_type='short', locale='en_US') == '-123M'
@@ -373,8 +373,8 @@ def test_get_exponential_symbol():
373373
assert numbers.get_exponential_symbol('en_US', numbering_system="default") == 'E'
374374
assert numbers.get_exponential_symbol('ja_JP') == 'E'
375375
assert numbers.get_exponential_symbol('ar_EG') == 'E'
376-
assert numbers.get_exponential_symbol('ar_EG', numbering_system="default") == 'اس'
377-
assert numbers.get_exponential_symbol('ar_EG', numbering_system="arab") == 'اس'
376+
assert numbers.get_exponential_symbol('ar_EG', numbering_system="default") == 'أس'
377+
assert numbers.get_exponential_symbol('ar_EG', numbering_system="arab") == 'أس'
378378
assert numbers.get_exponential_symbol('ar_EG', numbering_system="latn") == 'E'
379379

380380

@@ -593,8 +593,10 @@ def test_format_currency_long_display_name():
593593
assert (numbers.format_currency(2, 'EUR', locale='en_US', format_type='name')
594594
== '2.00 euros')
595595
# This tests that '{1} {0}' unitPatterns are found:
596+
assert (numbers.format_currency(150, 'USD', locale='sw', format_type='name')
597+
== 'dola za Marekani 150.00')
596598
assert (numbers.format_currency(1, 'USD', locale='sw', format_type='name')
597-
== 'dola ya Marekani 1.00')
599+
== '1.00 dola ya Marekani')
598600
# This tests unicode chars:
599601
assert (numbers.format_currency(1099.98, 'USD', locale='es_GT', format_type='name')
600602
== 'dólares estadounidenses 1,099.98')
@@ -689,7 +691,7 @@ def test_format_scientific():
689691
assert numbers.format_scientific(4234567, '##0.#####E00', locale='en_US') == '4.23457E06'
690692
assert numbers.format_scientific(4234567, '##0.##E00', locale='en_US') == '4.23E06'
691693
assert numbers.format_scientific(42, '00000.000000E0000', locale='en_US') == '42000.000000E-0003'
692-
assert numbers.format_scientific(0.2, locale="ar_EG", numbering_system="default") == '2اس\u061c-1'
694+
assert numbers.format_scientific(0.2, locale="ar_EG", numbering_system="default") == '2أس\u061c-1'
693695

694696

695697
def test_default_scientific_format():

tests/test_support.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ def test_format_percent(self):
345345
def test_format_scientific(self):
346346
assert support.Format('en_US').scientific(10000) == '1E4'
347347
assert support.Format('en_US').scientific(Decimal("10000")) == '1E4'
348-
assert support.Format('ar_EG', numbering_system="default").scientific(10000) == '1اس4'
348+
assert support.Format('ar_EG', numbering_system="default").scientific(10000) == '1أس4'
349349

350350

351351
def test_lazy_proxy():

0 commit comments

Comments
 (0)