Fix UI not following system language when available

opengisch · Oct 31, 2024 · a9f6936 · a9f6936 · qfield-fairy · Oct 31, 2024
1 parent 5cc32f8
commit a9f6936
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -116,11 +116,6 @@ int main( int argc, char **argv )
     qfieldTranslatorLoaded = qfieldTranslator.load( QStringLiteral( "qfield_%1" ).arg( customLanguage ), QStringLiteral( ":/i18n/" ), "_" );
     qtTranslatorLoaded = qtTranslator.load( QStringLiteral( "qt_%1" ).arg( customLanguage ), QStringLiteral( ":/i18n/" ), "_" );
   }
-  if ( !qfieldTranslatorLoaded || qfieldTranslator.isEmpty() )
-    ( void ) qfieldTranslator.load( QLocale(), "qfield", "_", ":/i18n/" );
-  if ( !qtTranslatorLoaded || qtTranslator.isEmpty() )
-    ( void ) qtTranslator.load( QLocale(), "qt", "_", ":/i18n/" );
-
   dummyApp->installTranslator( &qtTranslator );
   dummyApp->installTranslator( &qfieldTranslator );
 
@@ -136,6 +131,11 @@ int main( int argc, char **argv )
 
   QgsApplication app( argc, argv, true, profilePath, QStringLiteral( "mobile" ) );
 
+  if ( !qfieldTranslatorLoaded || qfieldTranslator.isEmpty() )
+    ( void ) qfieldTranslator.load( QStringLiteral( "qfield_%1" ).arg( QLocale().name() ), QStringLiteral( ":/i18n/" ), "_" );
+  if ( !qtTranslatorLoaded || qtTranslator.isEmpty() )
+    ( void ) qtTranslator.load( QStringLiteral( "qt_%1" ).arg( QLocale().name() ), QStringLiteral( ":/i18n/" ), "_" );
+
   if ( !customLanguage.isEmpty() )
   {
     QLocale customLocale( customLanguage );