Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 370670 - Fix regression in getSystemTimezone from calUtils unification. Path by Joey Minta <jminta@gmail.com>, r1=lilmatt, r2=mvl

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@221308 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mattwillis%gmail.com 2007-03-05 15:13:41 +00:00
parent d0474cc5ba
commit d84968b052
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/calendar/base/src/calUtils.js
View File

@ -96,6 +96,15 @@ function calendarDefaultTimezone() {
gDefaultTimezone = getPrefSafe("calendar.timezone.local", null);
if (!gDefaultTimezone) {
gDefaultTimezone = guessSystemTimezone();
} else {
var icsSvc = Cc["@mozilla.org/calendar/ics-service;1"]
.getService(Ci.calIICSService);
// Update this tzid if necessary.
if (icsSvc.latestTzId(gDefaultTimezone).length) {
gDefaultTimezone = icsSvc.latestTzId(gDefaultTimezone);
setPref("calendar.timezone.local", "CHAR", gDefaultTimezone);
}
}
}
return gDefaultTimezone;
@ -206,7 +215,8 @@ function guessSystemTimezone() {
// This happens if the l10n team didn't know how to get a time from
// tzdata.c. To convert an Olson time to a ics-timezone-string we
// need to append this prefix.
stringBundleTZ = "/mozilla.org/20050126_1/" + stringBundleTZ;
// XXX Get this prefix from calIICSService.tzIdPrefix
stringBundleTZ = "/mozilla.org/20070129_1/" + stringBundleTZ;
}
switch (checkTZ(stringBundleTZ)) {