summaryrefslogtreecommitdiffstats
path: root/util/locale_database/qlocalexml2cpp.py
diff options
context:
space:
mode:
Diffstat (limited to 'util/locale_database/qlocalexml2cpp.py')
-rwxr-xr-xutil/locale_database/qlocalexml2cpp.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py
index c670672fc0..4235f1feb3 100755
--- a/util/locale_database/qlocalexml2cpp.py
+++ b/util/locale_database/qlocalexml2cpp.py
@@ -253,7 +253,10 @@ class LocaleDataWriter (LocaleSourceEditor):
'curRnd ' # Currencty rounding (unused: QTBUG-81343)
'dow1st ' # First day of week
' wknd+ ' # Week-end start/end days
- ' wknd-'
+ ' wknd- '
+ 'grpTop '
+ 'grpMid '
+ 'grpEnd'
# No trailing space on last entry (be sure to
# pad before adding anything after it).
'\n')
@@ -276,6 +279,8 @@ class LocaleDataWriter (LocaleSourceEditor):
'{:6d},{:6d}',
# Day of week and week-end
',{:6d}' * 3,
+ # Number group sizes
+ ',{:6d}' * 3,
' }}')).format
for key in names:
locale = locales[key]
@@ -318,16 +323,14 @@ class LocaleDataWriter (LocaleSourceEditor):
(currencyIsoCodeData(locale.currencyIsoCode),
locale.currencyDigits,
locale.currencyRounding, # unused (QTBUG-81343)
- locale.firstDayOfWeek,
- locale.weekendStart,
- locale.weekendEnd) ))
+ locale.firstDayOfWeek, locale.weekendStart, locale.weekendEnd,
+ locale.groupTop, locale.groupHigher, locale.groupLeast) ))
+ ', // {}/{}/{}\n'.format(
locale.language, locale.script, locale.country))
self.writer.write(formatLine(*( # All zeros, matching the format:
(0,) * 3 + (0,) * 37 * 2
+ (currencyIsoCodeData(0),)
- + (0,) * 2
- + (0,) * 3 ))
+ + (0,) * 8 ))
+ ' // trailing zeros\n')
self.writer.write('};\n')