From 248b6756da0d31c58672c0e356c3ec16e9088234 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 16 May 2019 14:31:54 +0200 Subject: [PATCH] Rename util/locale_database/ to include the e that was missing It was misnamed local_database, quite missing the point of its name. Change-Id: I73a4fdf24f53daac12304de1f443636d89afacb2 Reviewed-by: Lars Knoll Reviewed-by: Konstantin Ritt --- src/corelib/tools/qlocale_data_p.h | 2 +- src/corelib/tools/qlocale_mac.mm | 2 +- src/corelib/tools/qt_attribution.json | 2 +- src/corelib/tools/qtimezoneprivate_data_p.h | 4 ++-- util/local_database/README | 1 - util/locale_database/README | 5 +++++ util/{local_database => locale_database}/cldr2qlocalexml.py | 0 util/{local_database => locale_database}/cldr2qtimezone.py | 2 +- util/{local_database => locale_database}/dateconverter.py | 0 util/{local_database => locale_database}/enumdata.py | 0 util/{local_database => locale_database}/formattags.txt | 0 util/{local_database => locale_database}/localexml.py | 0 util/{local_database => locale_database}/qlocalexml2cpp.py | 2 +- .../testlocales/localemodel.cpp | 0 .../testlocales/localemodel.h | 0 .../testlocales/localewidget.cpp | 0 .../testlocales/localewidget.h | 0 .../{local_database => locale_database}/testlocales/main.cpp | 0 .../testlocales/testlocales.pro | 0 util/{local_database => locale_database}/xpathlite.py | 0 20 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 util/local_database/README create mode 100644 util/locale_database/README rename util/{local_database => locale_database}/cldr2qlocalexml.py (100%) rename util/{local_database => locale_database}/cldr2qtimezone.py (99%) rename util/{local_database => locale_database}/dateconverter.py (100%) rename util/{local_database => locale_database}/enumdata.py (100%) rename util/{local_database => locale_database}/formattags.txt (100%) rename util/{local_database => locale_database}/localexml.py (100%) rename util/{local_database => locale_database}/qlocalexml2cpp.py (99%) rename util/{local_database => locale_database}/testlocales/localemodel.cpp (100%) rename util/{local_database => locale_database}/testlocales/localemodel.h (100%) rename util/{local_database => locale_database}/testlocales/localewidget.cpp (100%) rename util/{local_database => locale_database}/testlocales/localewidget.h (100%) rename util/{local_database => locale_database}/testlocales/main.cpp (100%) rename util/{local_database => locale_database}/testlocales/testlocales.pro (100%) rename util/{local_database => locale_database}/xpathlite.py (100%) diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index cc9f99ae200..3e4fd4b8aa2 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -84,7 +84,7 @@ static const int ImperialMeasurementSystemsCount = Do not edit this section: instead regenerate it using cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or - edited) CLDR data; see qtbase/util/local_database/. + edited) CLDR data; see qtbase/util/locale_database/. */ static const QLocaleId likely_subtags[] = { diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index a092e377b56..6c721480f39 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -145,7 +145,7 @@ static QString macTimeToString(const QTime &time, bool short_format) // Mac uses the Unicode CLDR format codes // http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table -// See also qtbase/util/local_database/dateconverter.py +// See also qtbase/util/locale_database/dateconverter.py // Makes the assumption that input formats are always well formed and consecutive letters // never exceed the maximum for the format code. static QString macToQtFormat(QStringView sys_fmt) diff --git a/src/corelib/tools/qt_attribution.json b/src/corelib/tools/qt_attribution.json index 912da3f22c6..f91742d4218 100644 --- a/src/corelib/tools/qt_attribution.json +++ b/src/corelib/tools/qt_attribution.json @@ -22,7 +22,7 @@ "Name": "Unicode Common Locale Data Repository (CLDR)", "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QTimeZone, QLocale).", - "Files": "For update, see qtbase/util/local_database/cldr2qlocalexml.py", + "Files": "For update, see qtbase/util/locale_database/cldr2qlocalexml.py", "Files": "qlocale_data_p.h qtimezoneprivate_data_p.h", "Description": "The Unicode CLDR provides key building blocks for software to support the diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/tools/qtimezoneprivate_data_p.h index 69b9417f19b..5cedac3b49b 100644 --- a/src/corelib/tools/qtimezoneprivate_data_p.h +++ b/src/corelib/tools/qtimezoneprivate_data_p.h @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE with a QT:Spec of OffsetFromUTC These tables are automatically adapted from the CLDR supplemental/windowsZones.xml data file - using a script in qtbase/util/local_database. Please do not edit this data directly. In the + using a script in qtbase/util/locale_database. Please do not edit this data directly. In the future if ICU is made a hard dependency then the ICU resource can be used directly and this table removed */ @@ -120,7 +120,7 @@ struct QUtcData { http://www.unicode.org/cldr/ Do not edit this code: run cldr2qtimezone.py on updated (or - edited) CLDR data; see qtbase/util/local_database/. + edited) CLDR data; see qtbase/util/locale_database/. */ // Windows ID Key, Country Enum, IANA ID Index diff --git a/util/local_database/README b/util/local_database/README deleted file mode 100644 index 23b6a33ad88..00000000000 --- a/util/local_database/README +++ /dev/null @@ -1 +0,0 @@ -local_database is used to generate qlocale data from the Common Locale Data Repository (The database for localized names (like date formats, country names etc)). diff --git a/util/locale_database/README b/util/locale_database/README new file mode 100644 index 00000000000..8654968d66b --- /dev/null +++ b/util/locale_database/README @@ -0,0 +1,5 @@ +locale_database is used to generate qlocale data from CLDR. + +CLDR is the Common Locale Data Repository, a database for localized +data (like date formats, country names etc). It is provided by the +Unicode consortium. diff --git a/util/local_database/cldr2qlocalexml.py b/util/locale_database/cldr2qlocalexml.py similarity index 100% rename from util/local_database/cldr2qlocalexml.py rename to util/locale_database/cldr2qlocalexml.py diff --git a/util/local_database/cldr2qtimezone.py b/util/locale_database/cldr2qtimezone.py similarity index 99% rename from util/local_database/cldr2qtimezone.py rename to util/locale_database/cldr2qtimezone.py index 7c10b1dfd2e..256839317c7 100755 --- a/util/local_database/cldr2qtimezone.py +++ b/util/locale_database/cldr2qtimezone.py @@ -343,7 +343,7 @@ def usage(): http://www.unicode.org/cldr/ Do not edit this code: run cldr2qtimezone.py on updated (or - edited) CLDR data; see qtbase/util/local_database/. + edited) CLDR data; see qtbase/util/locale_database/. */ """ % (str(datetime.date.today()), cldr_version, versionNumber) ) diff --git a/util/local_database/dateconverter.py b/util/locale_database/dateconverter.py similarity index 100% rename from util/local_database/dateconverter.py rename to util/locale_database/dateconverter.py diff --git a/util/local_database/enumdata.py b/util/locale_database/enumdata.py similarity index 100% rename from util/local_database/enumdata.py rename to util/locale_database/enumdata.py diff --git a/util/local_database/formattags.txt b/util/locale_database/formattags.txt similarity index 100% rename from util/local_database/formattags.txt rename to util/locale_database/formattags.txt diff --git a/util/local_database/localexml.py b/util/locale_database/localexml.py similarity index 100% rename from util/local_database/localexml.py rename to util/locale_database/localexml.py diff --git a/util/local_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py similarity index 99% rename from util/local_database/qlocalexml2cpp.py rename to util/locale_database/qlocalexml2cpp.py index fb5ae5ba546..2dad2dd57aa 100755 --- a/util/local_database/qlocalexml2cpp.py +++ b/util/locale_database/qlocalexml2cpp.py @@ -370,7 +370,7 @@ def main(): Do not edit this section: instead regenerate it using cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or - edited) CLDR data; see qtbase/util/local_database/. + edited) CLDR data; see qtbase/util/locale_database/. */ """ % (str(datetime.date.today()), cldr_version) ) diff --git a/util/local_database/testlocales/localemodel.cpp b/util/locale_database/testlocales/localemodel.cpp similarity index 100% rename from util/local_database/testlocales/localemodel.cpp rename to util/locale_database/testlocales/localemodel.cpp diff --git a/util/local_database/testlocales/localemodel.h b/util/locale_database/testlocales/localemodel.h similarity index 100% rename from util/local_database/testlocales/localemodel.h rename to util/locale_database/testlocales/localemodel.h diff --git a/util/local_database/testlocales/localewidget.cpp b/util/locale_database/testlocales/localewidget.cpp similarity index 100% rename from util/local_database/testlocales/localewidget.cpp rename to util/locale_database/testlocales/localewidget.cpp diff --git a/util/local_database/testlocales/localewidget.h b/util/locale_database/testlocales/localewidget.h similarity index 100% rename from util/local_database/testlocales/localewidget.h rename to util/locale_database/testlocales/localewidget.h diff --git a/util/local_database/testlocales/main.cpp b/util/locale_database/testlocales/main.cpp similarity index 100% rename from util/local_database/testlocales/main.cpp rename to util/locale_database/testlocales/main.cpp diff --git a/util/local_database/testlocales/testlocales.pro b/util/locale_database/testlocales/testlocales.pro similarity index 100% rename from util/local_database/testlocales/testlocales.pro rename to util/locale_database/testlocales/testlocales.pro diff --git a/util/local_database/xpathlite.py b/util/locale_database/xpathlite.py similarity index 100% rename from util/local_database/xpathlite.py rename to util/locale_database/xpathlite.py