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 committed by Salvatore Orlando
parent 238cf2324a
commit fde53959bf
5 changed files with 196 additions and 45 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

@ -2477,29 +2477,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

@ -1619,29 +1619,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=プロバイダを無効にする

30
ui/index.jsp
View File

@ -2898,10 +2898,14 @@ dictionary = {
'label.end.IP': '<fmt:message key="label.end.IP" />',
'label.remove.ip.range': '<fmt:message key="label.remove.ip.range" />',
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
'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" />',
<<<<<<< HEAD
=======
'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" />',
@ -2912,6 +2916,8 @@ dictionary = {
'end.Vlan': '<fmt:message key="end.Vlan" />',
'broadcast.domain.range': '<fmt:message key="broadcast.domain.range" />',
>>>>>>> 577f3a5... cloudstack 3.0 new UI - correct localization label format
=======
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
'label.compute': '<fmt:message key="label.compute" />',
'message.add.guest.network': '<fmt:message key="message.add.guest.network" />',
'label.subdomain.access': '<fmt:message key="label.subdomain.access" />',
@ -2926,6 +2932,7 @@ dictionary = {
'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" />',
<<<<<<< HEAD
'label.enable.provider': '<fmt:message key="label.enable.provider" />',
'message.confirm.enable.provider': '<fmt:message key="message.confirm.enable.provider" />',
'label.disable.provider': '<fmt:message key="label.disable.provider" />',
@ -2945,6 +2952,29 @@ dictionary = {
'label.public.network': '<fmt:message key="label.public.network" />',
'label.private.network': '<fmt:message key="label.private.network" />',
'label.enable.swift': '<fmt:message key="label.enable.swift" />',
=======
'enable.provider': '<fmt:message key="enable.provider" />',
'confirm.enable.provider': '<fmt:message key="confirm.enable.provider" />',
'disable.provider': '<fmt:message key="disable.provider" />',
'confirm.disable.provider': '<fmt:message key="confirm.disable.provider" />',
'shutdown.provider': '<fmt:message key="shutdown.provider" />',
'confirm.shutdown.provider': '<fmt:message key="confirm.shutdown.provider" />',
'NetScaler': '<fmt:message key="NetScaler" />',
'add.new.NetScaler': '<fmt:message key="add.new.NetScaler" />',
'number.of.retries': '<fmt:message key="number.of.retries" />',
'capacity': '<fmt:message key="capacity" />',
'dedicated': '<fmt:message key="dedicated" />',
'F5': '<fmt:message key="F5" />',
'add.new.F5': '<fmt:message key="add.new.F5" />',
'SRX': '<fmt:message key="SRX" />',
'providers': '<fmt:message key="providers" />',
'add.new.SRX': '<fmt:message key="add.new.SRX" />',
'timeout': '<fmt:message key="timeout" />',
'public.network': '<fmt:message key="public.network" />',
'private.network': '<fmt:message key="private.network" />',
'public': '<fmt:message key="public" />',
'enable.swift': '<fmt:message key="enable.swift" />',
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
'confirm.enable.swift': '<fmt:message key="confirm.enable.swift" />',
'message.after.enable.swift': '<fmt:message key="message.after.enable.swift" />',
'label.key': '<fmt:message key="label.key" />',

134
ui/scripts/system.js
View File

@ -368,7 +368,7 @@
},
{
id: 'virtualRouter',
name: 'virtual.router',
name: 'label.virtual.router',
state: nspMap.virtualRouter ? nspMap.virtualRouter.state : 'Disabled'
}
];
@ -423,7 +423,10 @@
updateTrafficLabels(trafficType, args.data, function () {
args.response.success();
});
<<<<<<< HEAD
=======
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
}
}
},
@ -465,7 +468,10 @@
},
ipAddresses: {
<<<<<<< HEAD
=======
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
title: 'label.ip.ranges',
custom: function(args) {
return $('<div></div>').multiEdit({
@ -638,7 +644,10 @@
},
ipAddresses: {
<<<<<<< HEAD
=======
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
title: 'label.ip.ranges',
custom: function(args) {
return $('<div></div>').multiEdit({
@ -793,8 +802,12 @@
}
},
ipAddresses: { //read-only listView (no actions) filled with pod info (not VlanIpRange info)
<<<<<<< HEAD
title: 'label.ip.ranges',
=======
title: 'label.ip.ranges',
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
listView: {
fields: {
name: { label: 'label.pod' }, //pod name
@ -891,7 +904,10 @@
{ //updatePhysicalNetwork API
state: { label: 'label.state' },
startVlan: {
<<<<<<< HEAD
=======
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
label: 'label.start.vlan',
isEditable: true
},
@ -899,8 +915,12 @@
label: 'label.end.vlan',
isEditable: true
},
<<<<<<< HEAD
tags: { label: 'Tags', isEditable: true },
broadcastdomainrange: { label: 'label.broadcast.domain.range' }
=======
broadcastdomainrange: { label: 'label.broadcast.domain.range' }
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
},
<<<<<<< HEAD
{ //updateTrafficType API
@ -1206,7 +1226,10 @@
args.response.success({data: items});
}
},
<<<<<<< HEAD
=======
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
subdomainaccess: { label: 'label.subdomain.access', isBoolean: true, isHidden: true },
account: { label: 'label.account' },
@ -1499,11 +1522,19 @@
detailView: {
name: 'Guest network details',
<<<<<<< HEAD
viewAll: {
path: '_zone.guestIpRanges',
label: 'label.ip.ranges',
preFilter: function(args) {
if(selectedGuestNetworkObj.type == "Isolated") {
=======
viewAll: {
path: '_zone.guestIpRanges',
label: 'label.ip.ranges',
preFilter: function(args) {
if(selectedGuestNetworkObj.type == "Isolated") {
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
var services = selectedGuestNetworkObj.service;
if(services != null) {
for(var i=0; i < services.length; i++) {
@ -1791,8 +1822,13 @@
},
domain: { label: 'label.domain' },
<<<<<<< HEAD
subdomainaccess: {
label: 'label.subdomain.access',
=======
subdomainaccess: {
label: 'label.subdomain.access',
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
converter: function(data) {
return data ? 'Yes' : 'No';
}
@ -1954,9 +1990,25 @@
id: { label: 'label.id' },
state: { label: 'label.state' },
physicalnetworkid: { label: 'label.physical.network.ID' },
<<<<<<< HEAD
destinationphysicalnetworkid: { label: 'label.destination.physical.network.id' },
supportedServices: { label: 'label.supported.services' }
=======
destinationphysicalnetworkid: { label: 'label.destination.physical.network.id' }
},
{
Vpn: { label: 'VPN' },
Dhcp: { label: 'label.dhcp' },
Dns: { label: 'DNS' },
Gateway: { label: 'label.gateway' },
Firewall: { label: 'Firewall' },
Lb: { label: 'Load Balancer' },
UserData: { label: 'UserData' },
SourceNat: { label: 'Source NAT' },
StaticNat: { label: 'Static NAT' },
PortForwarding: { label: 'Port Forwarding' }
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
}
],
dataProvider: function(args) {
@ -2127,9 +2179,15 @@
notification: {
poll: pollAsyncJobResult
}
<<<<<<< HEAD
},
'remove': {
=======
},
'destroy': {
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
label: 'label.destroy.router',
messages: {
confirm: function(args) {
@ -2161,7 +2219,11 @@
/*
changeService: {
<<<<<<< HEAD
label: 'label.change.service.offering',
=======
label: 'label.change.service.offering',
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
createForm: {
title: 'label.change.service.offering',
desc: '',
@ -3164,7 +3226,13 @@
name: { label: 'label.name' }
},
{
<<<<<<< HEAD
state: { label: 'label.state' }
=======
state: { label: 'label.state' },
id: { label: 'label.id' },
physicalnetworkid: { label: 'label.physical.network.ID' }
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
}
],
dataProvider: function(args) {
@ -5001,8 +5069,68 @@
}
});
},
<<<<<<< HEAD
getActionFilter: function() {
return systemvmActionfilter;
=======
notification: {
poll: pollAsyncJobResult
}
},
viewConsole: {
label: 'label.view.console',
action: {
externalLink: {
url: function(args) {
return clientConsoleUrl + '?cmd=access&vm=' + args.context.systemVMs[0].id;
},
title: function(args) {
return args.context.systemVMs[0].id.substr(0,8); //title in window.open() can't have space nor longer than 8 characters. Otherwise, IE browser will have error.
},
width: 820,
height: 640
}
}
}
},
tabs: {
details: {
title: 'label.details',
fields: [
{
name: { label: 'label.name' }
},
{
id: { label: 'label.id' },
state: { label: 'label.state' },
systemvmtype: {
label: 'label.type',
converter: function(args) {
if(args == "consoleproxy")
return "Console Proxy VM";
else if(args == "secondarystoragevm")
return "Secondary Storage VM";
else
return args;
}
},
zonename: { label: 'label.zone' },
publicip: { label: 'label.public.ip' },
privateip: { label: 'label.private.ip' },
linklocalip: { label: 'label.linklocal.ip' },
hostname: { label: 'label.host' },
gateway: { label: 'label.gateway' },
created: { label: 'label.created', converter: cloudStack.converters.toLocalDate },
activeviewersessions: { label: 'label.active.sessions' }
}
],
dataProvider: function(args) {
args.response.success({
actionFilter: systemvmActionfilter,
data: args.jsonObj
});
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
}
}
});
@ -8431,8 +8559,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) {

3
ui/scripts/zoneWizard.js
View File

@ -823,12 +823,15 @@
guestNetmask: { label: 'label.guest.netmask' },
guestStartIp: { label: 'label.guest.start.ip' },
guestEndIp: { label: 'label.guest.end.ip' },
<<<<<<< HEAD
=======
guestGateway: { label: 'Guest gateway' },
guestNetmask: { label: 'Guest netmask' },
guestStartIp: { label: 'Guest start IP' },
guestEndIp: { label: 'Guest end IP' },
>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
=======
>>>>>>> e8c309b... cloudstack 3.0 new UI - add more localization labels.
//Basic (end)
//Advanced (start)