main: fix installation of qt translator

jef-n · jef-n · commit e0c761ccd5cb · 2014-02-16T21:33:35.000+01:00
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -790,6 +790,7 @@ int main( int argc, char *argv[] )
   }
 
   QTranslator qgistor( 0 );
+  QTranslator qttor( 0 );
   if ( myTranslationCode != "C" )
   {
     if ( qgistor.load( QString( "qgis_" ) + myTranslationCode, i18nPath ) )
@@ -806,7 +807,6 @@ int main( int argc, char *argv[] )
      * the About, Preferences and Quit items to the Mac Application menu.
      * These items must be translated identically in both qt_ and qgis_ files.
      */
-    QTranslator qttor( 0 );
     if ( qttor.load( QString( "qt_" ) + myTranslationCode, QLibraryInfo::location( QLibraryInfo::TranslationsPath ) ) )
     {
       myApp.installTranslator( &qttor );

Original file line number	Diff line number	Diff line change
`@@ -790,6 +790,7 @@ int main( int argc, char *argv[] )`
`790`	`790`	`}`
`791`	`791`
`792`	`792`	`QTranslator qgistor( 0 );`
	`793`	`+ QTranslator qttor( 0 );`
`793`	`794`	`if ( myTranslationCode != "C" )`
`794`	`795`	`{`
`795`	`796`	`if ( qgistor.load( QString( "qgis_" ) + myTranslationCode, i18nPath ) )`
`@@ -806,7 +807,6 @@ int main( int argc, char *argv[] )`
`806`	`807`	`* the About, Preferences and Quit items to the Mac Application menu.`
`807`	`808`	`* These items must be translated identically in both qt_ and qgis_ files.`
`808`	`809`	`*/`
`809`		`- QTranslator qttor( 0 );`
`810`	`810`	`if ( qttor.load( QString( "qt_" ) + myTranslationCode, QLibraryInfo::location( QLibraryInfo::TranslationsPath ) ) )`
`811`	`811`	`{`
`812`	`812`	`myApp.installTranslator( &qttor );`