* Added patch to prevent locales and timezones from being set to wrong values in modified dropdown menus.

* Commented out client-side code hiding “Etc” timezones in the preferences’ dropdown to prevent wrong settings.
 * Added localized timezone name in dropdown menu (only visible in JavaScript-disabled clients).

Fixes issue 128.

code/Global/Global.js

@@ -851,8 +851,8 @@ function getTimeZones(language) {
          offset = timeZone.getRawOffset();
          result.push({
             value: zone,
-            display: /* timeZone.getDisplayName(timeZone.inDaylightTime(now), 
+            display: timeZone.getDisplayName(timeZone.inDaylightTime(now),
-                  java.util.TimeZone.LONG, locale) */ " (UTC" + (offset / 
+                  java.util.TimeZone.LONG, locale) + " (UTC" + (offset /
                   Date.ONEHOUR).format("+00;-00") + ":" + (Math.abs(offset % 
                   Date.ONEHOUR) / Date.ONEMINUTE).format("00") + ")"
          });

extra/updater/patch-20101209.js

@@ -0,0 +1,42 @@
+//
+// The Antville Project
+// http://code.google.com/p/antville
+//
+// Copyright 2001-2007 by The Antville People
+//
+// Licensed under the Apache License, Version 2.0 (the ``License'');
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an ``AS IS'' BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// $Revision$
+// $LastChangedBy$
+// $LastChangedDate$
+// $URL$
+//
+
+// Apply with enabled updater repository via ant patch -Dpatch.id=20101209
+
+root.forEach(function() {
+   var site = this;
+   var locale = site.locale;
+   if (locale.contains("_")) {
+      site.locale = locale.substr(0, locale.lastIndexOf("_"));
+   }
+   var timeZone = site.timeZone;
+   switch (timeZone) {
+      case "CET":
+      site.timeZone = "Europe/Vienna";
+      break;
+      case "GMT":
+      site.timeZone = "Europe/London";
+      break;
+   }
+});

static/www/antville-1.2.js

@@ -11,7 +11,7 @@ $(function() {
       var zone = $(item);
       var parts = zone.val().split("/");
       if (parts.length > 1) {
-         if (parts[0].indexOf("Etc") === 0 || 
+         if (/* parts[0].indexOf("Etc") === 0 || */
                parts[0].indexOf("SystemV") === 0) {
             zone.remove();
             return;