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 5327038
Date Tue, 18 Nov 2014 22:03:40 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 880ab4392 -> 5327038c1


Missing label id and removed duplicate label.ids.

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/5327038c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5327038c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5327038c

Branch: refs/heads/master
Commit: 5327038c16608eeeafc386c737d3df37e14a5554
Parents: 880ab43
Author: vetrivelc <vetrivel.chinnasamy@citrix.com>
Authored: Tue Nov 18 16:07:50 2014 +0530
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Nov 18 14:03:13 2014 -0800

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties       | 3 ++-
 client/WEB-INF/classes/resources/messages_ja_JP.properties | 1 +
 client/WEB-INF/classes/resources/messages_zh_CN.properties | 1 +
 ui/dictionary2.jsp                                         | 2 +-
 ui/scripts/system.js                                       | 8 ++++----
 5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5327038c/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 ccaad5e..9c2c4d7 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -830,6 +830,7 @@ 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.to.primary.storage=Migrate volume to another primary storage
+label.migrate.volume=Migrate Volume
 label.minimum=Minimum
 label.minute.past.hour=minute(s) Past the Hour
 label.monday=Monday
@@ -2051,5 +2052,5 @@ state.Stopping=Stopping
 state.Suspended=Suspended
 ui.listView.filters.all=All
 ui.listView.filters.mine=Mine
-label.na=NA
+label.na=N/A
 label.added.network.offering=Added network offering
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5327038c/client/WEB-INF/classes/resources/messages_ja_JP.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja_JP.properties b/client/WEB-INF/classes/resources/messages_ja_JP.properties
index c0e8b4e..f0f9c2d 100644
--- a/client/WEB-INF/classes/resources/messages_ja_JP.properties
+++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties
@@ -2051,3 +2051,4 @@ state.Stopping=\u505c\u6b62\u3057\u3066\u3044\u307e\u3059
 state.Suspended=\u4e00\u6642\u505c\u6b62
 ui.listView.filters.all=\u3059\u3079\u3066
 ui.listView.filters.mine=\u81ea\u5206\u306e\u3082\u306e
+label.migrate.volume=Migrate Volume
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5327038c/client/WEB-INF/classes/resources/messages_zh_CN.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index fc45d00..e16a55b 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -2051,3 +2051,4 @@ state.Stopping=\u6b63\u5728\u505c\u6b62
 state.Suspended=\u5df2\u6682\u505c
 ui.listView.filters.all=\u5168\u90e8
 ui.listView.filters.mine=\u672c\u7528\u6237
+label.migrate.volume=Migrate Volume
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5327038c/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index a76ba3b..7bc8c37 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1011,7 +1011,7 @@ $.extend(dictionary, {
 '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" />',
+'label.migrate.volume': '<fmt:message key="label.migrate.volume" />',
 'label.added.network.offering': '<fmt:message key="label.added.network.offering" />',
-'label.no': '<fmt:message key="label.no" />'
 });
 </script>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5327038c/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 13f1d85..f281265 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -13619,12 +13619,12 @@
                                                         var podItem = json.listdedicatedpodsresponse.dedicatedpod[0];
                                                         if (podItem.domainid != null) {
                                                             $.extend(item, podItem, {
-                                                                isdedicated: 'label.yes'
+                                                                isdedicated: _l('label.yes')
                                                             });
                                                         }
                                                     } else
                                                     $.extend(item, {
-                                                        isdedicated: 'label.no'
+                                                        isdedicated: _l('label.no')
                                                     });
                                                     
                                                     args.response.success({
@@ -14756,12 +14756,12 @@
                                                         var clusterItem = json.listdedicatedclustersresponse.dedicatedcluster[0];
                                                         if (clusterItem.domainid != null)
{
                                                             $.extend(item, clusterItem, {
-                                                                isdedicated: 'label.yes'
+                                                                isdedicated: _l('label.yes')
                                                             });
                                                         }
                                                     } else
                                                     $.extend(item, {
-                                                        isdedicated: 'label.no'
+                                                        isdedicated: _l('label.no')
                                                     })
                                                 },
                                                 error: function (json) {


Mime
View raw message