diff --git a/util/locale_database/cldr.py b/util/locale_database/cldr.py index 1692b872d03..8dd33d0d513 100644 --- a/util/locale_database/cldr.py +++ b/util/locale_database/cldr.py @@ -292,7 +292,7 @@ class CldrReader (object): currencyRounding = int(rounding)) locale.update(scan.currencyData(iso)) - locale.update(scan.numericData(self.root.numberSystem, self.whitter)) + locale.update(scan.numericData(self.root.numberSystem)) locale.update(scan.textPatternData()) locale.update(scan.endonyms(language, script, territory, variant)) locale.update(scan.unitData()) # byte, kB, MB, GB, ..., KiB, MiB, GiB, ... diff --git a/util/locale_database/ldml.py b/util/locale_database/ldml.py index 0e370887e6c..476f3602293 100644 --- a/util/locale_database/ldml.py +++ b/util/locale_database/ldml.py @@ -270,7 +270,7 @@ class LocaleScanner (object): yield 'currencySymbol', symbol yield 'currencyDisplayName', name - def numericData(self, lookup, complain = lambda text: None): + def numericData(self, lookup): """Generate assorted numeric data for the locale. First argument, lookup, is a callable that maps a numbering @@ -436,7 +436,7 @@ class LocaleScanner (object): See CldrAccess.readMetaZoneMap() for the locale-independent data that stitches these pieces together.""" - stem, formats = 'dates/timeZoneNames', {} + stem = 'dates/timeZoneNames' # '+HH:mm;-HH:mm' (and :ss is also supported, but nowhere used in v45). # Sometimes has single-digit hours hours = self.find(f'{stem}/hourFormat').split(';')