applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-03 12:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[locale] Use new convenience function for updating localeConf

Browse source
This commit is contained in:
Adriaan de Groot 2020-09-03 20:20:05 +02:00
parent e0ba5a6ba2
commit 634a53d27a
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/locale/Config.cpp
View file

@ -14,6 +14,7 @@
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "Settings.h" #include "Settings.h"
#include "locale/Global.h"
#include "locale/Label.h" #include "locale/Label.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "network/Manager.h" #include "network/Manager.h"
@ -167,13 +168,7 @@ updateGSLocation( Calamares::GlobalStorage* gs, const CalamaresUtils::Locale::Ti
static void static void
updateGSLocale( Calamares::GlobalStorage* gs, const LocaleConfiguration& locale ) updateGSLocale( Calamares::GlobalStorage* gs, const LocaleConfiguration& locale )
{ {
auto map = locale.toMap(); CalamaresUtils::Locale::insertGS( *gs, locale.toMap(), CalamaresUtils::Locale::InsertMode::Overwrite );
QVariantMap vm;
for ( auto it = map.constBegin(); it != map.constEnd(); ++it )
{
vm.insert( it.key(), it.value() );
}
gs->insert( "localeConf", vm );
} }
Config::Config( QObject* parent ) Config::Config( QObject* parent )