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:11:20 UTC
git commit: updated refs/heads/4.3 to 894d215
Updated Branches:
refs/heads/4.3 8a623d884 -> 894d215f1
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/894d215f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/894d215f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/894d215f
Branch: refs/heads/4.3
Commit: 894d215f1b64379f22d5ee4e65c39c3ca871738f
Parents: 8a623d8
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:11:07 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/894d215f/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 1303562..9557de6 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/894d215f/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index f069588..a42799f 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/894d215f/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/894d215f/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index de929b3..9cf5fc8 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -569,7 +569,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/894d215f/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4a11930..a52c0d5 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -14481,14 +14481,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
@@ -14496,7 +14496,7 @@
isHidden: true
},
smbDomain: {
- label: 'SMB Domain',
+ label: 'label.smb.domain',
validation: {
required: true
},
@@ -15851,20 +15851,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/894d215f/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index e2f0d8f..b26c8bf 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1746,14 +1746,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
@@ -1761,7 +1761,7 @@
isHidden: true
},
smbDomain: {
- label: 'SMB Domain',
+ label: 'label.smb.domain',
validation: {
required: true
},