cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject git commit: updated refs/heads/master to 5646a07
Date Wed, 29 Apr 2015 09:30:54 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 1a719afb5 -> 5646a0751


CLOUDSTACK-8427: Some messages are hard-coded in javascript after Volume upload branch merge(0b835592)

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #208


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

Branch: refs/heads/master
Commit: 5646a0751358d047286b1ab87eeddcc8037ac8b0
Parents: 1a719af
Author: ramamurtis <ramamurti.subramanian@citrix.com>
Authored: Wed Apr 29 13:34:55 2015 +0530
Committer: Rajani Karuturi <rajanikaruturi@gmail.com>
Committed: Wed Apr 29 15:00:11 2015 +0530

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties | 2 +-
 ui/scripts/storage.js                                | 2 +-
 ui/scripts/templates.js                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5646a075/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index ff67a3e..b05bb78 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -256,7 +256,7 @@ label.action.reboot.systemvm.processing=Rebooting System VM....
 label.action.reboot.systemvm=Reboot System VM
 label.action.recurring.snapshot=Recurring Snapshots
 label.action.register.iso=Register ISO
-label.action.register.template=Register template
+label.action.register.template=Register Template from URL
 label.action.release.ip.processing=Releasing IP....
 label.action.release.ip=Release IP
 label.action.remove.host.processing=Removing Host....

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5646a075/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 7f210bd..618bd66 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -68,7 +68,7 @@
                     actions: {
                         // Add volume
                         add: {
-                            label: 'Add',
+                            label: 'label.add',
 
                             preFilter: function(args) {
                                 return !args.context.instances;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5646a075/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 725c867..521e022 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -107,7 +107,7 @@
                                 }
                             },
                             createForm: {
-                                title: 'Register Template from URL',
+                                title: 'label.action.register.template',
                                 docID: 'helpNetworkOfferingName',
                                 preFilter: cloudStack.preFilter.createTemplate,
                                 fields: {


Mime
View raw message