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

cloudstack 3.0 new UI - add more localization labels.

This commit is contained in:
Jessica Wang 2012-02-16 13:55:56 -08:00
parent 577f3a5f75
commit e8c309b447
7 changed files with 82 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1093,29 +1093,24 @@ label.vmware.traffic.label=VMware traffic label
label.start.IP=Start IP
label.end.IP=End IP
label.remove.ip.range=Remove IP range
storage.traffic.type.is.updated=Storage traffic type is updated
management.traffic.type.is.updated=Management traffic type is updated
public.traffic.type.is.updated=Public traffic type is updated
guest.traffic.type.is.updated=Guest traffic type is updated
IP.ranges=IP Ranges
start.Vlan=Start Vlan
end.Vlan=End Vlan
broadcast.domain.range=Broadcast domain range
label.ip.ranges=IP Ranges
label.start.vlan=Start Vlan
label.end.vlan=End Vlan
label.broadcast.domain.range=Broadcast domain range
label.compute=Compute
message.add.guest.network=Please confirm that you would like to add a guest network
subdomain.access=Subdomain Access
guest.start.IP=Guest start IP
guest.end.IP=Guest end IP
restart.required=Restart required
virtual.router=Virtual Router
physical.network.ID=Physical network ID
destination.physical.network.ID=Destination physical network ID
DHCP=DHCP
destroy.router=Destroy router
confirm.destroy.router=Please confirm that you would like to destroy this router
change.service.offering=Change service offering
view.console=View console
redundant.state=Redundant state
label.subdomain.access=Subdomain Access
label.guest.start.ip=Guest start IP
label.guest.end.ip=Guest end IP
label.virtual.router=Virtual Router
label.physical.network.ID=Physical network ID
label.destination.physical.network.id=Destination physical network ID
label.dhcp=DHCP
label.destroy.router=Destroy router
message.confirm.destroy.router=Please confirm that you would like to destroy this router
label.change.service.offering=Change service offering
label.view.console=View console
label.redundant.state=Redundant state
enable.provider=Enable provider
confirm.enable.provider=Please confirm that you would like to enable this provider
disable.provider=Disable provider

37
client/WEB-INF/classes/resources/messages_ja.properties
View File

@ -1096,29 +1096,24 @@ label.vmware.traffic.label=VMwareのトラフィックのラベル
label.start.IP=IPアドレスの範囲を起動します。
label.end.IP=終了IPアドレスの範囲
label.remove.ip.range=IPアドレス範囲を削除します。
storage.traffic.type.is.updated=ストレージ·トラフィック·タイプが更新されます。
management.traffic.type.is.updated=管理トラフィックタイプが更新されます。
public.traffic.type.is.updated=公共交通の種類が更新されます。
guest.traffic.type.is.updated=ゲストのトラフィック·タイプが更新されます。
IP.ranges=IP範囲
start.Vlan=スタートVLAN
end.Vlan=エンドVLAN
broadcast.domain.range=ドメインの範囲をブロードキャスト
label.ip.ranges=IP範囲
label.start.vlan=スタートVLAN
label.end.vlan=エンドVLAN
label.broadcast.domain.range=ドメインの範囲をブロードキャスト
label.compute=計算
message.add.guest.network=あなたがゲストネットワークを追加したいことを確認してください
subdomain.access=サブドメインアクセス
guest.start.IP=ゲストの開始IP
guest.end.IP=ゲストの終了IP
restart.required=要な再起動
virtual.router=Virtual Router
physical.network.ID=物理的なネットワークID
destination.physical.network.ID=先の物理的なネットワークID
DHCP=DHCP
destroy.router=ルータを破壊する
confirm.destroy.router=このルータを破壊することを確認してください
change.service.offering=サービス·オファリングを変更する
view.console=コンソールを表示する
redundant.state=冗長状態
label.subdomain.access=サブドメインアクセス
label.guest.start.ip=ゲストの開始IP
label.guest.end.ip=ゲストの終了IP
label.virtual.router=Virtual Router
label.physical.network.ID=物理的なネットワークID
label.destination.physical.network.id=先の物理的なネットワークID
label.dhcp=DHCP
label.destroy.router=ルータを破壊する
message.confirm.destroy.router=このルータを破壊することを確認してください
label.change.service.offering=サービス·オファリングを変更する
label.view.console=コンソールを表示する
label.redundant.state=冗長状態
enable.provider=プロバイダを有効にする
confirm.enable.provider=このプロバイダを有効にしたいことを確認してください
disable.provider=プロバイダを無効にする

37
ui/index.jsp
View File

@ -2668,29 +2668,24 @@ dictionary = {
'label.start.IP': '<fmt:message key="label.start.IP" />',
'label.end.IP': '<fmt:message key="label.end.IP" />',
'label.remove.ip.range': '<fmt:message key="label.remove.ip.range" />',
'storage.traffic.type.is.updated': '<fmt:message key="storage.traffic.type.is.updated" />',
'management.traffic.type.is.updated': '<fmt:message key="management.traffic.type.is.updated" />',
'public.traffic.type.is.updated': '<fmt:message key="public.traffic.type.is.updated" />',
'guest.traffic.type.is.updated': '<fmt:message key="guest.traffic.type.is.updated" />',
'IP.ranges': '<fmt:message key="IP.ranges" />',
'start.Vlan': '<fmt:message key="start.Vlan" />',
'end.Vlan': '<fmt:message key="end.Vlan" />',
'broadcast.domain.range': '<fmt:message key="broadcast.domain.range" />',
'label.ip.ranges': '<fmt:message key="label.ip.ranges" />',
'label.start.vlan': '<fmt:message key="label.start.vlan" />',
'label.end.vlan': '<fmt:message key="label.end.vlan" />',
'label.broadcast.domain.range': '<fmt:message key="label.broadcast.domain.range" />',
'label.compute': '<fmt:message key="label.compute" />',
'message.add.guest.network': '<fmt:message key="message.add.guest.network" />',
'subdomain.access': '<fmt:message key="subdomain.access" />',
'guest.start.IP': '<fmt:message key="guest.start.IP" />',
'guest.end.IP': '<fmt:message key="guest.end.IP" />',
'restart.required': '<fmt:message key="restart.required" />',
'virtual.router': '<fmt:message key="virtual.router" />',
'physical.network.ID': '<fmt:message key="physical.network.ID" />',
'destination.physical.network.ID': '<fmt:message key="destination.physical.network.ID" />',
'DHCP': '<fmt:message key="DHCP" />',
'destroy.router': '<fmt:message key="destroy.router" />',
'confirm.destroy.router': '<fmt:message key="confirm.destroy.router" />',
'change.service.offering': '<fmt:message key="change.service.offering" />',
'view.console': '<fmt:message key="view.console" />',
'redundant.state': '<fmt:message key="redundant.state" />',
'label.subdomain.access': '<fmt:message key="label.subdomain.access" />',
'label.guest.start.ip': '<fmt:message key="label.guest.start.ip" />',
'label.guest.end.ip': '<fmt:message key="label.guest.end.ip" />',
'label.virtual.router': '<fmt:message key="label.virtual.router" />',
'label.physical.network.ID': '<fmt:message key="label.physical.network.ID" />',
'label.destination.physical.network.id': '<fmt:message key="label.destination.physical.network.id" />',
'label.dhcp': '<fmt:message key="label.dhcp" />',
'label.destroy.router': '<fmt:message key="label.destroy.router" />',
'message.confirm.destroy.router': '<fmt:message key="message.confirm.destroy.router" />',
'label.change.service.offering': '<fmt:message key="label.change.service.offering" />',
'label.view.console': '<fmt:message key="label.view.console" />',
'label.redundant.state': '<fmt:message key="label.redundant.state" />',
'enable.provider': '<fmt:message key="enable.provider" />',
'confirm.enable.provider': '<fmt:message key="confirm.enable.provider" />',
'disable.provider': '<fmt:message key="disable.provider" />',

2
ui/scripts/configuration.js
View File

@ -1145,7 +1145,7 @@
// Sanitize names
switch (serviceName) {
case 'Vpn': serviceDisplayName = 'VPN'; break;
case 'Dhcp': serviceDisplayName = 'DHCP'; break;
case 'Dhcp': serviceDisplayName = dictionary['label.dhcp']; break;
case 'Dns': serviceDisplayName = 'DNS'; break;
case 'Lb': serviceDisplayName = 'Load Balancer'; break;
case 'SourceNat': serviceDisplayName = 'Source NAT'; break;

2
ui/scripts/instances.js
View File

@ -1464,7 +1464,7 @@
},
viewConsole: {
label: 'View console',
label: 'label.view.console',
action: {
externalLink: {
url: function(args) {

69
ui/scripts/system.js
View File

@ -239,7 +239,7 @@
},
{
id: 'virtualRouter',
name: 'virtual.router',
name: 'label.virtual.router',
state: nspMap.virtualRouter ? nspMap.virtualRouter.state : 'Disabled'
}
];
@ -293,9 +293,6 @@
updateTrafficLabels(trafficType, args.data, function () {
args.response.success();
});
},
messages: {
notification: 'public.traffic.type.is.updated'
}
}
},
@ -337,7 +334,7 @@
},
ipAddresses: {
title: 'IP.ranges',
title: 'label.ip.ranges',
custom: function(args) {
return $('<div></div>').multiEdit({
context: args.context,
@ -441,9 +438,6 @@
updateTrafficLabels(trafficType, args.data, function () {
args.response.success();
});
},
messages: {
notification: 'storage.traffic.type.is.updated'
}
}
},
@ -483,7 +477,7 @@
},
ipAddresses: {
title: 'IP.ranges',
title: 'label.ip.ranges',
custom: function(args) {
return $('<div></div>').multiEdit({
context: args.context,
@ -598,9 +592,6 @@
updateTrafficLabels(trafficType, args.data, function () {
args.response.success();
});
},
messages: {
notification: 'management.traffic.type.is.updated'
}
}
},
@ -637,7 +628,7 @@
}
},
ipAddresses: { //read-only listView (no actions) filled with pod info (not VlanIpRange info)
title: 'IP.ranges',
title: 'label.ip.ranges',
listView: {
fields: {
name: { label: 'label.pod' }, //pod name
@ -732,14 +723,14 @@
{
state: { label: 'label.state' },
startVlan: {
label: 'start.Vlan',
label: 'label.start.vlan',
isEditable: true
},
endVlan: {
label: 'end.Vlan',
label: 'label.end.vlan',
isEditable: true
},
broadcastdomainrange: { label: 'broadcast.domain.range' }
broadcastdomainrange: { label: 'label.broadcast.domain.range' }
},
{
tags: { label: 'Tags', isEditable: true },
@ -785,7 +776,7 @@
},
ipAddresses: {
title: 'IP.ranges',
title: 'label.ip.ranges',
custom: function(args) {
return $('<div></div>').multiEdit({
context: args.context,
@ -1025,7 +1016,7 @@
args.response.success({data: items});
}
},
subdomainaccess: { label: 'subdomain.access', isBoolean: true, isHidden: true },
subdomainaccess: { label: 'label.subdomain.access', isBoolean: true, isHidden: true },
account: { label: 'label.account' },
projectId: {
@ -1142,8 +1133,8 @@
guestGateway: { label: 'label.guest.gateway' },
guestNetmask: { label: 'label.guest.netmask' },
guestStartIp: { label: 'guest.start.IP' },
guestEndIp: { label: 'guest.end.IP' },
guestStartIp: { label: 'label.guest.start.ip' },
guestEndIp: { label: 'label.guest.end.ip' },
networkdomain: { label: 'label.network.domain' }
}
},
@ -1286,7 +1277,7 @@
name: 'Guest network details',
viewAll: {
path: '_zone.guestIpRanges',
label: 'IP.ranges',
label: 'label.ip.ranges',
preFilter: function(args) {
if(selectedGuestNetworkObj.type == "Isolated") {
var services = selectedGuestNetworkObj.service;
@ -1499,7 +1490,7 @@
label: 'label.state'
},
restartrequired: {
label: 'restart.required',
label: 'label.restart.required',
converter: function(booleanValue) {
if(booleanValue == true)
return "<font color='red'>Yes</font>";
@ -1558,7 +1549,7 @@
domain: { label: 'label.domain' },
subdomainaccess: {
label: 'subdomain.access',
label: 'label.subdomain.access',
converter: function(data) {
return data ? 'Yes' : 'No';
}
@ -1772,7 +1763,7 @@
types: {
virtualRouter: {
id: 'virtualRouterProviders',
label: 'virtual.router',
label: 'label.virtual.router',
isMaximized: true,
type: 'detailView',
fields: {
@ -1790,12 +1781,12 @@
{
id: { label: 'label.id' },
state: { label: 'label.state' },
physicalnetworkid: { label: 'physical.network.ID' },
destinationphysicalnetworkid: { label: 'destination.physical.network.ID' }
physicalnetworkid: { label: 'label.physical.network.ID' },
destinationphysicalnetworkid: { label: 'label.destination.physical.network.id' }
},
{
Vpn: { label: 'VPN' },
Dhcp: { label: 'DHCP' },
Dhcp: { label: 'label.dhcp' },
Dns: { label: 'DNS' },
Gateway: { label: 'label.gateway' },
Firewall: { label: 'Firewall' },
@ -1958,13 +1949,13 @@
},
'destroy': {
label: 'destroy.router',
label: 'label.destroy.router',
messages: {
confirm: function(args) {
return 'confirm.destroy.router';
return 'message.confirm.destroy.router';
},
notification: function(args) {
return 'destroy.router';
return 'label.destroy.router';
}
},
action: function(args) {
@ -1988,9 +1979,9 @@
},
changeService: {
label: 'change.service.offering',
label: 'label.change.service.offering',
createForm: {
title: 'change.service.offering',
title: 'label.change.service.offering',
desc: '',
fields: {
serviceOfferingId: {
@ -2017,7 +2008,7 @@
},
messages: {
notification: function(args) {
return 'change.service.offering';
return 'label.change.service.offering';
}
},
action: function(args) {
@ -2117,7 +2108,7 @@
},
viewConsole: {
label: 'view.console',
label: 'label.view.console',
action: {
externalLink: {
url: function(args) {
@ -2155,7 +2146,7 @@
label: 'label.redundant.router',
converter: cloudStack.converters.toBooleanText
},
redundantRouterState: { label: 'redundant.state' }
redundantRouterState: { label: 'label.redundant.state' }
}
],
dataProvider: function(args) {
@ -2940,7 +2931,7 @@
{
state: { label: 'label.state' },
id: { label: 'label.id' },
physicalnetworkid: { label: 'physical.network.ID' }
physicalnetworkid: { label: 'label.physical.network.ID' }
}
],
dataProvider: function(args) {
@ -3633,7 +3624,7 @@
},
viewConsole: {
label: 'view.console',
label: 'label.view.console',
action: {
externalLink: {
url: function(args) {
@ -6424,8 +6415,8 @@
createForm: {
title: 'label.add.ip.range',
fields: {
guestStartIp: { label: 'guest.start.IP' },
guestEndIp: { label: 'guest.end.IP' }
guestStartIp: { label: 'label.guest.start.ip' },
guestEndIp: { label: 'label.guest.end.ip' }
}
},
action: function(args) {

4
ui/scripts/zoneWizard.js
View File

@ -402,8 +402,8 @@
//Basic (start)
guestGateway: { label: 'label.guest.gateway' },
guestNetmask: { label: 'label.guest.netmask' },
guestStartIp: { label: 'guest.start.IP' },
guestEndIp: { label: 'guest.end.IP' },
guestStartIp: { label: 'label.guest.start.ip' },
guestEndIp: { label: 'label.guest.end.ip' },
//Basic (end)
//Advanced (start)