From b490e30a5e0c5896f123f23d170eb4d23f10bb25 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 10 May 2019 11:03:01 -0400 Subject: [PATCH] [welcome] Use the new locale lookup after GeoIP gets a 2-letter code --- src/modules/welcome/WelcomeViewStep.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp index 0442a2d6c..5f9bb4657 100644 --- a/src/modules/welcome/WelcomeViewStep.cpp +++ b/src/modules/welcome/WelcomeViewStep.cpp @@ -23,6 +23,7 @@ #include "checker/GeneralRequirements.h" #include "geoip/Handler.h" +#include "locale/Lookup.h" #include "modulesystem/ModuleManager.h" #include "utils/Logger.h" #include "utils/Variant.h" @@ -153,5 +154,12 @@ WelcomeViewStep::setCountry( const QString& countryCode ) return; } - cDebug() << "TODO: update country" << countryCode; + auto c_l = Calamares::countryData( countryCode ); + if ( c_l.first == QLocale::Country::AnyCountry ) + { + cDebug() << "Unusable country code" << countryCode; + return; + } + else + cDebug() << "Would like to select" << c_l; }