From 50b6801d35abf01d63534f8baf9b52c98089d533 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 5 Feb 2020 14:33:42 +0100
Subject: [PATCH] [calamares] Install translator after loading settings

 - means that also the *initial* translation can take settings
   into account, like -d loading local translations.
---
 src/calamares/CalamaresApplication.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index e435dd6ef..a1daa4df2 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -59,8 +59,6 @@ CalamaresApplication::CalamaresApplication( int& argc, char* argv[] )
     setApplicationName( QStringLiteral( CALAMARES_APPLICATION_NAME ) );
     setApplicationVersion( QStringLiteral( CALAMARES_VERSION ) );
 
-    CalamaresUtils::installTranslator( QLocale::system(), QString(), this );
-
     QFont f = font();
     CalamaresUtils::setDefaultFontSize( f.pointSize() );
 }
@@ -73,12 +71,13 @@ CalamaresApplication::init()
     cDebug() << "Calamares version:" << CALAMARES_VERSION;
     cDebug() << "        languages:" << QString( CALAMARES_TRANSLATION_LANGUAGES ).replace( ";", ", " );
 
-    setQuitOnLastWindowClosed( false );
-
     initSettings();
     initQmlPath();
     initBranding();
 
+    CalamaresUtils::installTranslator( QLocale::system(), QString(), this );
+
+    setQuitOnLastWindowClosed( false );
     setWindowIcon( QIcon( Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductIcon ) ) );
 
     cDebug() << "STARTUP: initSettings, initQmlPath, initBranding done";