Page MenuHomePhorge
Files F117465669

D829.1774840620.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D829.1774840620.diff
View Options

diff --git a/tests/validationtest.h b/tests/validationtest.h
--- a/tests/validationtest.h
+++ b/tests/validationtest.h
@@ -32,6 +32,7 @@
void testUTCwithTimezone();
void testTimezoneZ();
void testWindowsTimezone();
+ void test3PartTimezone();
};
#endif
diff --git a/tests/validationtest.cpp b/tests/validationtest.cpp
--- a/tests/validationtest.cpp
+++ b/tests/validationtest.cpp
@@ -121,6 +121,15 @@
QCOMPARE(Kolab::error(), Kolab::Error);
}
+void ValidationTest::test3PartTimezone()
+{
+ Event event;
+ event.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
+ event.setStart(cDateTime("America/Indiana/Indianapolis",2013,1,1,1,1,1));
+ writeEvent(event);
+ QCOMPARE(Kolab::error(), Kolab::NoError);
+}
+
QTEST_MAIN( ValidationTest )
diff --git a/tztable.h b/tztable.h
--- a/tztable.h
+++ b/tztable.h
@@ -59,6 +59,19 @@
"America/Anguilla",
"America/Antigua",
"America/Araguaina",
+ "America/Argentina/Buenos_Aires",
+ "America/Argentina/Catamarca",
+ "America/Argentina/ComodRivadavia",
+ "America/Argentina/Cordoba",
+ "America/Argentina/Jujuy",
+ "America/Argentina/La_Rioja",
+ "America/Argentina/Mendoza",
+ "America/Argentina/Rio_Gallegos",
+ "America/Argentina/Salta",
+ "America/Argentina/San_Juan",
+ "America/Argentina/San_Luis",
+ "America/Argentina/Tucuman",
+ "America/Argentina/Ushuaia",
"America/Aruba",
"America/Asuncion",
"America/Atikokan",
@@ -113,12 +126,22 @@
"America/Halifax",
"America/Havana",
"America/Hermosillo",
+ "America/Indiana/Indianapolis",
+ "America/Indiana/Knox",
+ "America/Indiana/Marengo",
+ "America/Indiana/Petersburg",
+ "America/Indiana/Tell_City",
+ "America/Indiana/Vevay",
+ "America/Indiana/Vincennes",
+ "America/Indiana/Winamac",
"America/Indianapolis",
"America/Inuvik",
"America/Iqaluit",
"America/Jamaica",
"America/Jujuy",
"America/Juneau",
+ "America/Kentucky/Louisville",
+ "America/Kentucky/Monticello",
"America/Knox_IN",
"America/Kralendijk",
"America/La_Paz",
@@ -149,6 +172,9 @@
"America/Nipigon",
"America/Nome",
"America/Noronha",
+ "America/North_Dakota/Beulah",
+ "America/North_Dakota/Center",
+ "America/North_Dakota/New_Salem",
"America/Ojinaga",
"America/Panama",
"America/Pangnirtung",
@@ -207,19 +233,6 @@
"Antarctica/Troll",
"Antarctica/Vostok",
"Arctic/Longyearbyen",
- "Argentina/Buenos_Aires",
- "Argentina/Catamarca",
- "Argentina/ComodRivadavia",
- "Argentina/Cordoba",
- "Argentina/Jujuy",
- "Argentina/La_Rioja",
- "Argentina/Mendoza",
- "Argentina/Rio_Gallegos",
- "Argentina/Salta",
- "Argentina/San_Juan",
- "Argentina/San_Luis",
- "Argentina/Tucuman",
- "Argentina/Ushuaia",
"Asia/Aden",
"Asia/Almaty",
"Asia/Amman",
@@ -495,20 +508,10 @@
"Indian/Mauritius",
"Indian/Mayotte",
"Indian/Reunion",
- "Indiana/Indianapolis",
- "Indiana/Knox",
- "Indiana/Marengo",
- "Indiana/Petersburg",
- "Indiana/Tell_City",
- "Indiana/Vevay",
- "Indiana/Vincennes",
- "Indiana/Winamac",
"Iran",
"Israel",
"Jamaica",
"Japan",
- "Kentucky/Louisville",
- "Kentucky/Monticello",
"Kwajalein",
"Libya",
"MET",
@@ -520,9 +523,6 @@
"NZ",
"NZ-CHAT",
"Navajo",
- "North_Dakota/Beulah",
- "North_Dakota/Center",
- "North_Dakota/New_Salem",
"PRC",
"PST8PDT",
"Pacific/Apia",
diff --git a/utils/zonetabconversion.py b/utils/zonetabconversion.py
--- a/utils/zonetabconversion.py
+++ b/utils/zonetabconversion.py
@@ -2,10 +2,10 @@
import os
-
timezones = []
+directory = '/usr/share/zoneinfo/'
-for root, directories, filenames in os.walk('/usr/share/zoneinfo/'):
+for root, directories, filenames in os.walk(directory):
for filename in filenames:
if filename.endswith('.tab'):
continue
@@ -19,13 +19,15 @@
if filename == 'posixrules':
continue
- if os.path.basename(root) == "posix":
+ zone = os.path.join(root[len(directory):], filename)
+
+ if zone.startswith("posix/"):
continue
- if os.path.basename(root) == "right":
+ if zone.startswith("right/"):
continue
- timezones.append(os.path.join(os.path.basename(root), filename))
+ timezones.append(zone)
timezones = sorted(list(set(timezones)))

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 3:17 AM (5 d, 20 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18790638
Default Alt Text
D829.1774840620.diff (4 KB)

Event Timeline