Changeset 622 for trunk/src

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(Q_OS_OS2)
+#   include "qt_os2.h"
+#   include <unidef.h>
 #endif
 #if !defined(QWS) && defined(Q_OS_MAC)
@@ -933 +937 @@
 
     return result;
+}
+
+
+#elif defined(Q_OS_OS2)
+/******************************************************************************
+** Wrappers for OS/2 locale system functions
+*/
+
+Q_CORE_EXPORT QString qt_system_locale_name()
+{
+    QString locale = QString::fromLatin1(envVarLocale());
+    if (locale.isEmpty()) {
+        // get the locale from the system country code
+        COUNTRYCODE code = { 0, 0 };
+        COUNTRYINFO info;
+        ULONG actual;
+        APIRET arc = DosQueryCtryInfo(sizeof(info), &code, &info, &actual);
+        if (arc == NO_ERROR) {
+            UniChar localeName[8];
+            if (UniMapCtryToLocale(info.country, localeName,
+                                   sizeof(localeName)) == ULS_SUCCESS)
+                locale = QString::fromUtf16(localeName);
+        }
+    }
+
+    return locale;
+}
+
+/*!
+    \since 4.6
+
+    Returns a fallback locale, that will get used for everything that
+    is not explicitly overridden by the system locale.
+*/
+QLocale QSystemLocale::fallbackLocale() const
+{
+    return QLocale(qt_system_locale_name());
+}
+
+/*!
+    Performs a query of the given \a type in the system locale for
+    customized values or conversion. If the method returns a null
+    QVariant, the conversion of the fallbackLocale() will be used.
+
+    \a in is unused for some of the query types.
+
+    \sa QSystemLocale::QueryType
+*/
+QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
+{
+    static LocaleItem dayNames[] = {
+        // 0 ... 6 (Mon - Sun)
+        LOCI_sDayName1, LOCI_sDayName2, LOCI_sDayName3, LOCI_sDayName4,
+        LOCI_sDayName5, LOCI_sDayName6, LOCI_sDayName7,
+        // 7 ... 13 (Mon - Sun)
+        LOCI_sAbbrevDayName1, LOCI_sAbbrevDayName2, LOCI_sAbbrevDayName3,
+        LOCI_sAbbrevDayName4, LOCI_sAbbrevDayName5, LOCI_sDayName6,
+        LOCI_sAbbrevDayName7,
+    };
+
+    static LocaleItem monthNames[] = {
+        // 0 ... 11 (Jan - Dec)
+        LOCI_sMonthName1, LOCI_sMonthName2, LOCI_sMonthName3, LOCI_sMonthName4,
+        LOCI_sMonthName5, LOCI_sMonthName6, LOCI_sMonthName7, LOCI_sMonthName8,
+        LOCI_sMonthName9, LOCI_sMonthName10, LOCI_sMonthName11, LOCI_sMonthName12,
+        // 12 ... 23 (Jan - Dec)
+        LOCI_sAbbrevMonthName1, LOCI_sAbbrevMonthName2, LOCI_sAbbrevMonthName3,
+        LOCI_sAbbrevMonthName4, LOCI_sAbbrevMonthName5, LOCI_sAbbrevMonthName6,
+        LOCI_sAbbrevMonthName7, LOCI_sAbbrevMonthName8, LOCI_sAbbrevMonthName9,
+        LOCI_sAbbrevMonthName10, LOCI_sAbbrevMonthName11, LOCI_sAbbrevMonthName12,
+    };
+
+    QString sysLocaleName = qt_system_locale_name();
+
+    LocaleObject lo = 0;
+    if (UniCreateLocaleObject(UNI_UCS_STRING_POINTER,
+                              sysLocaleName.utf16(), &lo) == ULS_SUCCESS) {
+        int num;
+        tm timespec = { 0 };
+        bool isDateTime = false;
+
+        LocaleItem item = 0;
+
+        switch(type) {
+        // case LanguageId:
+        // case CountryId:
+        //     this is returned by the fallback locale
+        case DecimalPoint:
+            item = LOCI_sDecimal;
+            break;
+        case GroupSeparator:
+            item = LOCI_sThousand;
+            break;
+        case ZeroDigit:
+            item = LOCI_sNativeDigits;
+            break;
+        case NegativeSign:
+            item = LOCI_sNegativeSign;
+            break;
+        case PositiveSign:
+            item = LOCI_sPositiveSign;
+            break;
+        case DateFormatLong:
+            item = LOCI_wLongDate;
+            break;
+        case DateFormatShort:
+            item = LOCI_wShortDate;
+            break;
+        case TimeFormatLong:
+        case TimeFormatShort:
+            item = LOCI_wTimeFormat;
+            break;
+        case DayNameLong:
+            num = in.toInt();
+            if (num >= 1 && num <= 7)
+                item = dayNames[num - 1];
+            break;
+        case DayNameShort:
+            num = in.toInt();
+            if (num >= 1 && num <= 7)
+                item = dayNames[num - 1 + 7];
+            break;
+        case MonthNameLong:
+            num = in.toInt();
+            if (num >= 1 && num <= 12)
+                item = monthNames[num - 1];
+            break;
+        case MonthNameShort:
+            num = in.toInt();
+            if (num >= 1 && num <= 12)
+                item = monthNames[num - 1 + 12];
+            break;
+        case DateToStringLong:
+        case DateToStringShort: {
+            QDate date = in.toDate();
+            timespec.tm_mday = date.day();
+            timespec.tm_mon = date.month() - 1;
+            timespec.tm_year = date.year() - 1900;
+            timespec.tm_isdst = -1;
+            item = type == DateToStringShort ? LOCI_sShortDate : LOCI_sLongDate;
+            isDateTime = true;
+            break;
+        }
+        case TimeToStringLong:
+        case TimeToStringShort: {
+            QTime time = in.toTime();
+            timespec.tm_sec = time.second();
+            timespec.tm_min = time.minute();
+            timespec.tm_hour = time.hour();
+            timespec.tm_isdst = -1;
+            item = LOCI_sTimeFormat;
+            isDateTime = true;
+            break;
+        }
+        case DateTimeFormatLong:
+        case DateTimeFormatShort:
+            return
+                  query(type == DateTimeFormatLong ?
+                        DateFormatLong : DateFormatShort).toString()
+                + QLatin1Char(' ')
+                + query(type == DateTimeFormatLong ?
+                        TimeFormatLong : TimeFormatShort).toString();
+        case DateTimeToStringShort: {
+            QDateTime dateTime = in.toDateTime();
+            return
+                  query(DateToStringShort, dateTime.date()).toString()
+                + QLatin1Char(' ')
+                + query(TimeToStringShort, dateTime.time()).toString();
+        }
+        case DateTimeToStringLong: {
+            QDateTime dateTime = in.toDateTime();
+            timespec.tm_sec = dateTime.time().second();
+            timespec.tm_min = dateTime.time().minute();
+            timespec.tm_hour = dateTime.time().hour();
+            timespec.tm_mday = dateTime.date().day();
+            timespec.tm_mon = dateTime.date().month() - 1;
+            timespec.tm_wday = dateTime.date().dayOfWeek() % 7;
+            timespec.tm_year = dateTime.date().year() - 1900;
+            timespec.tm_isdst = -1;
+            item = LOCI_sDateTime;
+            isDateTime = true;
+            break;
+        }
+        case MeasurementSystem:
+            if (UniQueryLocaleValue(lo, LOCI_iMeasure, &num) == ULS_SUCCESS &&
+                num == 1)
+                return QVariant(static_cast<int>(QLocale::ImperialSystem));
+            return QVariant(static_cast<int>(QLocale::MetricSystem));
+        case AMText:
+            item = LOCI_s1159;
+            break;
+        case PMText:
+            item = LOCI_s2359;
+            break;
+        default:
+            break;
+        }
+
+        QString result;
+
+        if (item) {
+            if (isDateTime) {
+                UniChar *format = 0;
+                if (UniQueryLocaleItem(lo, item, &format) == ULS_SUCCESS) {
+                    QByteArray buf;
+                    for (size_t i = 1; i < 10; ++i) {
+                        buf.resize(i * 256 * 2);
+                        if (UniStrftime(lo, (UniChar *)buf.data(), buf.size() / 2,
+                                        format, &timespec)) {
+                            result = QString::fromUtf16((const ushort *)buf.data());
+                            break;
+                        }
+                    }
+                    UniFreeMem(format);
+                }
+            } else {
+                UniChar *value = 0;
+                if (UniQueryLocaleItem(lo, item, &value) == ULS_SUCCESS) {
+                    result = QString::fromUtf16(value);
+                    UniFreeMem(value);
+                }
+            }
+        }
+
+        UniFreeLocaleObject(lo);
+
+        // Note QLocalePrivate::updateSystemPrivate() doesn't like empty
+        // strings, make sure we return a null QVariant in such case
+        if (!result.isEmpty())
+            return result;
+    }
+
+    return QVariant();
 }
 

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) {