Changeset 622

Timestamp:

Mar 3, 2010, 8:54:13 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Implemented deriving the defaut locale from the process country code if LANG is not set and integration with the system locale object (System Setup -> Country Palette). Closes #123.

Location:

trunk/src/corelib/tools

Files:

• qlocale.cpp (modified) (2 diffs)
• qstring.cpp (modified) (2 diffs)

trunk/src/corelib/tools/qlocale.cpp

@@ -63 +63 @@
 #   include "qt_windows.h"
 #   include <time.h>
+
+
+
+
 #endif
 #if !defined(QWS) && defined(Q_OS_MAC)
@@ -933 +937 @@
 
     return result;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/corelib/tools/qstring.cpp

@@ -4632 +4632 @@
         return 0;
     }
-#elif defined(Q_OS_OS2) && !defined(QT_NO_TEXTCODEC)
+#elif defined(Q_OS_OS2)
+    extern Q_CORE_EXPORT QString qt_system_locale_name(); // qlocale.cpp
+    // UniCreateLocaleObject("") creates an "en_US" locale when LANG is not set
+    // but we want to get the system locale so always use the exact name as
+    // returned by qt_system_locale_name() (it also takes LANG into account)
 #if !defined(QT_NO_THREAD)
     static QAtomicPointer<void> localeObj;
     if (!localeObj) {
         LocaleObject lo = 0;
-        UniCreateLocaleObject(UNI_UCS_STRING_POINTER, (UniChar *)L"", &lo);
+        UniCreateLocaleObject(UNI_UCS_STRING_POINTER,
+                              qt_system_locale_name().utf16(), &lo);
         if (!localeObj.testAndSetRelaxed(0, lo))
             UniFreeLocaleObject(lo); // we are too late
@@ -4644 +4649 @@
     static LocaleObject localeObj = 0;
     if (!localeObj)
-        UniCreateLocaleObject(UNI_UCS_STRING_POINTER, (UniChar *)L"", &localeObj);
+        UniCreateLocaleObject(UNI_UCS_STRING_POINTER,
+                              qt_system_locale_name().utf16(), &localeObj);
 #endif
     if (localeObj) {