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

Locale: when entering page, guess language.

Browse Source 
If user picks an installer language on the welcome page, then
the system language follows that setting -- but only after the
first action where Calamares must guess the system language
based on location. So guess on entry, so that system language
follows installer language.

FIXES #688.
This commit is contained in:
Adriaan de Groot 2017-06-07 03:52:44 +06:00
parent d545904f5c
commit e1a5af6529
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/locale/LocalePage.cpp
View File

@ -422,6 +422,13 @@ void
LocalePage::onActivate() LocalePage::onActivate()
{ {
m_regionCombo->setFocus(); m_regionCombo->setFocus();
if ( m_selectedLocaleConfiguration.isEmpty() ||
!m_selectedLocaleConfiguration.explicit_lang )
{
auto newLocale = guessLocaleConfiguration();
m_selectedLocaleConfiguration.lang = newLocale.lang;
updateLocaleLabels();
}
} }