From cff042eb535676bed4d241cfa1b2c976f30f3244 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 1 Nov 2024 17:01:30 +0100 Subject: [PATCH] Correct an earlier pick Amends commit 52909797accd850126802dcc66d00327eb1e50a5, whose conflict resolutions inadvertently incorporated the movement of IANA IDs from the list table to the IANA table, a change only done on dev (6.9), not picked back to 6.8, but tagged with a # TODO comment in 6.8 that, none the less, is not to be done in 6.8. Restore writing to the correct table. Change-Id: I70fd133eb54526efecae189306b3ae07c1c638db Reviewed-by: Mate Barany --- util/locale_database/qlocalexml2cpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py index 950e284baf5..cada1d4544b 100755 --- a/util/locale_database/qlocalexml2cpp.py +++ b/util/locale_database/qlocalexml2cpp.py @@ -223,7 +223,7 @@ class TimeZoneDataWriter (LocaleSourceEditor): def msToIana(self, pairs: Iterator[tuple[str, str]]) -> None: out: Callable[[str], int] = self.writer.write winStore: Callable[[str], int] = self.__windowsTable.append - ianaStore: Callable[[str], int] = self.__ianaTable.append + ianaStore: Callable[[str], int] = self.__ianaListTable.append alias: dict[str, str] = dict(pairs) # {MS name: IANA ID} out('// Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset\n')