From 471d94a02e2de4e57492d8df341088e39f80e06c Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Wed, 3 Aug 2016 18:30:41 +0200
Subject: [PATCH] Read country codes from zone.tab.

---
 src/modules/locale/timezonewidget/localeglobal.cpp | 7 ++++++-
 src/modules/locale/timezonewidget/localeglobal.h   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/modules/locale/timezonewidget/localeglobal.cpp b/src/modules/locale/timezonewidget/localeglobal.cpp
index b7aa603e1..16a5dba00 100644
--- a/src/modules/locale/timezonewidget/localeglobal.cpp
+++ b/src/modules/locale/timezonewidget/localeglobal.cpp
@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
  *   Originally from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -149,10 +149,15 @@ void LocaleGlobal::initLocations() {
         if (timezone.size() < 2)
             continue;
 
+        QString countryCode = list.at(0).trimmed();
+        if (countryCode.size() != 2)
+            continue;
+
         location.region = timezone.takeFirst();
         location.zone = timezone.join( '/' );
         location.latitude = getRightGeoLocation(list.at(1).mid(0, cooSplitPos));
         location.longitude = getRightGeoLocation(list.at(1).mid(cooSplitPos));
+        location.country = countryCode;
 
         locations[location.region].append(location);
     }
diff --git a/src/modules/locale/timezonewidget/localeglobal.h b/src/modules/locale/timezonewidget/localeglobal.h
index 5bacffc47..665ddefe8 100644
--- a/src/modules/locale/timezonewidget/localeglobal.h
+++ b/src/modules/locale/timezonewidget/localeglobal.h
@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
  *   Originally from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -43,7 +43,7 @@ public:
     };
 
     struct Location {
-        QString region, zone;
+        QString region, zone, country;
         double latitude, longitude;
         static QString pretty( const QString& s );
         QString comment() const;