summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <[email protected]>2025-09-29 12:28:29 +0200
committerEdward Welbourne <[email protected]>2025-09-30 15:08:40 +0200
commit3ccf5e53d255735afcb34043237f44c9972506c8 (patch)
tree11ed8f2e83f7cdf2202fb06274bd686e97ac40b5
parentc1366c357bcec1e449fc71f23a4d991706d184d6 (diff)
Remove seconds from C locale short time format
This is for consistency with other locales, none of which include seconds in their short formats. Until Qt 5.0.0's update to CLDR 1.4 (commit 3bfb72b90151339d85af3d064839beb40a82f933 in the git-p4 history, 2006-09-15) the other locales did include seconds, but since then they have not. However, the C locale retained its seconds. Since the C locale is used as fall-back for locales for which we have no data, this affects all such locales as well. Since the resulting short time format is, like its prior longer form, a sub-string of the long time format, the change doesn't affect the time_format_data[] or trigger any consequent changes to other rows of the main locale_data[] table. Only the C locale's own row changes, just shortening the substring it reuses. [ChangeLog][QtCore][QLocale] The C locale now, in line with all locales derived from CLDR data, omits seconds from its short time format. Fixes: QTBUG-140643 Change-Id: Ic5f181dc581c70a28afdd3f8f32b78190e818131 Reviewed-by: Thiago Macieira <[email protected]> Reviewed-by: Ahmad Samir <[email protected]>
-rw-r--r--src/corelib/text/qlocale_data_p.h4
-rw-r--r--util/locale_database/qlocalexml.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/text/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h
index e24b205475c..7c118de7d37 100644
--- a/src/corelib/text/qlocale_data_p.h
+++ b/src/corelib/text/qlocale_data_p.h
@@ -60,7 +60,7 @@ struct LanguageCodeEntry
// GENERATED PART STARTS HERE
/*
- This part of the file was generated on 2025-06-17 from the
+ This part of the file was generated on 2025-09-29 from the
Common Locale Data Repository v47
http://www.unicode.org/cldr/
@@ -1214,7 +1214,7 @@ static inline constexpr quint16 locale_index[] = {
static inline constexpr QLocaleData locale_data[] = {
// lang script terr lStrt lpMid lpEnd lPair lDelm dec group prcnt zero minus plus exp qtOpn qtEnd altQO altQE lDFmt sDFmt lTFmt sTFmt slDay lDays ssDys sDays snDay nDays am pm byte siQnt iecQn crSym crDsp crFmt crFNg ntLng ntTer currISO curDgt curRnd dow1st wknd+ wknd- grpTop grpMid grpEnd
- { 1, 0, 0, 0, 0, 0, 0, 6, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 8, 0, 17, 0, 0, 0, 0, 56, 56, 83, 96, 0, 0, 0, 5, 22, 0, 0, 0, 0, 0, 0, 6, 6, 6, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 17, 10, 10, 8, 56, 56, 27, 27, 13, 13, 2, 2, 5, 17, 23, 0, 0, 4, 0, 0, 0, {0,0,0}, 2, 1, 1, 6, 7, 1, 3, 3 }, // C/AnyScript/AnyTerritory
+ { 1, 0, 0, 0, 0, 0, 0, 6, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 8, 0, 17, 0, 0, 0, 0, 56, 56, 83, 96, 0, 0, 0, 5, 22, 0, 0, 0, 0, 0, 0, 6, 6, 6, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 17, 10, 10, 5, 56, 56, 27, 27, 13, 13, 2, 2, 5, 17, 23, 0, 0, 4, 0, 0, 0, {0,0,0}, 2, 1, 1, 6, 7, 1, 3, 3 }, // C/AnyScript/AnyTerritory
{ 2, 27, 90, 0, 0, 7, 7, 6, 1, 9, 2, 3, 4, 5, 10, 11, 12, 13, 14, 27, 49, 10, 0, 109, 109, 157, 157, 179, 179, 0, 0, 0, 5, 22, 0, 0, 4, 0, 0, 6, 6, 6, 9, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 22, 10, 13, 5, 48, 48, 22, 22, 15, 15, 2, 2, 4, 17, 23, 1, 0, 5, 0, 6, 9, {71,69,76}, 2, 1, 1, 6, 7, 1, 3, 3 }, // Abkhazian/Cyrillic/Georgia
{ 3, 66, 77, 0, 0, 0, 0, 6, 0, 1, 2, 3, 4, 5, 10, 14, 15, 16, 17, 59, 78, 23, 38, 194, 194, 245, 245, 272, 272, 0, 0, 0, 5, 22, 1, 0, 2, 0, 15, 20, 6, 6, 6, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 19, 8, 15, 7, 51, 51, 27, 27, 13, 13, 2, 2, 4, 17, 23, 2, 0, 4, 0, 5, 7, {69,84,66}, 2, 1, 7, 6, 7, 1, 3, 3 }, // Afar/Latin/Ethiopia
{ 3, 66, 67, 0, 0, 0, 0, 6, 0, 1, 2, 3, 4, 5, 10, 14, 15, 16, 17, 59, 78, 23, 38, 194, 194, 245, 245, 272, 272, 0, 0, 0, 5, 22, 3, 0, 2, 0, 15, 27, 6, 6, 6, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 19, 8, 15, 7, 51, 51, 27, 27, 13, 13, 2, 2, 4, 17, 23, 3, 0, 4, 0, 5, 7, {68,74,70}, 0, 0, 6, 6, 7, 1, 3, 3 }, // Afar/Latin/Djibouti
diff --git a/util/locale_database/qlocalexml.py b/util/locale_database/qlocalexml.py
index 92996ca48fb..ff8c697d1ce 100644
--- a/util/locale_database/qlocalexml.py
+++ b/util/locale_database/qlocalexml.py
@@ -1049,7 +1049,7 @@ class Locale (object):
# CLDR gives 'dddd, MMMM d, yyyy', 'M/d/yy', 'h:mm:ss Ap tttt',
# 'h:mm Ap' with non-breaking space before Ap.
longDateFormat='dddd, d MMMM yyyy', shortDateFormat='d MMM yyyy',
- longTimeFormat='HH:mm:ss t', shortTimeFormat='HH:mm:ss',
+ longTimeFormat='HH:mm:ss t', shortTimeFormat='HH:mm',
# CLDR has US-$ and US-style formats:
currencyIsoCode='', currencySymbol='', currencyDisplayName='',
currencyDigits=2, currencyRounding=1,