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

Allow zone subdivisions in timezones list.

Browse Source 
CAL-191 #close Please test and reopen if it's still broken.
This commit is contained in:
Teo Mrnjavac 2015-02-20 14:54:52 +01:00
parent d55d1c2fca
commit cf64b2ce27
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/locale/timezonewidget/localeglobal.cpp
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === 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 * Originally from the Manjaro Installation Framework
* by Roland Singer <roland@manjaro.org> * by Roland Singer <roland@manjaro.org>
@ -131,8 +131,8 @@ void LocaleGlobal::initLocations() {
if (timezone.size() < 2) if (timezone.size() < 2)
continue; continue;
location.region = timezone.first(); location.region = timezone.takeFirst();
location.zone = timezone.last(); location.zone = timezone.join( '/' );
location.latitude = getRightGeoLocation(list.at(1).mid(0, cooSplitPos)); location.latitude = getRightGeoLocation(list.at(1).mid(0, cooSplitPos));
location.longitude = getRightGeoLocation(list.at(1).mid(cooSplitPos)); location.longitude = getRightGeoLocation(list.at(1).mid(cooSplitPos));