Fix bugs, enable all language translations

Author: SunderB

app/gui/qt/SonicPi.qrc

@@ -190,7 +190,7 @@
         <file>lang/sonic-pi_ug.qm</file>
         <file>lang/sonic-pi_uk.qm</file>
         <file>lang/sonic-pi_vi.qm</file>
-        <file>lang/sonic-pi_zh-Hans.qm</file>
+        <file>lang/sonic-pi_zh_Hans.qm</file>
         <file>lang/sonic-pi_zh_HK.qm</file>
         <file>lang/sonic-pi_zh.qm</file>
         <file>lang/sonic-pi_zh_TW.qm</file>

app/gui/qt/lang/sonic-pi_zh-Hans.ts renamed to app/gui/qt/lang/sonic-pi_zh_Hans.ts

@@ -18,8 +18,6 @@
 #include <QPixmap>
 #include <QBitmap>
 #include <QLabel>
-#include <QTranslator>
-#include <QSettings>
 #include <QLibraryInfo>
 
 #include "mainwindow.h"

app/gui/qt/main.cpp

@@ -150,7 +150,7 @@ MainWindow::MainWindow(QApplication &app, QSplashScreen* splash)
     initProcess->waitForFinished();
 
     // Throw all stdout into ~/.sonic-pi/log/gui.log
-    //setupLogPathAndRedirectStdOut();
+    setupLogPathAndRedirectStdOut();
 
     std::cout << "[GUI] - Welcome to the Sonic Pi GUI" << std::endl;
     std::cout << "[GUI] - ===========================" << std::endl;
@@ -1940,39 +1940,41 @@ void MainWindow::changeSystemPreAmp(int val, int silent)
     statusBar()->showMessage(tr("Updating System Volume..."), 2000);
 }
 
+// TODO: Implement real-time language switching
 void MainWindow::changeUILanguage(QString lang) {
     if (lang != piSettings->language) {
-      std::cout << "New language selected: " << lang.toUtf8().constData() << std::endl;
-      QString old_lang = sonicPii18n->getNativeLanguageName(piSettings->language);
-      QString new_lang = sonicPii18n->getNativeLanguageName(lang);
-
-      // Load new language
-      //QString language = sonicPii18n->determineUILanguage(lang);
-      //sonicPii18n->loadTranslations(language);
-      //QString title_new = tr("Updated the UI language from %s to %s").arg();
-
-      QMessageBox msgBox(this);
-      msgBox.setText(tr("You've selected a new language: %s").arg(new_lang));
-      msgBox.setInformativeText(tr("Do you want to apply these new settings?\nApplying the new language will restart Sonic Pi."));
-      QPushButton *restartButton = msgBox.addButton(tr("Apply & Restart"), QMessageBox::ActionRole);
-      QPushButton *dismissButton = msgBox.addButton(tr("Cancel"), QMessageBox::RejectRole);
-      msgBox.setDefaultButton(restartButton);
-      msgBox.setIcon(QMessageBox::Information);
-      msgBox.exec();
-
-      if (msgBox.clickedButton() == (QAbstractButton*)restartButton) {
-          piSettings->language = lang;
-          writeSettings();
-          restartApp();
-          //statusBar()->showMessage(tr("Updated UI language setting, please restart Sonic Pi to apply it"), 2000);
-      } else if (msgBox.clickedButton() == (QAbstractButton*)dismissButton) {
-          settingsWidget->updateSelectedUILanguage(piSettings->language);
-      }
+        std::cout << "Current language:  " << piSettings->language.toUtf8().constData() << std::endl;
+        std::cout << "New language selected: " << lang.toUtf8().constData() << std::endl;
+        QString old_lang = sonicPii18n->getNativeLanguageName(piSettings->language);
+        QString new_lang = sonicPii18n->getNativeLanguageName(lang);
+
+        // Load new language
+        //QString language = sonicPii18n->determineUILanguage(lang);
+        //sonicPii18n->loadTranslations(language);
+        //QString title_new = tr("Updated the UI language from %s to %s").arg();
+
+        QMessageBox msgBox(this);
+        msgBox.setText(QString(tr("You've selected a new language: %1")).arg(new_lang));
+        msgBox.setInformativeText(tr("Do you want to apply this language?\nApplying the new language will restart Sonic Pi."));
+        QPushButton *restartButton = msgBox.addButton(tr("Apply and Restart"), QMessageBox::ActionRole);
+        QPushButton *dismissButton = msgBox.addButton(tr("Cancel"), QMessageBox::RejectRole);
+        msgBox.setDefaultButton(restartButton);
+        msgBox.setIcon(QMessageBox::Information);
+        msgBox.exec();
+
+        if (msgBox.clickedButton() == (QAbstractButton*)restartButton) {
+            piSettings->language = lang;
+            writeSettings();
+            restartApp();
+            //statusBar()->showMessage(tr("Updated UI language setting, please restart Sonic Pi to apply it"), 2000);
+        } else if (msgBox.clickedButton() == (QAbstractButton*)dismissButton) {
+            // Don't apply the new language settings
+            settingsWidget->updateSelectedUILanguage(piSettings->language);
+        }
 
-      // Load previously set language
-      //sonicPii18n->loadTranslations(ui_language);
+        // Load previously set language
+        //sonicPii18n->loadTranslations(ui_language);
     }
-
 }
 
 
@@ -3912,6 +3914,8 @@ void MainWindow::updateContext(int line, int index){
 
 }
 
+// TODO: Implement real-time language switching
+// This is currently unused, but put in place to aid in implementing real-time language switching in the future
 void MainWindow::updateTranslatedUIText() {
   // Widget titles
   prefsWidget->setWindowTitle(tr("Preferences"));

app/gui/qt/mainwindow.cpp

@@ -296,6 +296,7 @@ class MainWindow : public QMainWindow
 
         //   void initPrefsWindow();
         void initDocsWindow(QString language);
+        void addTutorialDocsTab(QString lang);
         void addLangDocsTab();
         void addSynthDocsTab();
         void addFXDocsTab();
@@ -324,8 +325,6 @@ class MainWindow : public QMainWindow
         void addUniversalCopyShortcuts(QTextEdit *te);
         void updateTranslatedUIText();
 
-        void restartApp();
-
         QMenu *liveMenu, *codeMenu, *audioMenu, *displayMenu, *viewMenu, *ioMenu, *ioMidiInMenu, *ioMidiOutMenu, *ioMidiOutChannelMenu, *localIpAddressesMenu, *themeMenu, *scopeKindVisibilityMenu;
 
         SonicPiSettings *piSettings;

app/gui/qt/mainwindow.h

@@ -21,14 +21,18 @@
 std::map<QString, QString> SonicPii18n::native_language_names = {
 {"system_locale", ""},
 {"bg", "български"},
+{"bn", "বাংলা"},
 {"bs", "Bosanski/босански"},
 {"ca", "Català"},
+{"ca@valencia", "Valencià"},
 {"cs", "Čeština"},
 {"da", "Dansk"},
 {"de", "Deutsch"},
 {"el", "ελληνικά"},
-{"en-GB", "English (UK)"},
-{"en-US", "English (US)"},
+{"en_AU", "English (Australian)"},
+{"en_GB", "English (UK)"},
+{"en_US", "English (US)"},
+{"eo", "Esperanto"},
 {"es", "Español"},
 {"et", "Eesti keel"},
 {"fa", "فارسی"},
@@ -50,22 +54,22 @@ std::map<QString, QString> SonicPii18n::native_language_names = {
 {"nl", "Nederlands"},
 {"pl", "Polski"},
 {"pt", "Português"},
-{"pt-BR", "Português do Brasil"},
+{"pt_BR", "Português do Brasil"},
 {"ro", "Română"},
 {"ru", "Pусский"},
 {"si", "සිංහල"},
 {"sk", "Slovenčina"},
 {"sl", "Slovenščina"},
 {"sv", "Svenska"},
 {"sw", "Kiswahili"},
-{"ti", "ไทย"},
+{"th", "ไทย"},
 {"tr", "Türkçe"},
 {"ug", "ئۇيغۇر تىلى"},
 {"uk", "Українська"},
 {"vi", "Tiếng Việt"},
-{"zh", "繁體中文"},
-{"zh-Hans", "简体中文"},
-{"zh-Hk", "廣東話"},
-{"zh-TW", "臺灣華語"}
+{"zh", "简体中文"},
+{"zh_Hans", "简体中文"},
+{"zh_HK", "廣東話"},
+{"zh_TW", "臺灣華語"}
 };
 #endif

app/gui/qt/ruby_help.tmpl

@@ -2,9 +2,7 @@
 #include <QString>
 #include <QStringList>
 #include <QLocale>
-#include <QLanguage>
 #include <QTranslator>
-#include <QMainWindow>
 #include <QApplication>
 #include <QLibraryInfo>
 
@@ -16,11 +14,29 @@
 SonicPii18n::SonicPii18n(QString rootpath) {
   this->root_path = rootpath;
   this->available_languages = findAvailableLanguages();
+  // Set to true unless we can't load the system language
+  this->system_language_available = true;
+
+  // // Print all Qt's language codes for debugging
+  // QList<QLocale> allLocales = QLocale::matchingLocales(
+  //           QLocale::AnyLanguage,
+  //           QLocale::AnyScript,
+  //           QLocale::AnyCountry);
+  // QStringList iso639LanguageCodes;
+  //
+  // for(const QLocale &locale : allLocales) {
+  //     iso639LanguageCodes << locale.name();
+  // }
+  //
+  // std::cout << iso639LanguageCodes.join("\n").toUtf8().constData() << std::endl;
+}
+
+SonicPii18n::~SonicPii18n() {
 }
 
 QString SonicPii18n::determineUILanguage(QString lang_pref) {
   QStringList available_languages = getAvailableLanguages();
-  std::cout << available_languages.join("\n").toUtf8().constData() << '\n';
+  std::cout << available_languages.join("\n").toUtf8().constData() << std::endl;
   QLocale locale;
 
   if (lang_pref != "system_locale") {
@@ -34,22 +50,28 @@ QString SonicPii18n::determineUILanguage(QString lang_pref) {
     general_name.truncate(general_name.lastIndexOf('-'));
 
     if (available_languages.contains(general_name)) {
-        return lang_pref;
+        return general_name;
     }
   } else {
     QStringList preferred_languages = locale.uiLanguages();
     // If the specified language isn't available, or if the setting is set to system_locale...
       // ...run through the list of preferred languages
     std::cout << "Looping through preferred ui languages" << std::endl;
 
+    QString l;
     for (int i = 0; i < preferred_languages.length(); i += 1) {
-      if (available_languages.contains(preferred_languages[i])) {
-          return lang_pref;
+      l = preferred_languages[i];
+      l.replace("-", "_");
+
+      std::cout << preferred_languages[i].toUtf8().constData() << std::endl;
+      if (available_languages.contains(l)) {
+          return l;
       }
     }
   }
 
-  // Fallback to English
+  // Fpreferred_languages[i]preferred_languages[i]preferred_languages[i]allback to English
+  this->system_language_available = false;
   return "en";
 }
 
@@ -65,12 +87,16 @@ QStringList SonicPii18n::findAvailableLanguages() {
   for (int i = 0; i < fileNames.size(); ++i) {
     // get locale extracted by filename
     QString locale;
-    locale = fileNames[i]; // "TranslationExample_de.qm"
-    locale.truncate(locale.lastIndexOf('.')); // "TranslationExample_de"
-    locale.remove(0, locale.lastIndexOf("sonic-pi_") + 9); // "de"
+    locale = fileNames[i]; // "sonic-pi_pt_BR.qm"
+    locale.truncate(locale.lastIndexOf('.')); // "sonic-pi_pt_BR"
+    locale.remove(0, locale.lastIndexOf("sonic-pi_") + 9); // "pt_BR"
+    //locale.replace("_", "-"); // Replace underscores with dashes so it matches the language codes e.g: "pt-BR"
     std::cout << locale.toUtf8().constData() << '\n';
     languages << locale;
   }
+  // Add the source language
+  languages << "en_GB";
+  languages.sort();
   return languages;
 }
 
@@ -99,25 +125,29 @@ bool SonicPii18n::loadTranslations(QString lang) {
 }
 
 QStringList SonicPii18n::getAvailableLanguages() {
-  return self->available_languages;
+  return this->available_languages;
 }
 
-static std::map<QString, QString> SonicPii18n::getLanguageNameList() {
-  return self->native_language_names;
+std::map<QString, QString> SonicPii18n::getNativeLanguageNameList() {
+  return native_language_names;
 }
 
-static QString SonicPii18n::getNativeLanguageName(QString lang) {
-  if (native_language_names.contains(lang))
-    return self->native_language_names[lang];
-  else if (lang == "system_locale") {
-    return tr("System language")
+QString SonicPii18n::getNativeLanguageName(QString lang) {
+  std::map<QString, QString>::iterator it = native_language_names.find(lang);
+  if(it != native_language_names.end()) {
+    // language found
+    return native_language_names[lang];
+  } else if (lang == "system_locale") {
+    return tr("System language");
   } else {
+    std::cout << "Warning: Predefined language name not found'" << lang.toUtf8().constData() << "'" << std::endl;
     // Try using QLocale to find the native language name
     QLocale locale(lang);
-    if (locale.language != QLanguage::C) {
+    QString name = locale.nativeLanguageName();
+    if (name != "C" && name != "") {
       return locale.nativeLanguageName();
     } else {
-      std::cout << "Warning: Invalid language code '" << lang.toUtf8().constData() << "'" << std:endl;
+      std::cout << "Warning: Invalid language code '" << lang.toUtf8().constData() << "'" << std::endl;
       return lang;
     }
   }

app/gui/qt/utils/lang_list.h

@@ -20,13 +20,16 @@
 class SonicPii18n : public QObject {
 public:
   SonicPii18n(QString rootpath);
+  ~SonicPii18n();
 
 public slots:
   QString determineUILanguage(QString lang_pref);
   QStringList getAvailableLanguages();
-  static std::map<QString, QString> getLanguageNameList();
-  static QString getNativeLanguageName(QString lang);
+  std::map<QString, QString> getNativeLanguageNameList();
+  QString getNativeLanguageName(QString lang);
   bool loadTranslations(QString lang);
+  
+  bool system_language_available;
 
 private:
   QString root_path;
@@ -36,7 +39,5 @@ public slots:
   static std::map<QString, QString> native_language_names;
 
   QStringList findAvailableLanguages();
-
-
 };
 #endif