From c3989308fac467f59be94849143d463d5d1d61af Mon Sep 17 00:00:00 2001 From: khenn Date: Tue, 10 Aug 2010 20:42:58 -0500 Subject: [PATCH] Fixed international problem in JavaScript file --- lib/WebGUI/Form/AssetReportQuery.pm | 9 +++++---- lib/WebGUI/i18n/English/Form_AssetReportQuery.pm | 5 +++++ www/extras/yui-webgui/build/form/assetReportQuery.js | 5 ++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/WebGUI/Form/AssetReportQuery.pm b/lib/WebGUI/Form/AssetReportQuery.pm index 3730d7118..28c2ee018 100644 --- a/lib/WebGUI/Form/AssetReportQuery.pm +++ b/lib/WebGUI/Form/AssetReportQuery.pm @@ -240,11 +240,12 @@ sub toHtml { $json->{$class} = \%fields; } - #Encode the JSON and add it to the end of the body - my $jsonStr = JSON->new->encode($json); + #Encode the JSON and add it to the end of the body + my $first_row_error_msg = $i18n->get("first_row_error_msg"); + my $jsonStr = JSON->new->encode($json); $style->setRawHeadTags(qq||); - my $jsonData = $self->get("value") || q|{ "isNew" : "true" }|; - $style->setRawHeadTags(qq||); + my $jsonData = $self->get("value") || q|{ "isNew" : "true" }|; + $style->setRawHeadTags(qq||); $session->style->setScript($session->url->extras("yui-webgui/build/form/assetReportQuery.js"),{ type=>"text/javascript" }); #Decode JSON data for filling in some of the fields diff --git a/lib/WebGUI/i18n/English/Form_AssetReportQuery.pm b/lib/WebGUI/i18n/English/Form_AssetReportQuery.pm index 3f4886d61..9dafc8f86 100644 --- a/lib/WebGUI/i18n/English/Form_AssetReportQuery.pm +++ b/lib/WebGUI/i18n/English/Form_AssetReportQuery.pm @@ -98,6 +98,11 @@ our $I18N = { context => q{General item in asset select list}, }, + 'first_row_error_msg' => { + message => q|The first row may not be deleted. Please adjust your query appropriately|, + lastUpdated => 1078852836, + context => q{Error message in javascript}, + }, }; 1; diff --git a/www/extras/yui-webgui/build/form/assetReportQuery.js b/www/extras/yui-webgui/build/form/assetReportQuery.js index 01179abdb..98060bf9a 100644 --- a/www/extras/yui-webgui/build/form/assetReportQuery.js +++ b/www/extras/yui-webgui/build/form/assetReportQuery.js @@ -110,7 +110,7 @@ function deleteRow(row,ttbody) { ttbody.removeChild(row); return; } - alert("The first row may not be deleted. Please adjust your query appropriately"); + alert(first_row_error_msg); return; } @@ -359,5 +359,8 @@ YAHOO.util.Event.onDOMReady( function () { loadClasses(document.getElementById("className_formId")); loadWhereRows(document.getElementById("whereBody")); loadOrder(document.getElementById("orderBody")); +}; + + });