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

[libcalamares, keyboard] Use convenience for getting current locale

Browse Source
This commit is contained in:
Adriaan de Groot 2022-06-18 00:40:26 +02:00
parent d80661211c
commit 2478570deb
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcalamares/PythonJobApi.cpp
View File

@ -13,6 +13,7 @@
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "PythonHelper.h" #include "PythonHelper.h"
#include "locale/Global.h"
#include "partition/Mount.h" #include "partition/Mount.h"
#include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -280,13 +281,9 @@ _gettext_languages()
Calamares::GlobalStorage* gs Calamares::GlobalStorage* gs
= jq ? jq->globalStorage() : CalamaresPython::GlobalStoragePythonWrapper::globalStorageInstance(); = jq ? jq->globalStorage() : CalamaresPython::GlobalStoragePythonWrapper::globalStorageInstance();
QVariant localeConf_ = gs->value( "localeConf" ); QString lang = CalamaresUtils::Locale::readGS( *gs, QStringLiteral( "LANG" ) );
if ( localeConf_.canConvert< QVariantMap >() ) if ( !lang.isEmpty() )
{ {
QVariant lang_ = localeConf_.value< QVariantMap >()[ "LANG" ];
if ( lang_.canConvert< QString >() )
{
QString lang = lang_.value< QString >();
languages.append( lang ); languages.append( lang );
if ( lang.indexOf( '.' ) > 0 ) if ( lang.indexOf( '.' ) > 0 )
{ {
@ -299,7 +296,6 @@ _gettext_languages()
languages.append( lang ); languages.append( lang );
} }
} }
}
return languages; return languages;
} }

3
src/modules/keyboard/Config.cpp
View File

@ -15,6 +15,7 @@
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "locale/Global.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/RAII.h" #include "utils/RAII.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
@ -483,7 +484,7 @@ Config::guessLocaleKeyboardLayout()
// Try to preselect a layout, depending on language and locale // Try to preselect a layout, depending on language and locale
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
QString lang = gs->value( "localeConf" ).toMap().value( "LANG" ).toString(); QString lang = CalamaresUtils::Locale::readGS( *gs, QStringLiteral( "LANG" ) );
cDebug() << "Got locale language" << lang; cDebug() << "Got locale language" << lang;
if ( !lang.isEmpty() ) if ( !lang.isEmpty() )