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

[welcome] Set some localeConf values from the welcome page

Browse Source
This commit is contained in:
Adriaan de Groot 2020-09-03 20:33:22 +02:00
parent 634a53d27a
commit 466e08a8ba
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -39,6 +39,11 @@ on functionality, but do touch each and every source file:
- *keyboardq* and *localeq* improvements. (Thanks to Anke) - *keyboardq* and *localeq* improvements. (Thanks to Anke)
- *users* module did not set up autologin properly. This is yet another - *users* module did not set up autologin properly. This is yet another
regression left over from 3.2.28. (Reported by Phil and pcrepix, #1498) regression left over from 3.2.28. (Reported by Phil and pcrepix, #1498)
- *welcome* module now sets the *LANG* key in the locale configuration
(which is shared with the *locale* module and consumed by the
*localecfg* module). This makes it feasible to drop the *locale*
module and still set the installed system's language to the language
selected in Calamares. (Reported by FerenOS)
# 3.2.29 (2020-08-20) # # 3.2.29 (2020-08-20) #

10
src/modules/welcome/Config.cpp
View File

@ -10,8 +10,11 @@
#include "Config.h" #include "Config.h"
#include "Branding.h" #include "Branding.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "Settings.h" #include "Settings.h"
#include "geoip/Handler.h" #include "geoip/Handler.h"
#include "locale/Global.h"
#include "locale/Lookup.h" #include "locale/Lookup.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -186,7 +189,12 @@ Config::setLocaleIndex( int index )
QLocale::setDefault( selectedLocale ); QLocale::setDefault( selectedLocale );
CalamaresUtils::installTranslator( selectedLocale, Calamares::Branding::instance()->translationsDirectory() ); CalamaresUtils::installTranslator( selectedLocale, Calamares::Branding::instance()->translationsDirectory() );
if ( Calamares::JobQueue::instance() && Calamares::JobQueue::instance()->globalStorage() )
{
CalamaresUtils::Locale::insertGS( *Calamares::JobQueue::instance()->globalStorage(),
QStringLiteral( "LANG" ),
CalamaresUtils::translatorLocaleName() );
}
emit localeIndexChanged( m_localeIndex ); emit localeIndexChanged( m_localeIndex );
} }