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

[locale] Update GS when the LC value changes (not just location)

Browse Source
This commit is contained in:
Adriaan de Groot 2020-07-23 23:30:43 +02:00
parent 00e9454344
commit e78cde7ccb
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/locale/Config.cpp
View File

@ -166,11 +166,23 @@ Config::Config( QObject* parent )
// we don't need to call an update-GS method, or introduce an intermediate // we don't need to call an update-GS method, or introduce an intermediate
// update-thing-and-GS method. And everywhere where we **do** change // update-thing-and-GS method. And everywhere where we **do** change
// language or location, we already emit the signal. // language or location, we already emit the signal.
connect( this, &Config::currentLanguageStatusChanged, [&]() { connect( this, &Config::currentLanguageCodeChanged, [&]() {
auto* gs = Calamares::JobQueue::instance()->globalStorage(); auto* gs = Calamares::JobQueue::instance()->globalStorage();
gs->insert( "locale", m_selectedLocaleConfiguration.toBcp47() ); gs->insert( "locale", m_selectedLocaleConfiguration.toBcp47() );
} ); } );
connect( this, &Config::currentLCCodeChanged, [&]() {
auto* gs = Calamares::JobQueue::instance()->globalStorage();
// Update GS localeConf (the LC_ variables)
auto map = localeConfiguration().toMap();
QVariantMap vm;
for ( auto it = map.constBegin(); it != map.constEnd(); ++it )
{
vm.insert( it.key(), it.value() );
}
gs->insert( "localeConf", vm );
} );
connect( this, &Config::currentLocationChanged, [&]() { connect( this, &Config::currentLocationChanged, [&]() {
auto* gs = Calamares::JobQueue::instance()->globalStorage(); auto* gs = Calamares::JobQueue::instance()->globalStorage();
@ -186,15 +198,6 @@ Config::Config( QObject* parent )
QProcess::execute( "timedatectl", // depends on systemd QProcess::execute( "timedatectl", // depends on systemd
{ "set-timezone", location->region() + '/' + location->zone() } ); { "set-timezone", location->region() + '/' + location->zone() } );
} }
// Update GS localeConf (the LC_ variables)
auto map = localeConfiguration().toMap();
QVariantMap vm;
for ( auto it = map.constBegin(); it != map.constEnd(); ++it )
{
vm.insert( it.key(), it.value() );
}
gs->insert( "localeConf", vm );
} ); } );
} }