napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install translator for pre-set locale if the UI language is not changed.

Browse Source 
Thanks Winfried Kusgörd <w.kusgoerd@arcor.de> for the patch.
This commit is contained in:
Teo Mrnjavac 2015-02-09 18:59:57 +01:00
parent 9064c31b51
commit 42f0e653cc
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/greeting/GreetingPage.cpp
View File

@ -61,6 +61,8 @@ GreetingPage::GreetingPage( QWidget* parent )
{ {
isTranslationAvailable = true; isTranslationAvailable = true;
ui->languageWidget->setCurrentRow( ui->languageWidget->count() - 1 ); ui->languageWidget->setCurrentRow( ui->languageWidget->count() - 1 );
cDebug() << "Initial locale " << thisLocale.name();
CalamaresUtils::installTranslator( thisLocale.name(), qApp );
} }
} }
ui->languageWidget->sortItems(); ui->languageWidget->sortItems();
@ -74,6 +76,8 @@ GreetingPage::GreetingPage( QWidget* parent )
{ {
isTranslationAvailable = true; isTranslationAvailable = true;
ui->languageWidget->setCurrentRow( i ); ui->languageWidget->setCurrentRow( i );
cDebug() << "Initial locale " << thisLocale.name();
CalamaresUtils::installTranslator( thisLocale.name(), qApp );
break; break;
} }
} }
@ -87,6 +91,9 @@ GreetingPage::GreetingPage( QWidget* parent )
if ( thisLocale == QLocale( QLocale::English, QLocale::UnitedStates ) ) if ( thisLocale == QLocale( QLocale::English, QLocale::UnitedStates ) )
{ {
ui->languageWidget->setCurrentRow( i ); ui->languageWidget->setCurrentRow( i );
cDebug() << "Translation unavailable, so initial locale set to " << thisLocale.name();
QLocale::setDefault( thisLocale );
CalamaresUtils::installTranslator( thisLocale.name(), qApp );
break; break;
} }
} }