From 22177be577051290c1460a6adb9e97013624e8f7 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 7 May 2015 16:05:18 +0200 Subject: [PATCH] Use new installTranslator in CalamaresApplication. --- 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 f9a4c2719..3bf0c8960 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,8 +46,7 @@ CalamaresApplication::CalamaresApplication( int& argc, char* argv[] ) setApplicationName( QLatin1String( CALAMARES_APPLICATION_NAME ) ); setApplicationVersion( QLatin1String( CALAMARES_VERSION ) ); - QString startupLocale = QLocale::system().uiLanguages().first(); - CalamaresUtils::installTranslator( startupLocale, this ); + CalamaresUtils::installTranslator( QLocale::system(), QString(), this ); QFont f = font(); @@ -82,7 +81,7 @@ CalamaresApplication::init() setWindowIcon( QIcon( Calamares::Branding::instance()-> imagePath( Calamares::Branding::ProductIcon ) ) ); - initPlugins(); + initPlugins(); //also shows main window }