CLOUDSTACK-8188: missing labe:label.password.reset.confirm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c70d11b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c70d11b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c70d11b Branch: refs/heads/hotfix/scp-exception Commit: 0c70d11bc357397f1f00c887ad8e7d4f1c504831 Parents: 39dce59 Author: Pierre-Luc Dion <pdion...@apache.org> Authored: Thu Feb 19 22:12:32 2015 -0500 Committer: Pierre-Luc Dion <pdion...@apache.org> Committed: Thu Feb 19 22:37:12 2015 -0500 ---------------------------------------------------------------------- client/WEB-INF/classes/resources/messages.properties | 2 +- ui/dictionary2.jsp | 2 +- ui/scripts/instances.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c70d11b/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 6d47ac0..ddf69b6 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -1509,7 +1509,7 @@ label.health.check=Health Check label.public.load.balancer.provider=Public Load Balancer Provider label.add.isolated.network=Add Isolated Network label.add.isolated.guest.network=Add Isolated Guest Network -label.vlan=VLAN +label.vlan.only=VLAN label.secondary.isolated.vlan.id=Secondary Isolated VLAN ID label.ipv4.netmask=IPv4 Netmask label.custom=Custom http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c70d11b/ui/dictionary2.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp index 1b2089c..9e58ee8 100644 --- a/ui/dictionary2.jsp +++ b/ui/dictionary2.jsp @@ -214,6 +214,7 @@ under the License. 'label.virtual.routers': '<fmt:message key="label.virtual.routers" />', 'label.vlan': '<fmt:message key="label.vlan" />', 'label.vlan.id': '<fmt:message key="label.vlan.id" />', +'label.vlan.only': '<fmt:message key="label.vlan.only" />', 'label.vlan.range': '<fmt:message key="label.vlan.range" />', 'label.vxlan': '<fmt:message key="label.vxlan" />', 'label.vxlan.id': '<fmt:message key="label.vxlan.id" />', @@ -975,7 +976,6 @@ under the License. 'label.ipv4.dns2': '<fmt:message key="label.ipv4.dns2" />', 'label.ipv6.dns1': '<fmt:message key="label.ipv6.dns1" />', 'label.ipv6.dns2': '<fmt:message key="label.ipv6.dns2" />', -'label.vlan.id': '<fmt:message key="label.vlan.id" />', 'label.protocol.number': '<fmt:message key="label.protocol.number" />', 'label.edit.acl.rule': '<fmt:message key="label.edit.acl.rule" />', 'label.source.ip.address': '<fmt:message key="label.source.ip.address" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c70d11b/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 9ed0e16..6bba213 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -748,7 +748,7 @@ }, complete: function(args) { if (args.password != null && args.password.length > 0) - return 'label.password.reset.confirm' + args.password; + return _l('label.password.reset.confirm') + args.password; else return null; }
