From 84382bde5c90e68f7c0e9c70c747fce0867fc128 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 19 Feb 2020 14:13:27 +0100 Subject: [PATCH] Rename the localexml module to qlocalexml It implements interaction with the QLocaleXML file format type, so rename it to match. Task-number: QTBUG-81344 Change-Id: I46302d4ac1038cdfc5929e73b554b6d793814c56 Reviewed-by: Lars Knoll --- util/locale_database/cldr2qlocalexml.py | 2 +- util/locale_database/{localexml.py => qlocalexml.py} | 0 util/locale_database/qlocalexml2cpp.py | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename util/locale_database/{localexml.py => qlocalexml.py} (100%) diff --git a/util/locale_database/cldr2qlocalexml.py b/util/locale_database/cldr2qlocalexml.py index 6a0b6cbe1a2..ee53381b224 100755 --- a/util/locale_database/cldr2qlocalexml.py +++ b/util/locale_database/cldr2qlocalexml.py @@ -61,7 +61,7 @@ import enumdata import xpathlite from xpathlite import DraftResolution, findAlias, findEntry, findTagsInFile from dateconverter import convert_date -from localexml import Locale +from qlocalexml import Locale # TODO: make calendars a command-line option calendars = ['gregorian', 'persian', 'islamic'] # 'hebrew' diff --git a/util/locale_database/localexml.py b/util/locale_database/qlocalexml.py similarity index 100% rename from util/locale_database/localexml.py rename to util/locale_database/qlocalexml.py diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py index 52e6331569f..7c00980bc47 100755 --- a/util/locale_database/qlocalexml2cpp.py +++ b/util/locale_database/qlocalexml2cpp.py @@ -40,7 +40,7 @@ import datetime import xml.dom.minidom from enumdata import language_aliases, country_aliases, script_aliases -from localexml import Locale +from qlocalexml import Locale # TODO: Make calendars a command-line parameter # map { CLDR name: Qt file name } @@ -353,7 +353,7 @@ def main(): if len(sys.argv) != 3: usage() - localexml = sys.argv[1] + qlocalexml = sys.argv[1] qtsrcdir = sys.argv[2] if not (os.path.isdir(qtsrcdir) @@ -370,7 +370,7 @@ def main(): s = qlocaledata_file.readline() data_temp_file.write(GENERATED_BLOCK_START) - doc = xml.dom.minidom.parse(localexml) + doc = xml.dom.minidom.parse(qlocalexml) language_map = loadMap(doc, 'language') script_map = loadMap(doc, 'script') country_map = loadMap(doc, 'country')