Merge pull request #6428 from JosJuice/qt-zh-order

Qt2 translation: Don't place "zh_CN" and "zh_TW" after "zh"
This commit is contained in:
Léo Lam 2018-03-12 18:44:41 +01:00 committed by GitHub
commit 90ca62e416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions

View File

@ -237,10 +237,12 @@ QStringList FindPossibleLanguageCodes(const QString& exact_language_code)
// On macOS, Chinese (Simplified) and Chinese (Traditional) are represented as zh-Hans and
// zh-Hant, but on Linux they're represented as zh-CN and zh-TW. Qt should probably include the
// script subtags on Linux, but it doesn't.
if (possible_language_codes.contains(QStringLiteral("zh_Hans")))
possible_language_codes << QStringLiteral("zh_CN");
if (possible_language_codes.contains(QStringLiteral("zh_Hant")))
possible_language_codes << QStringLiteral("zh_TW");
const int hans_index = possible_language_codes.indexOf(QStringLiteral("zh_Hans"));
if (hans_index != -1)
possible_language_codes.insert(hans_index + 1, QStringLiteral("zh_CN"));
const int hant_index = possible_language_codes.indexOf(QStringLiteral("zh_Hant"));
if (hant_index != -1)
possible_language_codes.insert(hant_index + 1, QStringLiteral("zh_TW"));
return possible_language_codes;
}