diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index c5aa89c146d..a76e10169c4 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -407,14 +407,11 @@ // Localization if (!$.isFunction(cloudStack.localizationFn)) { // i.e., localize is overridden by a plugin/module cloudStack.localizationFn = function(str) { - return dictionary[str]; + // look in dictionary first; if not found, try dictionary2 + var localized = dictionary[str]; + return localized ? localized : dictionary2[str]; }; } - - //added for dictionary split up - if (dictionary != undefined && dictionary2 != undefined) { - $.extend(dictionary,dictionary2); - } // Localize validation messages cloudStack.localizeValidatorMessages(); diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index d463381d89e..a7383b7f478 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -1478,9 +1478,7 @@ var processPropertiesInImagestoreObject = function(jsonObj) { } return vmName; } - -var dictionary = {}, dictionary2 = {}; //for globalization - + var timezoneMap = new Object(); timezoneMap["Etc/GMT+12"] = "Etc/GMT+12 [GMT-12:00]"; timezoneMap["Etc/GMT+11"] = "Etc/GMT+11 [GMT-11:00]";