summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan de Groot <groot@kde.org>2019-05-10 11:03:01 -0400
committerAdriaan de Groot <groot@kde.org>2019-05-10 11:03:01 -0400
commitb490e30a5e0c5896f123f23d170eb4d23f10bb25 (patch)
treea03240914c8fb7326bc786a78820bf2e41205ebd
parent81499b22a1815ba1d38daa8d4064ae37b6940e4f (diff)
[welcome] Use the new locale lookup after GeoIP gets a 2-letter code
-rw-r--r--src/modules/welcome/WelcomeViewStep.cpp10
1 files changed, 9 insertions, 1 deletions
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;
}