From 8ffc2f57c2728f3fdff0b0c36fc79c6fcabc0f00 Mon Sep 17 00:00:00 2001 From: Drake Date: Mon, 25 Sep 2006 19:11:05 +0000 Subject: [PATCH] Fix erroneous instances of printf into sprintf in AssetExportHtml.pm. Remove extraneous error text from some internationalization files. --- lib/WebGUI/AssetExportHtml.pm | 8 ++++---- lib/WebGUI/i18n/English/Asset_DataForm.pm | 4 +--- lib/WebGUI/i18n/English/Asset_SQLForm.pm | 4 +--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm index 6106e6c02..6150406b3 100644 --- a/lib/WebGUI/AssetExportHtml.pm +++ b/lib/WebGUI/AssetExportHtml.pm @@ -227,7 +227,7 @@ sub www_exportGenerate { $newSession->user({userId=>$userId}); foreach my $asset (@{$assets}) { my $url = $asset->get("url"); - $self->session->output->print ( printf($i18n->get('exporting page')), $url); + $self->session->output->print ( sprintf($i18n->get('exporting page')), $url); unless ($asset->canView($userId)) { $self->session->output->print ($i18n->get('bad user privileges')."\n"); next; @@ -250,14 +250,14 @@ sub www_exportGenerate { $path = $self->session->config->get("exportPath") . "/" . $path; eval { mkpath($path) }; if($@) { - $self->session->output->print(printf($i18n->get('could not create path'), $path, $@), 1); + $self->session->output->print(sprintf($i18n->get('could not create path'), $path, $@), 1); return; } } $path .= "/".$filename; my $file = eval { FileHandle->new(">".$path) or die "$!" }; if ($@) { - $self->session->output->print(printf($i18n->get('could not open path'), $path, $@),1); + $self->session->output->print(sprintf($i18n->get('could not open path'), $path, $@),1); return; } else { $newSession->output->setHandle($file); @@ -271,7 +271,7 @@ sub www_exportGenerate { } $newSession->var->end; $newSession->close; - $self->session->output->print(printf($i18n->get('export information'), scalar(@{$assets}), ($self->session->datetime->time()-$startTime)),1); + $self->session->output->print(sprintf($i18n->get('export information'), scalar(@{$assets}), ($self->session->datetime->time()-$startTime)),1); $self->session->output->print(''.$i18n->get(493,'WebGUI').''); return; } diff --git a/lib/WebGUI/i18n/English/Asset_DataForm.pm b/lib/WebGUI/i18n/English/Asset_DataForm.pm index f3115da3c..f203f2220 100644 --- a/lib/WebGUI/i18n/English/Asset_DataForm.pm +++ b/lib/WebGUI/i18n/English/Asset_DataForm.pm @@ -456,9 +456,7 @@ below to see which template variables may be used inside this loop.|, }, 'tab.field.form' => { - message => q|The form element for this Use of uninitialized value in exists at varify.pl line 61, <> chunk 64. -Use of uninitialized value in printf at varify.pl line 62, <> chunk 64. -field.|, + message => q|The form element for this field.|, lastUpdated => 1149392054, }, diff --git a/lib/WebGUI/i18n/English/Asset_SQLForm.pm b/lib/WebGUI/i18n/English/Asset_SQLForm.pm index 61c73a4f0..19c20a047 100644 --- a/lib/WebGUI/i18n/English/Asset_SQLForm.pm +++ b/lib/WebGUI/i18n/English/Asset_SQLForm.pm @@ -1270,9 +1270,7 @@ not using the complete searchForm.|, 'searchFormJavascript' => { message => q|Only used for advanced search. This links the SQLFormSearch.js file and contains some inline javascript that is used by advanced search. If you are not using the complete searchForm you must include this variable -for adUse of uninitialized value in exists at varify.pl line 62, <> chunk 26. -Use of uninitialized value in printf at varify.pl line 63, <> chunk 26. -vanced search. If you do use the complete searchForm +for advanced search. If you do use the complete searchForm variable, however, you must not use the searchFormJavascript variable.|, lastUpdated => 1149822982, },