diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 6e3a92b2d13..4a641f13f5e 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -99,65 +99,9 @@ label: 'Timezone', select: function(args) { var items = []; - items.push({id: "", description: ""}); - items.push({id: "Etc/GMT+12", description: "[UTC-12:00] GMT-12:00"}); - items.push({id: "Etc/GMT+11", description: "[UTC-11:00] GMT-11:00"}); - items.push({id: "Pacific/Samoa", description: "[UTC-11:00] Samoa Standard Time"}); - items.push({id: "Pacific/Honolulu", description: "[UTC-10:00] Hawaii Standard Time"}); - items.push({id: "US/Alaska", description: "[UTC-09:00] Alaska Standard Time"}); - items.push({id: "Mexico/BajaNorte", description: "[UTC-08:00] Baja California"}); - items.push({id: "US/Arizona", description: "[UTC-07:00] Arizona"}); - items.push({id: "US/Mountain", description: "[UTC-07:00] Mountain Standard Time"}); - items.push({id: "America/Chihuahua", description: "[UTC-07:00] Chihuahua, La Paz"}); - items.push({id: "America/Chicago", description: "[UTC-06:00] Central Standard Time"}); - items.push({id: "America/Costa_Rica", description: "[UTC-06:00] Central America"}); - items.push({id: "America/Mexico_City", description: "[UTC-06:00] Mexico City, Monterrey"}); - items.push({id: "Canada/Saskatchewan", description: "[UTC-06:00] Saskatchewan"}); - items.push({id: "America/Bogota", description: "[UTC-05:00] Bogota, Lima"}); - items.push({id: "America/New_York", description: "[UTC-05:00] Eastern Standard Time"}); - items.push({id: "America/Caracas", description: "[UTC-04:00] Venezuela Time"}); - items.push({id: "America/Asuncion", description: "[UTC-04:00] Paraguay Time"}); - items.push({id: "America/Cuiaba", description: "[UTC-04:00] Amazon Time"}); - items.push({id: "America/Halifax", description: "[UTC-04:00] Atlantic Standard Time"}); - items.push({id: "America/La_Paz", description: "[UTC-04:00] Bolivia Time"}); - items.push({id: "America/Santiago", description: "[UTC-04:00] Chile Time"}); - items.push({id: "America/St_Johns", description: "[UTC-03:30] Newfoundland Standard Time"}); - items.push({id: "America/Araguaina", description: "[UTC-03:00] Brasilia Time"}); - items.push({id: "America/Argentina/Buenos_Aires", description: "[UTC-03:00] Argentine Time"}); - items.push({id: "America/Cayenne", description: "[UTC-03:00] French Guiana Time"}); - items.push({id: "America/Godthab", description: "[UTC-03:00] Greenland Time"}); - items.push({id: "America/Montevideo", description: "[UTC-03:00] Uruguay Time"}); - items.push({id: "Etc/GMT+2", description: "[UTC-02:00] GMT-02:00"}); - items.push({id: "Atlantic/Azores", description: "[UTC-01:00] Azores Time"}); - items.push({id: "Atlantic/Cape_Verde", description: "[UTC-01:00] Cape Verde Time"}); - items.push({id: "Africa/Casablanca", description: "[UTC] Casablanca"}); - items.push({id: "Etc/UTC", description: "[UTC] Coordinated Universal Time"}); - items.push({id: "Atlantic/Reykjavik", description: "[UTC] Reykjavik"}); - items.push({id: "Europe/London", description: "[UTC] Western European Time"}); - items.push({id: "CET", description: "[UTC+01:00] Central European Time"}); - items.push({id: "Europe/Bucharest", description: "[UTC+02:00] Eastern European Time"}); - items.push({id: "Africa/Johannesburg", description: "[UTC+02:00] South Africa Standard Time"}); - items.push({id: "Asia/Beirut", description: "[UTC+02:00] Beirut"}); - items.push({id: "Africa/Cairo", description: "[UTC+02:00] Cairo"}); - items.push({id: "Asia/Jerusalem", description: "[UTC+02:00] Israel Standard Time"}); - items.push({id: "Europe/Minsk", description: "[UTC+02:00] Minsk"}); - items.push({id: "Europe/Moscow", description: "[UTC+03:00] Moscow Standard Time"}); - items.push({id: "Africa/Nairobi", description: "[UTC+03:00] Eastern African Time"}); - items.push({id: "Asia/Karachi", description: "[UTC+05:00] Pakistan Time"}); - items.push({id: "Asia/Kolkata", description: "[UTC+05:30] India Standard Time"}); - items.push({id: "Asia/Bangkok", description: "[UTC+05:30] Indochina Time"}); - items.push({id: "Asia/Shanghai", description: "[UTC+08:00] China Standard Time"}); - items.push({id: "Asia/Kuala_Lumpur", description: "[UTC+08:00] Malaysia Time"}); - items.push({id: "Australia/Perth", description: "[UTC+08:00] Western Standard Time (Australia)"}); - items.push({id: "Asia/Taipei", description: "[UTC+08:00] Taiwan"}); - items.push({id: "Asia/Tokyo", description: "[UTC+09:00] Japan Standard Time"}); - items.push({id: "Asia/Seoul", description: "[UTC+09:00] Korea Standard Time"}); - items.push({id: "Australia/Adelaide", description: "[UTC+09:30] Central Standard Time (South Australia)"}); - items.push({id: "Australia/Darwin", description: "[UTC+09:30] Central Standard Time (Northern Territory)"}); - items.push({id: "Australia/Brisbane", description: "[UTC+10:00] Eastern Standard Time (Queensland)"}); - items.push({id: "Australia/Canberra", description: "[UTC+10:00] Eastern Standard Time (New South Wales)"}); - items.push({id: "Pacific/Guam", description: "[UTC+10:00] Chamorro Standard Time"}); - items.push({id: "Pacific/Auckland", description: "[UTC+12:00] New Zealand Standard Time"}); + items.push({id: "", description: ""}); + for(var p in timezoneMap) + items.push({id: p, description: timezoneMap[p]}); args.response.success({data: items}); } } diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index d5d07dfefaa..bfd6bbfa29f 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -286,64 +286,63 @@ function getVmName(p_vmName, p_vmDisplayname) { return vmName; } -// Timezones -var timezones = new Object(); -timezones['Etc/GMT+12']='[UTC-12:00] GMT-12:00'; -timezones['Etc/GMT+11']='[UTC-11:00] GMT-11:00'; -timezones['Pacific/Samoa']='[UTC-11:00] Samoa Standard Time'; -timezones['Pacific/Honolulu']='[UTC-10:00] Hawaii Standard Time'; -timezones['US/Alaska']='[UTC-09:00] Alaska Standard Time'; -timezones['America/Los_Angeles']='[UTC-08:00] Pacific Standard Time'; -timezones['Mexico/BajaNorte']='[UTC-08:00] Baja California'; -timezones['US/Arizona']='[UTC-07:00] Arizona'; -timezones['US/Mountain']='[UTC-07:00] Mountain Standard Time'; -timezones['America/Chihuahua']='[UTC-07:00] Chihuahua, La Paz'; -timezones['America/Chicago']='[UTC-06:00] Central Standard Time'; -timezones['America/Costa_Rica']='[UTC-06:00] Central America'; -timezones['America/Mexico_City']='[UTC-06:00] Mexico City, Monterrey'; -timezones['Canada/Saskatchewan']='[UTC-06:00] Saskatchewan'; -timezones['America/Bogota']='[UTC-05:00] Bogota, Lima'; -timezones['America/New_York']='[UTC-05:00] Eastern Standard Time'; -timezones['America/Caracas']='[UTC-04:00] Venezuela Time'; -timezones['America/Asuncion']='[UTC-04:00] Paraguay Time'; -timezones['America/Cuiaba']='[UTC-04:00] Amazon Time'; -timezones['America/Halifax']='[UTC-04:00] Atlantic Standard Time'; -timezones['America/La_Paz']='[UTC-04:00] Bolivia Time'; -timezones['America/Santiago']='[UTC-04:00] Chile Time'; -timezones['America/St_Johns']='[UTC-03:30] Newfoundland Standard Time'; -timezones['America/Araguaina']='[UTC-03:00] Brasilia Time'; -timezones['America/Argentina/Buenos_Aires']='[UTC-03:00] Argentine Time'; -timezones['America/Cayenne']='[UTC-03:00] French Guiana Time'; -timezones['America/Godthab']='[UTC-03:00] Greenland Time'; -timezones['America/Montevideo']='[UTC-03:00] Uruguay Time]'; -timezones['Etc/GMT+2']='[UTC-02:00] GMT-02:00'; -timezones['Atlantic/Azores']='[UTC-01:00] Azores Time'; -timezones['Atlantic/Cape_Verde']='[UTC-01:00] Cape Verde Time'; -timezones['Africa/Casablanca']='[UTC] Casablanca'; -timezones['Etc/UTC']='[UTC] Coordinated Universal Time'; -timezones['Atlantic/Reykjavik']='[UTC] Reykjavik'; -timezones['Europe/London']='[UTC] Western European Time'; -timezones['CET']='[UTC+01:00] Central European Time'; -timezones['Europe/Bucharest']='[UTC+02:00] Eastern European Time'; -timezones['Africa/Johannesburg']='[UTC+02:00] South Africa Standard Time'; -timezones['Asia/Beirut']='[UTC+02:00] Beirut'; -timezones['Africa/Cairo']='[UTC+02:00] Cairo'; -timezones['Asia/Jerusalem']='[UTC+02:00] Israel Standard Time'; -timezones['Europe/Minsk']='[UTC+02:00] Minsk'; -timezones['Europe/Moscow']='[UTC+03:00] Moscow Standard Time'; -timezones['Africa/Nairobi']='[UTC+03:00] Eastern African Time'; -timezones['Asia/Karachi']='[UTC+05:00] Pakistan Time'; -timezones['Asia/Kolkata']='[UTC+05:30] India Standard Time'; -timezones['Asia/Bangkok']='[UTC+05:30] Indochina Time'; -timezones['Asia/Shanghai']='[UTC+08:00] China Standard Time'; -timezones['Asia/Kuala_Lumpur']='[UTC+08:00] Malaysia Time'; -timezones['Australia/Perth']='[UTC+08:00] Western Standard Time (Australia)'; -timezones['Asia/Taipei']='[UTC+08:00] Taiwan'; -timezones['Asia/Tokyo']='[UTC+09:00] Japan Standard Time'; -timezones['Asia/Seoul']='[UTC+09:00] Korea Standard Time'; -timezones['Australia/Adelaide']='[UTC+09:30] Central Standard Time (South Australia)'; -timezones['Australia/Darwin']='[UTC+09:30] Central Standard Time (Northern Territory)'; -timezones['Australia/Brisbane']='[UTC+10:00] Eastern Standard Time (Queensland)'; -timezones['Australia/Canberra']='[UTC+10:00] Eastern Standard Time (New South Wales)'; -timezones['Pacific/Guam']='[UTC+10:00] Chamorro Standard Time'; -timezones['Pacific/Auckland']='[UTC+12:00] New Zealand Standard Time'; +var timezoneMap = new Object(); +timezoneMap['Etc/GMT+12']='[UTC-12:00] GMT-12:00'; +timezoneMap['Etc/GMT+11']='[UTC-11:00] GMT-11:00'; +timezoneMap['Pacific/Samoa']='[UTC-11:00] Samoa Standard Time'; +timezoneMap['Pacific/Honolulu']='[UTC-10:00] Hawaii Standard Time'; +timezoneMap['US/Alaska']='[UTC-09:00] Alaska Standard Time'; +timezoneMap['America/Los_Angeles']='[UTC-08:00] Pacific Standard Time'; +timezoneMap['Mexico/BajaNorte']='[UTC-08:00] Baja California'; +timezoneMap['US/Arizona']='[UTC-07:00] Arizona'; +timezoneMap['US/Mountain']='[UTC-07:00] Mountain Standard Time'; +timezoneMap['America/Chihuahua']='[UTC-07:00] Chihuahua, La Paz'; +timezoneMap['America/Chicago']='[UTC-06:00] Central Standard Time'; +timezoneMap['America/Costa_Rica']='[UTC-06:00] Central America'; +timezoneMap['America/Mexico_City']='[UTC-06:00] Mexico City, Monterrey'; +timezoneMap['Canada/Saskatchewan']='[UTC-06:00] Saskatchewan'; +timezoneMap['America/Bogota']='[UTC-05:00] Bogota, Lima'; +timezoneMap['America/New_York']='[UTC-05:00] Eastern Standard Time'; +timezoneMap['America/Caracas']='[UTC-04:00] Venezuela Time'; +timezoneMap['America/Asuncion']='[UTC-04:00] Paraguay Time'; +timezoneMap['America/Cuiaba']='[UTC-04:00] Amazon Time'; +timezoneMap['America/Halifax']='[UTC-04:00] Atlantic Standard Time'; +timezoneMap['America/La_Paz']='[UTC-04:00] Bolivia Time'; +timezoneMap['America/Santiago']='[UTC-04:00] Chile Time'; +timezoneMap['America/St_Johns']='[UTC-03:30] Newfoundland Standard Time'; +timezoneMap['America/Araguaina']='[UTC-03:00] Brasilia Time'; +timezoneMap['America/Argentina/Buenos_Aires']='[UTC-03:00] Argentine Time'; +timezoneMap['America/Cayenne']='[UTC-03:00] French Guiana Time'; +timezoneMap['America/Godthab']='[UTC-03:00] Greenland Time'; +timezoneMap['America/Montevideo']='[UTC-03:00] Uruguay Time]'; +timezoneMap['Etc/GMT+2']='[UTC-02:00] GMT-02:00'; +timezoneMap['Atlantic/Azores']='[UTC-01:00] Azores Time'; +timezoneMap['Atlantic/Cape_Verde']='[UTC-01:00] Cape Verde Time'; +timezoneMap['Africa/Casablanca']='[UTC] Casablanca'; +timezoneMap['Etc/UTC']='[UTC] Coordinated Universal Time'; +timezoneMap['Atlantic/Reykjavik']='[UTC] Reykjavik'; +timezoneMap['Europe/London']='[UTC] Western European Time'; +timezoneMap['CET']='[UTC+01:00] Central European Time'; +timezoneMap['Europe/Bucharest']='[UTC+02:00] Eastern European Time'; +timezoneMap['Africa/Johannesburg']='[UTC+02:00] South Africa Standard Time'; +timezoneMap['Asia/Beirut']='[UTC+02:00] Beirut'; +timezoneMap['Africa/Cairo']='[UTC+02:00] Cairo'; +timezoneMap['Asia/Jerusalem']='[UTC+02:00] Israel Standard Time'; +timezoneMap['Europe/Minsk']='[UTC+02:00] Minsk'; +timezoneMap['Europe/Moscow']='[UTC+03:00] Moscow Standard Time'; +timezoneMap['Africa/Nairobi']='[UTC+03:00] Eastern African Time'; +timezoneMap['Asia/Karachi']='[UTC+05:00] Pakistan Time'; +timezoneMap['Asia/Kolkata']='[UTC+05:30] India Standard Time'; +timezoneMap['Asia/Bangkok']='[UTC+05:30] Indochina Time'; +timezoneMap['Asia/Shanghai']='[UTC+08:00] China Standard Time'; +timezoneMap['Asia/Kuala_Lumpur']='[UTC+08:00] Malaysia Time'; +timezoneMap['Australia/Perth']='[UTC+08:00] Western Standard Time (Australia)'; +timezoneMap['Asia/Taipei']='[UTC+08:00] Taiwan'; +timezoneMap['Asia/Tokyo']='[UTC+09:00] Japan Standard Time'; +timezoneMap['Asia/Seoul']='[UTC+09:00] Korea Standard Time'; +timezoneMap['Australia/Adelaide']='[UTC+09:30] Central Standard Time (South Australia)'; +timezoneMap['Australia/Darwin']='[UTC+09:30] Central Standard Time (Northern Territory)'; +timezoneMap['Australia/Brisbane']='[UTC+10:00] Eastern Standard Time (Queensland)'; +timezoneMap['Australia/Canberra']='[UTC+10:00] Eastern Standard Time (New South Wales)'; +timezoneMap['Pacific/Guam']='[UTC+10:00] Chamorro Standard Time'; +timezoneMap['Pacific/Auckland']='[UTC+12:00] New Zealand Standard Time'; diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 3739599eb16..2ed385dc345 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -356,7 +356,7 @@ }, timezone: function(args) { args.response.success({ - data: $.map(timezones, function(value, key) { + data: $.map(timezoneMap, function(value, key) { return { id: key, name: value