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

[welcome] Use the new locale lookup after GeoIP gets a 2-letter code

Browse Source
This commit is contained in:
Adriaan de Groot 2019-05-10 11:03:01 -04:00
parent 81499b22a1
commit b490e30a5e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@
#include "checker/GeneralRequirements.h" #include "checker/GeneralRequirements.h"
#include "geoip/Handler.h" #include "geoip/Handler.h"
#include "locale/Lookup.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Variant.h" #include "utils/Variant.h"
@ -153,5 +154,12 @@ WelcomeViewStep::setCountry( const QString& countryCode )
return; 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;
} }