From 68f12d97535f295a704da7b668d1a8bf14a54a77 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 16 Feb 2012 11:23:04 -0800 Subject: [PATCH] cloudstack 3.0 new UI - localize messages during zone creation. --- .../classes/resources/messages.properties | 10 +++++-- .../classes/resources/messages_ja.properties | 8 +++++- ui/index.jsp | 9 +++++- ui/scripts/ui-custom/zoneWizard.js | 14 +++++----- ui/scripts/zoneWizard.js | 28 +++++++++---------- 5 files changed, 43 insertions(+), 26 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 6ac2806a4d2..f159d8b33a1 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -1187,9 +1187,13 @@ adding.host=Adding host creating.primary.storage=Creating primary storage creating.secondary.storage=Creating secondary storage Zone.creation.complete=Zone creation complete - - - +message.enabling.zone=Enabling zone +error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following +error.could.not.enable.zone=Could not enable zone +message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation complete. Would you like to enable this zone? +message.please.add.at.lease.one.traffic.range=Please add at lease one traffic range. +message.you.must.have.at.least.one.physical.network=You must have at least one physical network +message.please.select.a.different.public.and.management.network.before.removing=Please select a different public and management network before removing diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 4b4bd555f76..cbce3652b23 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -1190,4 +1190,10 @@ adding.host=ホストを追加する creating.primary.storage=プライマリ·ストレージを作成する creating.secondary.storage=セカンダリ·ストレージを作成する Zone.creation.complete=完全なゾーンの作成 - +message.enabling.zone=Enabling zone +error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following +error.could.not.enable.zone=Could not enable zone +message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation complete. Would you like to enable this zone? +message.please.add.at.lease.one.traffic.range=Please add at lease one traffic range. +message.you.must.have.at.least.one.physical.network=You must have at least one physical network +message.please.select.a.different.public.and.management.network.before.removing=Please select a different public and management network before removing diff --git a/ui/index.jsp b/ui/index.jsp index 72fa6bb442b..7a7cd4fe528 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -2761,6 +2761,13 @@ dictionary = { 'adding.host': '', 'creating.primary.storage': '', 'creating.secondary.storage': '', -'Zone.creation.complete': '' +'Zone.creation.complete': '', +'message.enabling.zone': '', +'error.something.went.wrong.please.correct.the.following': '', +'error.could.not.enable.zone': '', +'message.zone.creation.complete.would.you.like.to.enable.this.zone': '', +'message.please.add.at.lease.one.traffic.range': '', +'message.you.must.have.at.least.one.physical.network': '', +'message.please.select.a.different.public.and.management.network.before.removing': '' }; diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js index 27a5386a267..eddec69c335 100644 --- a/ui/scripts/ui-custom/zoneWizard.js +++ b/ui/scripts/ui-custom/zoneWizard.js @@ -135,7 +135,7 @@ } cloudStack.dialog.notice({ - message: 'Please add at lease one traffic range.' + message: dictionary['message.please.add.at.lease.one.traffic.range'] }); return false; } @@ -497,11 +497,11 @@ if (!$item.siblings().size()) { cloudStack.dialog.notice({ - message: 'You must have at least 1 physical network' + message: dictionary['message.you.must.have.at.least.one.physical.network'] }); } else if ($item.find('input[type=radio]:checked').size()) { cloudStack.dialog.notice({ - message: 'Please select a different public and/or management network before removing' + message: dictionary['message.please.select.a.different.public.and.management.network.before.removing'] }); } else { // Put any traffic type symbols back in original container @@ -709,7 +709,7 @@ }; var enableZone = function() { - makeMessage('Enabling zone'); + makeMessage(dictionary['message.enabling.zone']); enableZoneAction({ formData: data, @@ -721,14 +721,14 @@ }, error: function(message) { - cloudStack.dialog.notice({ message: 'Could not enable zone:
' + message }); + cloudStack.dialog.notice({ message: dictionary['error.could.not.enable.zone'] + ':
' + message }); } } }); }; cloudStack.dialog.confirm({ - message: 'Zone creation complete. Would you like to enable this zone?', + message: dictionary['message.zone.creation.complete.would.you.like.to.enable.this.zone'], action: function() { enableZone(); }, @@ -750,7 +750,7 @@ .removeClass('final') .html('Fix errors') .click(goNextOverride); - makeMessage('Something went wrong; please correct the following:
' + message, true); + makeMessage(dictionary['error.something.went.wrong.please.correct.the.following'] + ':
' + message, true); $wizard.data('startfn', start); }, message: makeMessage diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 98fc3838a8f..ee37632b02b 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -946,8 +946,8 @@ var data = args.data; var stepFns = { - addZone: function() { - message('creating.zone'); + addZone: function() { + message(dictionary['creating.zone']); var array1 = []; var networkType = args.data.zone.networkType; //"Basic", "Advanced" @@ -996,7 +996,7 @@ }, addPhysicalNetworks: function(args) { - message('creating.physical.networks'); + message(dictionary['creating.physical.networks']); var returnedPhysicalNetworks = []; @@ -1279,7 +1279,7 @@ //afterCreateZonePhysicalNetworkTrafficTypes: enable physical network, enable virtual router element, enable network service provider configurePhysicalNetwork: function(args) { - message('configuring.physical.networks'); + message(dictionary['configuring.physical.networks']); if(args.data.zone.networkType == "Basic") { $.ajax({ @@ -1707,7 +1707,7 @@ }, addNetscalerDevice: function(args) { - message('adding.Netscaler.device'); + message(dictionary['adding.Netscaler.device']); var array1 = []; array1.push("&physicalnetworkid=" + args.data.returnedBasicPhysicalNetwork.id); @@ -1888,7 +1888,7 @@ }, addPod: function(args) { - message('creating.pod'); + message(dictionary['creating.pod']); var array3 = []; array3.push("&zoneId=" + args.data.returnedZone.id); @@ -1923,7 +1923,7 @@ if((args.data.zone.networkType == "Basic" && (selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true)) ||(args.data.zone.networkType == "Advanced")) { - message('configuring.public.traffic'); + message(dictionary['configuring.public.traffic']); var stopNow = false; @@ -2009,7 +2009,7 @@ return complete({}); } - message('configuring.storage.traffic'); + message(dictionary['configuring.storage.traffic']); var storageIPRanges = args.data.storageTraffic; var tasks = []; @@ -2088,7 +2088,7 @@ }, configureGuestTraffic: function(args) { - message('configuring.guest.traffic'); + message(dictionary['configuring.guest.traffic']); if(args.data.returnedZone.networktype == "Basic") { //create an VlanIpRange for guest network in basic zone var array1 = []; @@ -2191,7 +2191,7 @@ }, addCluster: function(args) { - message('creating.cluster'); + message(dictionary['creating.cluster']); var array1 = []; array1.push("&zoneId=" + args.data.returnedZone.id); @@ -2255,7 +2255,7 @@ }, addHost: function(args) { - message('adding.host'); + message(dictionary['adding.host']); var array1 = []; array1.push("&zoneid=" + args.data.returnedZone.id); @@ -2328,7 +2328,7 @@ return; } - message('creating.primary.storage'); + message(dictionary['creating.primary.storage']); var array1 = []; array1.push("&zoneid=" + args.data.returnedZone.id); @@ -2418,7 +2418,7 @@ }, addSecondaryStorage: function(args) { - message('creating.secondary.storage'); + message(dictionary['creating.secondary.storage']); var nfs_server = args.data.secondaryStorage.nfsServer; var path = args.data.secondaryStorage.path; @@ -2443,7 +2443,7 @@ }; var complete = function(args) { - message('Zone.creation.complete'); + message(dictionary['Zone.creation.complete']); success(args); };