You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/12/01 10:34:25 UTC
[1/2] git commit: updated refs/heads/master to 41b0139
Repository: cloudstack
Updated Branches:
refs/heads/master d31b58fe9 -> 41b0139e7
CLOUDSTACK-9092: L10n fix in "Add LDAP Account page"
fixed two strings on the "Add LDAP Account page"
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6af6adb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6af6adb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6af6adb
Branch: refs/heads/master
Commit: d6af6adbad707ab378098decca47d8f5e4012872
Parents: 7e64c12
Author: Rajani Karuturi <ra...@citrix.com>
Authored: Mon Nov 30 11:21:17 2015 +0530
Committer: Rajani Karuturi <ra...@citrix.com>
Committed: Mon Nov 30 11:21:17 2015 +0530
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 1 +
ui/dictionary2.jsp | 3 ++-
ui/scripts/ui-custom/accountsWizard.js | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6af6adb/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 d3cc4d0..957fae5 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -2214,3 +2214,4 @@ message.removed.ssh.key.pair=Removed a SSH Key Pair
message.please.select.ssh.key.pair.use.with.this.vm=Please select a ssh key pair you want this VM to use:
message.configure.firewall.rules.allow.traffic=Configure the rules to allow Traffic
message.configure.firewall.rules.block.traffic=Configure the rules to block Traffic
+message.ldap.group.import=All The users from the given group name will be imported
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6af6adb/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index d2bb683..984a03a 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1122,6 +1122,7 @@ under the License.
'label.ssh.key.pairs': '<fmt:message key="label.ssh.key.pairs" />',
'message.desc.create.ssh.key.pair': '<fmt:message key="message.desc.create.ssh.key.pair" />',
'message.removed.ssh.key.pair': '<fmt:message key="message.removed.ssh.key.pair" />',
-'message.please.select.ssh.key.pair.use.with.this.vm': '<fmt:message key="message.please.select.ssh.key.pair.use.with.this.vm" />'
+'message.please.select.ssh.key.pair.use.with.this.vm': '<fmt:message key="message.please.select.ssh.key.pair.use.with.this.vm" />',
+'message.ldap.group.import': '<fmt:message key="message.ldap.group.import" />'
});
</script>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6af6adb/ui/scripts/ui-custom/accountsWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/accountsWizard.js b/ui/scripts/ui-custom/accountsWizard.js
index 9349234..c9e1e45 100644
--- a/ui/scripts/ui-custom/accountsWizard.js
+++ b/ui/scripts/ui-custom/accountsWizard.js
@@ -114,7 +114,7 @@
var $table = $wizard.find('.ldap-account-choice tbody');
$("#label_ldap_group_name").live("keypress", function(event) {
if ($table.find("#tr-groupname-message").length === 0) {
- $("<tr id='tr-groupname-message'>").appendTo($table).append("<td colspan=\"4\">All The users from the given group name will be imported</td>");
+ $("<tr id='tr-groupname-message'>").appendTo($table).append("<td colspan=\"4\">"+_l('message.ldap.group.import')+"</td>");
}
$table.find("tr").hide();
$table.find("#tr-groupname-message").show();
@@ -323,7 +323,7 @@
}
return $wizard.dialog({
- title: ldapStatus ? _l('Add LDAP Account') : _l('label.add.account'),
+ title: ldapStatus ? _l('label.add.LDAP.account') : _l('label.add.account'),
width: ldapStatus ? 800 : 330,
height: ldapStatus ? 500 : 500,
closeOnEscape: false,
[2/2] git commit: updated refs/heads/master to 41b0139
Posted by bh...@apache.org.
Merge pull request #1139 from karuturi/CLOUDSTACK-9092
CLOUDSTACK-9092: L10n fix in "Add LDAP Account page"fixed two strings on the "Add LDAP Account page"
After the change: (with a test string in messages_ja_JP.properties file)
* pr/1139:
CLOUDSTACK-9092: L10n fix in "Add LDAP Account page"
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/41b0139e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/41b0139e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/41b0139e
Branch: refs/heads/master
Commit: 41b0139e7afc0869bc8f9835511bf96e350e5341
Parents: d31b58f d6af6ad
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Dec 1 15:03:18 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Dec 1 15:03:18 2015 +0530
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 1 +
ui/dictionary2.jsp | 3 ++-
ui/scripts/ui-custom/accountsWizard.js | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------