Fallback to English if no proper translation is available

diff --git a/qt/Application.cc b/qt/Application.cc
index 26758df957a23c668a076cad506efd6be4449775..f3c4a4f4d4a932d726bf442432d14148e97fa643 100644 (file)
--- a/qt/Application.cc
+++ b/qt/Application.cc
@@ -43,7 +43,8 @@ namespace
   const QString DBUS_OBJECT_PATH = QString::fromUtf8 ("/com/transmissionbt/Transmission");
   const QString DBUS_INTERFACE   = QString::fromUtf8 ("com.transmissionbt.Transmission" );
 
-  const char * MY_READABLE_NAME ("transmission-qt");
+  const QLatin1String MY_CONFIG_NAME ("transmission");
+  const QLatin1String MY_READABLE_NAME ("transmission-qt");
 
   const tr_option opts[] =
   {
@@ -95,30 +96,8 @@ Application::Application (int& argc, char ** argv):
   myWatchDir(nullptr),
   myLastFullUpdateTime (0)
 {
-  const QString MY_CONFIG_NAME = QString::fromUtf8 ("transmission");
-
   setApplicationName (MY_CONFIG_NAME);
-
-  const QString localeName = QLocale ().name ();
-
-  // install the qt translator
-  if (loadTranslation (qtTranslator, QLatin1String ("qt"), localeName, QStringList ()
-        << QLibraryInfo::location (QLibraryInfo::TranslationsPath)
-#ifdef TRANSLATIONS_DIR
-        << QString::fromUtf8 (TRANSLATIONS_DIR)
-#endif
-        << (applicationDirPath () + QLatin1String ("/translations"))
-      ))
-    installTranslator (&qtTranslator);
-
-  // install the transmission translator
-  if (loadTranslation (appTranslator, MY_CONFIG_NAME, localeName, QStringList ()
-#ifdef TRANSLATIONS_DIR
-        << QString::fromUtf8 (TRANSLATIONS_DIR)
-#endif
-        << (applicationDirPath () + QLatin1String ("/translations"))
-      ))
-    installTranslator (&appTranslator);
+  loadTranslations ();
 
   Formatter::initUnits ();
 
@@ -163,12 +142,12 @@ Application::Application (int& argc, char ** argv):
           case 'w': password = QString::fromUtf8 (optarg); break;
           case 'm': minimized = true; break;
           case 'v':
-            std::cerr << MY_READABLE_NAME << ' ' << LONG_VERSION_STRING << std::endl;
+            std::cerr << MY_READABLE_NAME.latin1 () << ' ' << LONG_VERSION_STRING << std::endl;
             quitLater ();
             return;
           case TR_OPT_ERR:
             std::cerr << qPrintable(QObject::tr ("Invalid option")) << std::endl;
-            tr_getopt_usage (MY_READABLE_NAME, getUsage (), opts);
+            tr_getopt_usage (MY_READABLE_NAME.latin1 (), getUsage (), opts);
             quitLater ();
             return;
           default:
@@ -330,6 +309,35 @@ Application::Application (int& argc, char ** argv):
     }
 }
 
+void
+Application::loadTranslations ()
+{
+  const QStringList qtQmDirs = QStringList () <<
+    QLibraryInfo::location (QLibraryInfo::TranslationsPath) <<
+#ifdef TRANSLATIONS_DIR
+    QString::fromUtf8 (TRANSLATIONS_DIR) <<
+#endif
+    (applicationDirPath () + QLatin1String ("/translations"));
+
+  const QStringList appQmDirs = QStringList () <<
+#ifdef TRANSLATIONS_DIR
+    QString::fromUtf8 (TRANSLATIONS_DIR) <<
+#endif
+    (applicationDirPath () + QLatin1String ("/translations"));
+
+  QString localeName = QLocale ().name ();
+
+  if (!loadTranslation (myAppTranslator, MY_CONFIG_NAME, localeName, appQmDirs))
+    {
+      localeName = QLatin1String ("en");
+      loadTranslation (myAppTranslator, MY_CONFIG_NAME, localeName, appQmDirs);
+    }
+
+  if (loadTranslation (myQtTranslator, QLatin1String ("qt"), localeName, qtQmDirs))
+    installTranslator (&myQtTranslator);
+  installTranslator (&myAppTranslator);
+}
+
 void
 Application::quitLater ()
 {

diff --git a/qt/Application.h b/qt/Application.h
index 2995a67a94d6f68aecaab4fd8472c200c4e0bf5c..c878d5b539672da2a6e99c7e7bf38aedbefe7a2b 100644 (file)
--- a/qt/Application.h
+++ b/qt/Application.h
@@ -43,6 +43,7 @@ class Application: public QApplication
 
   private:
     void maybeUpdateBlocklist ();
+    void loadTranslations ();
     void quitLater ();
 
   private slots:
@@ -64,8 +65,8 @@ class Application: public QApplication
     QTimer myStatsTimer;
     QTimer mySessionTimer;
     time_t myLastFullUpdateTime;
-    QTranslator qtTranslator;
-    QTranslator appTranslator;
+    QTranslator myQtTranslator;
+    QTranslator myAppTranslator;
     FaviconCache myFavicons;
 };