You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/12/18 22:10:40 UTC
git commit: updated refs/heads/master to 34174bb
Updated Branches:
refs/heads/master 2e91cbe1a -> 34174bbcb
Add missing strings for quiesce VM, SMB fields
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34174bbc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34174bbc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34174bbc
Branch: refs/heads/master
Commit: 34174bbcbba6d32d7e4e50aada014f471954d97e
Parents: 2e91cbe
Author: Brian Federle <br...@citrix.com>
Authored: Wed Dec 18 13:09:42 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Dec 18 13:10:15 2013 -0800
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 4 ++++
ui/dictionary.jsp | 4 ++++
ui/scripts/instances.js | 2 +-
ui/scripts/storage.js | 2 +-
ui/scripts/system.js | 12 ++++++------
ui/scripts/zoneWizard.js | 6 +++---
6 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34174bbc/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 384a077..fda4e2d 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+label.quiesce.vm=Quiesce VM
+label.smb.username=SMB Username
+label.smb.password=SMB Password
+label.smb.domain=SMB Domain
label.hypervisors=Hypervisors
label.home=Home
label.sockets=Sockets
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34174bbc/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index c870f12..8e75969 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,10 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script type="text/javascript">
dictionary = {
+'label.quiesce.vm': '<fmt:message key="label.quiesce.vm" />',
+'label.smb.username': '<fmt:message key="label.smb.username" />',
+'label.smb.password': '<fmt:message key="label.smb.password" />',
+'label.smb.domain': '<fmt:message key="label.smb.domain" />',
'label.hypervisors': '<fmt:message key="label.hypervisors" />',
'label.home': '<fmt:message key="label.home" />',
'label.sockets': '<fmt:message key="label.sockets" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34174bbc/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 2b26529..5300a54 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -43,7 +43,7 @@
isChecked: false
},
quiescevm: {
- label: 'Quiesce VM',
+ label: 'label.quiesce.vm',
isBoolean: true,
isChecked: false
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34174bbc/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 86f7aa0..ec91a5d 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -576,7 +576,7 @@
desc: 'message.action.take.snapshot',
fields: {
quiescevm: {
- label: 'Quiesce VM',
+ label: 'label.quiesce.vm',
isBoolean: true,
isHidden: function(args) {
var hidden = true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34174bbc/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 6fdb51f..f4b0388 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -15040,14 +15040,14 @@
//SMB
smbUsername: {
- label: 'SMB Username',
+ label: 'label.smb.username',
validation: {
required: true
},
isHidden: true
},
smbPassword: {
- label: 'SMB Password',
+ label: 'label.smb.password',
isPassword: true,
validation: {
required: true
@@ -15055,7 +15055,7 @@
isHidden: true
},
smbDomain: {
- label: 'SMB Domain',
+ label: 'label.smb.domain',
validation: {
required: true
},
@@ -16410,20 +16410,20 @@
//SMB (begin)
smbUsername: {
- label: 'SMB Username',
+ label: 'label.smb.username',
validation: {
required: true
}
},
smbPassword: {
- label: 'SMB Password',
+ label: 'label.smb.password',
isPassword: true,
validation: {
required: true
}
},
smbDomain: {
- label: 'SMB Domain',
+ label: 'label.smb.domain',
validation: {
required: true
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34174bbc/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 15fb6a7..13630c1 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1747,14 +1747,14 @@
//SMB
smbUsername: {
- label: 'SMB Username',
+ label: 'label.smb.username',
validation: {
required: true
},
isHidden: true
},
smbPassword: {
- label: 'SMB Password',
+ label: 'label.smb.password',
isPassword: true,
validation: {
required: true
@@ -1762,7 +1762,7 @@
isHidden: true
},
smbDomain: {
- label: 'SMB Domain',
+ label: 'label.smb.domain',
validation: {
required: true
},