From af57b23b62935aeed590023cb15b0efbfd6543b0 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 23 May 2024 21:38:02 +0200 Subject: [PATCH] Move clearing of self-aliases upstream to QLocaleXmlWriter The duplicate entries just bulked up the intermediate file. Makes no change to generated data. Task-number: QTBUG-115158 Change-Id: I6dc0d1f79f8dcf2e46264c6f9d1ae06ff4c91394 Reviewed-by: Mate Barany --- util/locale_database/qlocalexml.py | 2 ++ util/locale_database/qlocalexml2cpp.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/util/locale_database/qlocalexml.py b/util/locale_database/qlocalexml.py index bb2d62c0412..dae1894cd23 100644 --- a/util/locale_database/qlocalexml.py +++ b/util/locale_database/qlocalexml.py @@ -350,6 +350,8 @@ class QLocaleXmlWriter (object): # iana is a single IANA ID # name has the same form, but has been made redundant for name, iana in sorted(alias.items()): + if name == iana: + continue self.__openTag('zoneAlias') self.inTag('alias', name) self.inTag('iana', iana) diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py index 74afaf1eef0..5bc9dd92f21 100755 --- a/util/locale_database/qlocalexml2cpp.py +++ b/util/locale_database/qlocalexml2cpp.py @@ -212,9 +212,9 @@ class TimeZoneDataWriter (LocaleSourceEditor): out('// Alias ID Index, Alias ID Index\n') out('static constexpr AliasData aliasMappingTable[] = {\n') for name, iana in pairs: # They're ready-sorted - if name != iana: - out(f' {{ {store(name):6d},{store(iana):6d} }},' - f' // {name} -> {iana}\n') + assert name != iana, (alias, iana) # Filtered out in QLocaleXmlWriter + out(f' {{ {store(name):6d},{store(iana):6d} }},' + f' // {name} -> {iana}\n') out('};\n\n') def msToIana(self, pairs):