cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/3] git commit: updated refs/heads/master to f0cd632
Date Sun, 11 Oct 2015 13:57:20 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master fddf59f88 -> f0cd632d5


CLOUDSTACK-8930: Showing blank screen when click 'Next' link in final step of Add Zone wizard.


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

Branch: refs/heads/master
Commit: 2651956cf427614f5c50e89c3405e88319961cdd
Parents: 99059e2
Author: Nitin Kumar Maharana <nitinkumar.maharana@citrix.com>
Authored: Thu Oct 1 16:04:20 2015 +0530
Committer: Milamber <milamber@apache.org>
Committed: Wed Oct 7 07:47:00 2015 +0100

----------------------------------------------------------------------
 ui/dictionary2.jsp                 | 1 +
 ui/scripts/ui-custom/zoneWizard.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2651956c/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 26cebf1..d2bb683 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1098,6 +1098,7 @@ under the License.
 'label.remove.this.physical.network': '<fmt:message key="label.remove.this.physical.network"
/>',
 'label.physical.network.name': '<fmt:message key="label.physical.network.name" />',
 'label.save.changes': '<fmt:message key="label.save.changes" />',
+'label.launch.zone': '<fmt:message key="label.launch.zone" />',
 'label.autoscale.configuration.wizard': '<fmt:message key="label.autoscale.configuration.wizard"
/>',
 'label.health.check.wizard': '<fmt:message key="label.health.check.wizard" />',
 'label.health.check.message.desc': '<fmt:message key="label.health.check.message.desc"
/>',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2651956c/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 0e2dbe2..f8e8e20 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -1211,7 +1211,7 @@
 
                 // Show launch button if last step
                 if ($targetStep.index() == $steps.size() - 1 || options.nextStep) {
-                    $nextButton.find('span').html(options.nextStep ? _('label.save.changes')
: _('label.launch.zone'));
+                    $nextButton.find('span').html(options.nextStep ? _l('label.save.changes')
: _l('label.launch.zone'));
                     $nextButton.addClass('final');
 
                     if (options.nextStep) {


Mime
View raw message