etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8188: missing labe:label.password.reset.confirm. removed duplicate label.vlan.id from dictionary2.jsp removed duplicate label.vlan from message.properties

This commit is contained in:
Pierre-Luc Dion 2015-02-19 22:12:32 -05:00
parent 34c75f296b
commit 177c190367
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/WEB-INF/classes/resources/messages.properties
View File

@ -1504,7 +1504,7 @@ label.autoscale=AutoScale
label.health.check=Health Check
label.public.load.balancer.provider=Public Load Balancer Provider
label.add.isolated.network=Add Isolated 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

2
ui/dictionary2.jsp
View File

@ -213,6 +213,7 @@ $.extend(dictionary, {
'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" />',
@ -974,7 +975,6 @@ $.extend(dictionary, {
'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" />',

2
ui/scripts/instances.js
View File

@ -717,7 +717,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;
}