Merge pull request #141 from lliehu/crash-reporter-i18n-fix

Fix showing of translations in crash reporter

CMakeLists.txt

@@ -17,6 +17,8 @@ SET( TOMAHAWK_VERSION_PATCH 99 )
 
 #SET( TOMAHAWK_VERSION_RC 0 )
 
+SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg ca de en es fi fr ja pl pt_BR ru sv tr zh_CN zh_TW )
+
 # enforce proper symbol exporting on all platforms
 add_definitions( "-fvisibility=hidden" )
 # enforce using constBegin, constEnd for const-iterators

src/CMakeLists.txt

@@ -155,7 +155,7 @@ INCLUDE(GNUInstallDirs)
 
 # translations
 include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )
-add_tomahawk_translations(ar bg ca de en es fi fr ja pl pt_BR ru sv tr zh_CN zh_TW)
+add_tomahawk_translations( ${TOMAHAWK_TRANSLATION_LANGUAGES} )
 
 SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${trans_outfile})
 

src/TomahawkApp.cpp

@@ -146,47 +146,7 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     setApplicationVersion( QLatin1String( TOMAHAWK_VERSION ) );
 
     registerMetaTypes();
-    installTranslator();
+    TomahawkUtils::installTranslator(this);
-}
-
-
-void
-TomahawkApp::installTranslator()
-{
-#if QT_VERSION >= 0x040800
-    QString locale = QLocale::system().uiLanguages().first().replace( "-", "_" );
-#else
-    QString locale = QLocale::system().name();
-#endif
-    if ( locale == "C" )
-        locale = "en";
-
-    // Tomahawk translations
-    QTranslator* translator = new QTranslator( this );
-    if ( translator->load( QString( ":/lang/tomahawk_" ) + locale ) )
-    {
-        tDebug( LOGVERBOSE ) << "Translation: Tomahawk: Using system locale:" << locale;
-    }
-    else
-    {
-        tDebug( LOGVERBOSE ) << "Translation: Tomahawk: Using default locale, system locale one not found:" << locale;
-        translator->load( QString( ":/lang/tomahawk_en" ) );
-    }
-
-    TOMAHAWK_APPLICATION::installTranslator( translator );
-
-    // Qt translations
-    translator = new QTranslator( this );
-    if ( translator->load( QString( ":/lang/qt_" ) + locale ) )
-    {
-        tDebug( LOGVERBOSE ) << "Translation: Qt: Using system locale:" << locale;
-    }
-    else
-    {
-        tDebug( LOGVERBOSE ) << "Translation: Qt: Using default locale, system locale one not found:" << locale;
-    }
-
-    TOMAHAWK_APPLICATION::installTranslator( translator );
 }
 
 

src/TomahawkApp.h

@@ -115,7 +115,6 @@ private slots:
     void accountManagerReady();
 
 private:
-    void installTranslator();
     void registerMetaTypes();
 
     void printHelp();

src/breakpad/CrashReporter/CMakeLists.txt

@@ -16,7 +16,11 @@ INCLUDE( ${QT_USE_FILE} )
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ../../libtomahawk )
 ADD_DEFINITIONS( ${QT_DEFINITIONS} )
 
-ADD_EXECUTABLE( tomahawk_crash_reporter WIN32 ${crashreporter_SOURCES} ${crashreporter_HEADERS_MOC} ${crashreporter_UI_HEADERS} ${crashreporter_RC_RCC} )
+# translations
+include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )
+add_tomahawk_translations( ${TOMAHAWK_TRANSLATION_LANGUAGES} )
+
+ADD_EXECUTABLE( tomahawk_crash_reporter WIN32 ${crashreporter_SOURCES} ${crashreporter_HEADERS_MOC} ${crashreporter_UI_HEADERS} ${crashreporter_RC_RCC} ${trans_outfile} )
 TARGET_LINK_LIBRARIES( tomahawk_crash_reporter ${QT_LIBRARIES} tomahawklib )
 set_target_properties( tomahawk_crash_reporter PROPERTIES AUTOMOC ON)
 install(TARGETS tomahawk_crash_reporter RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})

src/breakpad/CrashReporter/main.cpp

@@ -18,6 +18,8 @@
 
 #include "CrashReporter.h"
 
+#include "utils/TomahawkUtils.h"
+
 #include <QTranslator>
 
 #include <iostream>
@@ -36,12 +38,7 @@ int main( int argc, char* argv[] )
 
     QApplication app( argc, argv );
 
-    QString langCode;
+    TomahawkUtils::installTranslator(&app);
-    QTranslator translatorApp;
-    QTranslator translatorQt;
-
-/*    app.installTranslator( &translatorApp );
-    app.installTranslator( &translatorQt );*/
 
     if ( app.arguments().size() != 4 )
     {

src/libtomahawk/utils/TomahawkUtils.cpp

@@ -46,6 +46,7 @@
 #include <QMutex>
 #include <QCryptographicHash>
 #include <QProcess>
+#include <QTranslator>
 
 #ifdef Q_OS_WIN
     #include <windows.h>
@@ -773,6 +774,44 @@ crash()
     *a = 1;
 }
 
+void
+installTranslator(QObject* parent)
+{
+#if QT_VERSION >= 0x040800
+    QString locale = QLocale::system().uiLanguages().first().replace( "-", "_" );
+#else
+    QString locale = QLocale::system().name();
+#endif
+    if ( locale == "C" )
+        locale = "en";
+
+    // Tomahawk translations
+    QTranslator* translator = new QTranslator( parent );
+    if ( translator->load( QString( ":/lang/tomahawk_" ) + locale ) )
+    {
+        tDebug( LOGVERBOSE ) << "Translation: Tomahawk: Using system locale:" << locale;
+    }
+    else
+    {
+        tDebug( LOGVERBOSE ) << "Translation: Tomahawk: Using default locale, system locale one not found:" << locale;
+        translator->load( QString( ":/lang/tomahawk_en" ) );
+    }
+
+    QCoreApplication::installTranslator( translator );
+
+    // Qt translations
+    translator = new QTranslator( parent );
+    if ( translator->load( QString( ":/lang/qt_" ) + locale ) )
+    {
+        tDebug( LOGVERBOSE ) << "Translation: Qt: Using system locale:" << locale;
+    }
+    else
+    {
+        tDebug( LOGVERBOSE ) << "Translation: Qt: Using default locale, system locale one not found:" << locale;
+    }
+
+    QCoreApplication::installTranslator( translator );
+}
 
 bool
 verifyFile( const QString& filePath, const QString& signature )

src/libtomahawk/utils/TomahawkUtils.h

@@ -212,6 +212,8 @@ namespace TomahawkUtils
     DLLEXPORT QList< Tomahawk::query_ptr > mergePlaylistChanges( const QList< Tomahawk::query_ptr >& orig, const QList< Tomahawk::query_ptr >& newTracks, bool& changed );
 
     DLLEXPORT void crash();
+    
+    DLLEXPORT void installTranslator(QObject *parent);
 }
 
 #endif // TOMAHAWKUTILS_H