From 32456cc0ff14c180e62d87b91d15824be2549e60 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Fri, 31 Oct 2014 14:33:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=87=D0=B0=D1=81=D0=BE=D0=B2=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=8F=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/install/variables/locale.py | 118 ++++++++++++++++++++++++-------- 1 file changed, 88 insertions(+), 30 deletions(-) diff --git a/pym/install/variables/locale.py b/pym/install/variables/locale.py index 868864c..70fc308 100644 --- a/pym/install/variables/locale.py +++ b/pym/install/variables/locale.py @@ -199,36 +199,94 @@ class VariableOsInstallClockTimezone(LocaleVariable): pass def choice(self): - source = ["Etc/GMT-12", "Pacific/Midway", "Pacific/Honolulu", - "America/Anchorage", "Canada/Pacific", "America/Tijuana", - "America/Phoenix", "America/Denver", "America/Mazatlan", - "America/Mazatlan", "America/Monterrey", "America/Monterrey", - "America/Regina", "America/Mexico_City", "Canada/Central", - "America/Bogota", "America/New_York", - "America/Indiana/Indianapolis", "America/Halifax", - "America/Caracas", "America/Manaus", "America/Santiago", - "America/St_Johns", "America/Sao_Paulo", - "America/Argentina/Buenos_Aires", "Etc/GMT+3", - "America/Montevideo", "Atlantic/South_Georgia", - "Atlantic/Azores", "Atlantic/Cape_Verde", "UTC", - "Africa/Casablanca", "Europe/Amsterdam", "Europe/Belgrade", - "Europe/Brussels", "Europe/Zagreb", "Africa/Tunis", - "Asia/Amman", "Europe/Istanbul", "Asia/Beirut", - "Europe/Helsinki", "Europe/Kiev", - "Africa/Windhoek", "Asia/Jerusalem", "Africa/Cairo", - "Europe/Minsk", "Africa/Harare", "Asia/Baghdad", "Asia/Kuwait", - "Europe/Moscow", "Africa/Nairobi", "Asia/Tbilisi", - "Asia/Tehran", "Asia/Muscat", "Asia/Baku", "Asia/Yerevan", - "Asia/Kabul", "Asia/Yekaterinburg", "Asia/Karachi", - "Asia/Calcutta", "Asia/Jayapura", "Asia/Katmandu", - "Asia/Almaty", "Asia/Dhaka", "Asia/Omsk", "Asia/Rangoon", - "Asia/Bangkok", "Asia/Krasnoyarsk", "Asia/Hong_Kong", - "Asia/Irkutsk", "Asia/Singapore", "Australia/Perth", - "Asia/Taipei", "Asia/Tokyo", "Asia/Seoul", "Asia/Yakutsk", - "Australia/Adelaide", "Australia/Darwin", "Australia/Brisbane", - "Asia/Vladivostok", "Pacific/Guam", "Australia/Melbourne", - "Australia/Hobart", "Asia/Magadan", "Asia/Kamchatka", - "Pacific/Auckland", "Etc/GMT-13"] + source = ["Etc/GMT-12", + "Pacific/Midway", + "Pacific/Honolulu", + "America/Anchorage", + "Canada/Pacific", + "America/Tijuana", + "America/Phoenix", + "America/Denver", + "America/Mazatlan", + "America/Monterrey", + "America/Regina", + "America/Mexico_City", + "Canada/Central", + "America/Bogota", + "America/New_York", + "America/Indiana/Indianapolis", + "America/Halifax", + "America/Caracas", + "America/Manaus", + "America/Santiago", + "America/St_Johns", + "America/Sao_Paulo", + "America/Argentina/Buenos_Aires", + "Etc/GMT+3", + "America/Montevideo", + "Atlantic/South_Georgia", + "Atlantic/Azores", + "Atlantic/Cape_Verde", + "UTC", + "Africa/Casablanca", + "Europe/Amsterdam", + "Europe/Belgrade", + "Europe/Brussels", + "Europe/Zagreb", + "Africa/Tunis", + "Europe/Kaliningrad", + "Asia/Amman", + "Europe/Istanbul", + "Asia/Beirut", + "Europe/Helsinki", + "Europe/Kiev", + "Europa/Sofia", + "Africa/Windhoek", + "Asia/Jerusalem", + "Africa/Cairo", + "Europe/Minsk", + "Africa/Harare", + "Europe/Moscow", + "Asia/Baghdad", + "Asia/Kuwait", + "Africa/Nairobi", + "Asia/Tbilisi", + "Asia/Tehran", + "Europe/Samara", + "Asia/Muscat", + "Asia/Baku", + "Asia/Yerevan", + "Asia/Kabul", + "Asia/Yekaterinburg", + "Asia/Karachi", + "Asia/Calcutta", + "Asia/Jayapura", + "Asia/Katmandu", + "Asia/Almaty", + "Asia/Omsk", + "Asia/Dhaka", + "Asia/Rangoon", + "Asia/Krasnoyarsk", + "Asia/Bangkok", + "Asia/Irkutsk", + "Asia/Hong_Kong", + "Asia/Singapore", + "Australia/Perth", + "Asia/Taipei", + "Asia/Yakutsk", + "Asia/Tokyo", + "Asia/Seoul", + "Australia/Adelaide", + "Australia/Darwin", + "Asia/Vladivostok", + "Australia/Brisbane", + "Pacific/Guam", + "Australia/Melbourne", + "Australia/Hobart", + "Asia/Srednekolymsk", + "Asia/Kamchatka", + "Pacific/Auckland", + "Etc/GMT-13"] def sortkey(s): tz = timezone(s) strinfo = tz.localize(datetime.now()).strftime('%z')