From cf64b2ce273f4fc59053b5f3e9382ecec3035896 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 20 Feb 2015 14:54:52 +0100
Subject: [PATCH] Allow zone subdivisions in timezones list. CAL-191 #close
 Please test and reopen if it's still broken.

---
 src/modules/locale/timezonewidget/localeglobal.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/locale/timezonewidget/localeglobal.cpp b/src/modules/locale/timezonewidget/localeglobal.cpp
index 7cdcd826e..1e32c5a0b 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, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
  *   Originally from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -131,8 +131,8 @@ void LocaleGlobal::initLocations() {
         if (timezone.size() < 2)
             continue;
 
-        location.region = timezone.first();
-        location.zone = timezone.last();
+        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));