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 <[email protected]> Reviewed-by: Konstantin Ritt <[email protected]>
dougcooper · May 20, 2019 · 248b675 · 248b675
1 parent cf909f0
commit 248b675
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/util/locale_database/README 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 → util/locale_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py → util/locale_database/cldr2qlocalexml.py
diff --git a/util/local_database/cldr2qtimezone.py → util/locale_database/cldr2qtimezone.py b/util/local_database/cldr2qtimezone.py → 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 → util/locale_database/dateconverter.py b/util/local_database/dateconverter.py → util/locale_database/dateconverter.py
diff --git a/util/local_database/enumdata.py → util/locale_database/enumdata.py b/util/local_database/enumdata.py → util/locale_database/enumdata.py
diff --git a/util/local_database/formattags.txt → util/locale_database/formattags.txt b/util/local_database/formattags.txt → util/locale_database/formattags.txt
diff --git a/util/local_database/localexml.py → util/locale_database/localexml.py b/util/local_database/localexml.py → util/locale_database/localexml.py
diff --git a/util/local_database/qlocalexml2cpp.py → util/locale_database/qlocalexml2cpp.py b/util/local_database/qlocalexml2cpp.py → 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/...ocal_database/testlocales/localemodel.cpp → ...cale_database/testlocales/localemodel.cpp b/...ocal_database/testlocales/localemodel.cpp → ...cale_database/testlocales/localemodel.cpp
diff --git a/.../local_database/testlocales/localemodel.h → ...locale_database/testlocales/localemodel.h b/.../local_database/testlocales/localemodel.h → ...locale_database/testlocales/localemodel.h
diff --git a/...cal_database/testlocales/localewidget.cpp → ...ale_database/testlocales/localewidget.cpp b/...cal_database/testlocales/localewidget.cpp → ...ale_database/testlocales/localewidget.cpp
diff --git a/...local_database/testlocales/localewidget.h → ...ocale_database/testlocales/localewidget.h b/...local_database/testlocales/localewidget.h → ...ocale_database/testlocales/localewidget.h
diff --git a/util/local_database/testlocales/main.cpp → util/locale_database/testlocales/main.cpp b/util/local_database/testlocales/main.cpp → util/locale_database/testlocales/main.cpp
diff --git a/...ocal_database/testlocales/testlocales.pro → ...cale_database/testlocales/testlocales.pro b/...ocal_database/testlocales/testlocales.pro → ...cale_database/testlocales/testlocales.pro
diff --git a/util/local_database/xpathlite.py → util/locale_database/xpathlite.py b/util/local_database/xpathlite.py → util/locale_database/xpathlite.py