AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always return uiLanguages in bcp47 format

Browse Source 
The old code didn't convert the uilanguages
coming from the system locale to bcp47 format,
leading to QLocale().uiLanguages() and
QLocale("en_US").uiLanguages() returning
things in an inconsistent format. Now it always
returns bcp47 format (ie. Language and Country
separated by a hyphen).

Change-Id: I40d3442255e6e8daa4723f7b3fc13829c9764eb1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
This commit is contained in:
Lars Knoll 2012-05-02 14:23:34 +02:00 committed by Qt by Nokia
parent 500f4883b4
commit f7b1262c7f
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/corelib/tools/qlocale_unix.cpp
View File

@ -71,6 +71,7 @@ struct QSystemLocaleData
QLocale lc_messages;
QByteArray lc_messages_var;
QByteArray lc_measurement_var;
QStringList uiLanguages;
};
void QSystemLocaleData::readEnvironment()
@ -212,29 +213,26 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const
return QVariant((int)QLocale(meas_locale).measurementSystem());
}
case UILanguages: {
static QString languages = QString::fromLatin1(qgetenv("LANGUAGE"));
if (!languages.isEmpty()) {
QStringList lst = languages.split(QLatin1Char(':'));
for (int i = 0; i < lst.size();) {
if (!d->uiLanguages.isEmpty())
return d->uiLanguages;
QString languages = QString::fromLatin1(qgetenv("LANGUAGE"));
QStringList lst;
if (languages.isEmpty())
lst.append(QString::fromLatin1(d->lc_messages_var));
else
lst = languages.split(QLatin1Char(':'));
for (int i = 0; i < lst.size(); ++i) {
const QString &name = lst.at(i);
QString lang, script, cntry;
if (name.isEmpty() || !qt_splitLocaleName(name, lang, script, cntry))
lst.removeAt(i);
if (qt_splitLocaleName(name, lang, script, cntry)) {
if (!cntry.length())
d->uiLanguages.append(lang);
else
++i;
}
return lst;
}
if (!d->lc_messages_var.isEmpty()) {
QString lang, script, cntry;
if (qt_splitLocaleName(QString::fromLatin1(d->lc_messages_var.constData(), d->lc_messages_var.size()),
lang, script, cntry)) {
if (!cntry.length() && lang.length())
return QStringList(lang);
return QStringList(lang % QLatin1Char('-') % cntry);
d->uiLanguages.append(lang % QLatin1Char('-') % cntry);
}
}
return QVariant();
return d->uiLanguages.isEmpty() ? QVariant() : QVariant(d->uiLanguages);
}
case StringToStandardQuotation:
return lc_messages.quoteString(in.value<QStringRef>());