initial implementation of the translation (must be enabled with --translation command line argument)

Jamulus.pro

@@ -14,8 +14,8 @@ QT += widgets \
     network \
     xml
 
-#TRANSLATIONS = src/res/translation_de_DE.ts \
-#    src/res/translation_fr_FR.ts
+TRANSLATIONS = src/res/translation/translation_de_DE.ts \
+    src/res/translation/translation_fr_FR.ts
 
 INCLUDEPATH += src
 

src/main.cpp

@@ -45,14 +45,12 @@ int main ( int argc, char** argv )
 
     // initialize all flags and string which might be changed by command line
     // arguments
-
 #if defined( SERVER_BUNDLE ) && ( defined( __APPLE__ ) || defined( __MACOSX ) )
     // if we are on MacOS and we are building a server bundle, starts Jamulus in server mode
     bool         bIsClient                 = false;
 #else
     bool         bIsClient                 = true;
 #endif
-
     bool         bUseGUI                   = true;
     bool         bStartMinimized           = false;
     bool         bShowComplRegConnList     = false;
@@ -61,6 +59,7 @@ int main ( int argc, char** argv )
     bool         bShowAnalyzerConsole      = false;
     bool         bCentServPingServerInList = false;
     bool         bNoAutoJackConnect        = false;
+    bool         bUseTranslation           = false;
     int          iNumServerChannels        = DEFAULT_USED_NUM_CHANNELS;
     int          iMaxDaysHistory           = DEFAULT_DAYS_HISTORY;
     int          iCtrlMIDIChannel          = INVALID_MIDI_CH;
@@ -208,6 +207,21 @@ int main ( int argc, char** argv )
         }
 
 
+        // Enable translations -------------------------------------------------
+        // Undocumented debugging command line argument: Enable translations
+        // (since translation is still WIP, it is not enabled by default but
+        // must be enabled with this undocumented command line flag)
+        if ( GetFlagArgument ( argv,
+                               i,
+                               "--translation", // no short form
+                               "--translation" ) )
+        {
+            bUseTranslation = true;
+            tsConsole << "- translations enabled" << endl;
+            continue;
+        }
+
+
         // Show all registered servers in the server list ----------------------
         // Undocumented debugging command line argument: Show all registered
         // servers in the server list regardless if a ping to the server is
@@ -514,18 +528,16 @@ int main ( int argc, char** argv )
     // init resources
     Q_INIT_RESOURCE(resources);
 
+    // load translations
+    QTranslator myappTranslator;
 
-// TODO translation loading does not yet work
-// TODO CONFIG += lrelease embed_translations
-// TODO QM_FILES_RESOURCE_PREFIX needed???
-//    // load translations
-//    if ( bUseGUI )
-//    {
-//        QTranslator myappTranslator;
-//        bool ret = myappTranslator.load ( "translation_" + QLocale::system().name() );
-//qDebug() << "translation successfully loaded: " << ret << "   " << "translation_" + QLocale::system().name();
-//        pApp->installTranslator ( &myappTranslator );
-//    }
+    if ( bUseGUI && bUseTranslation )
+    {
+        if ( myappTranslator.load ( ":/translations/translation.qm" ) )
+        {
+            pApp->installTranslator ( &myappTranslator );
+        }
+    }
 
 
 // TEST -> activate the following line to activate the test bench,

src/resources.qrc

@@ -1,4 +1,10 @@
 <RCC>
+    <qresource prefix="/translations" lang="de">
+        <file alias="translation.qm">res/translation/translation_de_DE.qm</file>
+    </qresource>
+    <qresource prefix="/translations" lang="fr">
+        <file alias="translation.qm">res/translation/translation_fr_FR.qm</file>
+    </qresource>
     <qresource prefix="/png/LEDs">
         <file>res/CLEDDisabledSmall.png</file>
         <file>res/CLEDGreenArrow.png</file>