Mercurial > hg > bitcoin

changeset 3217:35657b3264dc draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #1591 from Diapolo/lang_sel_Qt4.8 enhance lang-selection in OptionsDialog, when compiling with Qt >= 4.8
author Wladimir J. van der Laan <laanwj@gmail.com>
date Mon, 16 Jul 2012 23:19:25 -0700
parents 380fb54cd434 (current diff) c4d7950c8790 (diff)
children ea8b057f61ec bba360844ac8 596e8e3b6430 fda316734c45
files
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -68,13 +68,23 @@
         /** check if the locale name consists of 2 parts (language_country) */
         if(langStr.contains("_"))
         {
+#if QT_VERSION >= 0x040800
+            /** display language strings as "native language - native country (locale name)", e.g. "Deutsch - Deutschland (de)" */
+            ui->lang->addItem(locale.nativeLanguageName() + QString(" - ") + locale.nativeCountryName() + QString(" (") + langStr + QString(")"), QVariant(langStr));
+#else
             /** display language strings as "language - country (locale name)", e.g. "German - Germany (de)" */
             ui->lang->addItem(QLocale::languageToString(locale.language()) + QString(" - ") + QLocale::countryToString(locale.country()) + QString(" (") + langStr + QString(")"), QVariant(langStr));
+#endif
         }
         else
         {
+#if QT_VERSION >= 0x040800
+            /** display language strings as "native language (locale name)", e.g. "Deutsch (de)" */
+            ui->lang->addItem(locale.nativeLanguageName() + QString(" (") + langStr + QString(")"), QVariant(langStr));
+#else
             /** display language strings as "language (locale name)", e.g. "German (de)" */
             ui->lang->addItem(QLocale::languageToString(locale.language()) + QString(" (") + langStr + QString(")"), QVariant(langStr));
+#endif
         }
     }