cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/master to 4e12841
Date Thu, 23 Oct 2014 20:25:24 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 8218ce0fe -> 4e1284147


Fixed incorrect label issue.

Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>


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

Branch: refs/heads/master
Commit: 4e1284147e0f5489c25d275dd047854d17002691
Parents: 8218ce0
Author: vetrivelc <vetrivel.chinnasamy@citrix.com>
Authored: Wed Oct 15 18:18:51 2014 +0530
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Oct 23 13:25:20 2014 -0700

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties | 3 ++-
 ui/dictionary.jsp                                    | 2 +-
 ui/dictionary2.jsp                                   | 1 +
 ui/scripts/zoneWizard.js                             | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e128414/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 fb506d4..5322c59 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -829,7 +829,7 @@ label.migrate.router.to=Migrate Router to
 label.migrate.systemvm.to=Migrate System VM to
 label.migrate.to.host=Migrate to host
 label.migrate.to.storage=Migrate to storage
-label.migrate.volume=Migrate volume to another primary storage
+label.migrate.volume.to.primary.storage=Migrate volume to another primary storage
 label.minimum=Minimum
 label.minute.past.hour=minute(s) Past the Hour
 label.monday=Monday
@@ -2053,3 +2053,4 @@ state.Stopping=Stopping
 state.Suspended=Suspended
 ui.listView.filters.all=All
 ui.listView.filters.mine=Mine
+label.na=NA
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e128414/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 7751b1f..671f48f 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -832,7 +832,7 @@ dictionary = {
 'label.migrate.systemvm.to': '<fmt:message key="label.migrate.systemvm.to" />',
 'label.migrate.to.host': '<fmt:message key="label.migrate.to.host" />',
 'label.migrate.to.storage': '<fmt:message key="label.migrate.to.storage" />',
-'label.migrate.volume': '<fmt:message key="label.migrate.volume" />',
+'label.migrate.volume.to.primary.storage': '<fmt:message key="label.migrate.volume.to.primary.storage"
/>',
 'label.minimum': '<fmt:message key="label.minimum" />',
 'label.minute.past.hour': '<fmt:message key="label.minute.past.hour" />',
 'label.monday': '<fmt:message key="label.monday" />',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e128414/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 8f2a378..a7824c4 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1010,5 +1010,6 @@ dictionary2 = {
 'label.agent.state': '<fmt:message key="label.agent.state" />',
 'label.duration.in.sec': '<fmt:message key="label.duration.in.sec" />',
 'state.detached': '<fmt:message key="state.detached" />',
+'label.na': '<fmt:message key="label.na" />',
 };
 </script>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e128414/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 2c90f2b..3ed83f0 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1638,7 +1638,7 @@
                                     $form.find('[rel=server]').find(".value").find("input").val("localhost");
                                    
                                     $form.find('[rel=path]').css('display', 'block');   
                                
-                                    $form.find('[rel=path]').find(".name").find("label").html("<span
class=\"field-required\">*</span>'label.SR.name':");
+                                    $form.find('[rel=path]').find(".name").find("label").html('<span
class=\"field-required\">*</span>'+_l('label.SR.name')+':');
                                    
                                     $form.find('[rel=smbUsername]').hide();
                                     $form.find('[rel=smbPassword]').hide();


Mime
View raw message