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

Use new installTranslator in GreetingPage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-05-07 16:07:36 +02:00
parent fcb6817c54
commit d1047ab76e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,9 @@ 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(); cDebug() << "Initial locale " << thisLocale.name();
CalamaresUtils::installTranslator( thisLocale.name(), qApp ); CalamaresUtils::installTranslator( thisLocale,
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
} }
} }
ui->languageWidget->sortItems(); ui->languageWidget->sortItems();
@ -79,7 +81,9 @@ GreetingPage::GreetingPage( QWidget* parent )
isTranslationAvailable = true; isTranslationAvailable = true;
ui->languageWidget->setCurrentRow( i ); ui->languageWidget->setCurrentRow( i );
cDebug() << "Initial locale " << thisLocale.name(); cDebug() << "Initial locale " << thisLocale.name();
CalamaresUtils::installTranslator( thisLocale.name(), qApp ); CalamaresUtils::installTranslator( thisLocale,
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
break; break;
} }
} }
@ -95,7 +99,9 @@ GreetingPage::GreetingPage( QWidget* parent )
ui->languageWidget->setCurrentRow( i ); ui->languageWidget->setCurrentRow( i );
cDebug() << "Translation unavailable, so initial locale set to " << thisLocale.name(); cDebug() << "Translation unavailable, so initial locale set to " << thisLocale.name();
QLocale::setDefault( thisLocale ); QLocale::setDefault( thisLocale );
CalamaresUtils::installTranslator( thisLocale.name(), qApp ); CalamaresUtils::installTranslator( thisLocale,
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
break; break;
} }
} }
@ -108,7 +114,9 @@ GreetingPage::GreetingPage( QWidget* parent )
cDebug() << "Selected locale" << selectedLocale.name(); cDebug() << "Selected locale" << selectedLocale.name();
QLocale::setDefault( selectedLocale ); QLocale::setDefault( selectedLocale );
CalamaresUtils::installTranslator( selectedLocale.name(), qApp ); CalamaresUtils::installTranslator( selectedLocale,
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
} ); } );
connect( ui->languageWidget, &QListWidget::itemDoubleClicked, connect( ui->languageWidget, &QListWidget::itemDoubleClicked,