Merge pull request #1919 from ctrlaltca/fix_1918

Fix english language in options

cockatrice/src/dlg_settings.cpp

@@ -39,7 +39,7 @@ GeneralSettingsPage::GeneralSettingsPage()
     for (int i = 0; i < qmFiles.size(); i++) {
         QString langName = languageName(qmFiles[i]);
         languageBox.addItem(langName, qmFiles[i]);
-        if ((qmFiles[i] == setLanguage) || (setLanguage.isEmpty() && langName == tr("English")))
+        if ((qmFiles[i] == setLanguage) || (setLanguage.isEmpty() && langName == tr(DEFAULT_LANG_NAME)))
             languageBox.setCurrentIndex(i);
     }
 
@@ -152,10 +152,13 @@ QStringList GeneralSettingsPage::findQmFiles()
 
 QString GeneralSettingsPage::languageName(const QString &qmFile)
 {
+    if(qmFile == DEFAULT_LANG_CODE)
+        return DEFAULT_LANG_NAME;
+
     QTranslator translator;
     translator.load(translationPrefix + "_" + qmFile + ".qm", translationPath);
     
-    return translator.translate("GeneralSettingsPage", "English");
+    return translator.translate("GeneralSettingsPage", DEFAULT_LANG_NAME);
 }
 
 void GeneralSettingsPage::defaultUrlRestoreButtonClicked()

cockatrice/src/settingscache.h

@@ -19,6 +19,9 @@
 #define PIXMAPCACHE_SIZE_MIN 64
 #define PIXMAPCACHE_SIZE_MAX 2047
 
+#define DEFAULT_LANG_CODE "en"
+#define DEFAULT_LANG_NAME "English"
+
 class QSettings;
 
 class SettingsCache : public QObject {