diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-19 14:58:40 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-11-08 13:01:06 +0100 |
commit | ed853a66f80dde0a6bbc48883efb835abf21e746 (patch) | |
tree | 71e1d37a8b93adf7db87a89808c02515ff804128 /util/locale_database | |
parent | b83b990659419b37d8ebffd451eb49bccfe62669 (diff) |
Simplify QLocaleXmlWriter::enumData()
Move the repeated List suffix to the __enumTable() helper, where half
the parameter's uses were having to snip it off anyway.
Change-Id: Ia396e87e59ceeb81fc4b0890a86934dc67da10cb
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'util/locale_database')
-rw-r--r-- | util/locale_database/qlocalexml.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/util/locale_database/qlocalexml.py b/util/locale_database/qlocalexml.py index d8a99f3f3d..97b369fde8 100644 --- a/util/locale_database/qlocalexml.py +++ b/util/locale_database/qlocalexml.py @@ -335,9 +335,9 @@ class QLocaleXmlWriter (object): # Output of various sections, in their usual order: def enumData(self, languages, scripts, countries): - self.__enumTable('languageList', languages) - self.__enumTable('scriptList', scripts) - self.__enumTable('countryList', countries) + self.__enumTable('language', languages) + self.__enumTable('script', scripts) + self.__enumTable('country', countries) def likelySubTags(self, entries): self.__openTag('likelySubtags') @@ -381,14 +381,14 @@ class QLocaleXmlWriter (object): raise Error('Attempted to write data after closing :-(') def __enumTable(self, tag, table): - self.__openTag(tag) + self.__openTag(tag + 'List') for key, value in table.iteritems(): - self.__openTag(tag[:-4]) + self.__openTag(tag) self.inTag('name', value[0]) self.inTag('id', key) self.inTag('code', value[1]) - self.__closeTag(tag[:-4]) - self.__closeTag(tag) + self.__closeTag(tag) + self.__closeTag(tag + 'List') def __likelySubTag(self, tag, likely): self.__openTag(tag) |