cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [1/2] git commit: updated refs/heads/4.2 to 4c597ab
Date Wed, 10 Jul 2013 22:27:23 GMT
Updated Branches:
  refs/heads/4.2 2a8e113aa -> 4c597ab78


UI: Fix localization fn override

If localization function is specified in another plugin, do not use the
default


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c597ab7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c597ab7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c597ab7

Branch: refs/heads/4.2
Commit: 4c597ab78f89bdda52832fccc0cb7f9622894a79
Parents: 5acf5c5
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Jul 10 11:16:18 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Jul 10 15:27:15 2013 -0700

----------------------------------------------------------------------
 ui/scripts/cloudStack.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c597ab7/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 1385607..c0ff7f2 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -483,9 +483,11 @@
     cloudStack.uiCustom.login(loginArgs);
 
     // Localization
-    cloudStack.localizationFn = function(str) {
-      return dictionary[str];
-    };
+    if (!$.isFunction(cloudStack.localizationFn)) { // i.e., localize is overridden by a
plugin/module
+      cloudStack.localizationFn = function(str) {
+        return dictionary[str];
+      };
+    }
 
     document.title = _l('label.app.name');
   });


Mime
View raw message