Fix erroneous instances of printf into sprintf in AssetExportHtml.pm.
Remove extraneous error text from some internationalization files.
This commit is contained in:
parent
86a5cb9128
commit
8ffc2f57c2
3 changed files with 6 additions and 10 deletions
|
|
@ -227,7 +227,7 @@ sub www_exportGenerate {
|
||||||
$newSession->user({userId=>$userId});
|
$newSession->user({userId=>$userId});
|
||||||
foreach my $asset (@{$assets}) {
|
foreach my $asset (@{$assets}) {
|
||||||
my $url = $asset->get("url");
|
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)) {
|
unless ($asset->canView($userId)) {
|
||||||
$self->session->output->print ($i18n->get('bad user privileges')."\n");
|
$self->session->output->print ($i18n->get('bad user privileges')."\n");
|
||||||
next;
|
next;
|
||||||
|
|
@ -250,14 +250,14 @@ sub www_exportGenerate {
|
||||||
$path = $self->session->config->get("exportPath") . "/" . $path;
|
$path = $self->session->config->get("exportPath") . "/" . $path;
|
||||||
eval { mkpath($path) };
|
eval { mkpath($path) };
|
||||||
if($@) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$path .= "/".$filename;
|
$path .= "/".$filename;
|
||||||
my $file = eval { FileHandle->new(">".$path) or die "$!" };
|
my $file = eval { FileHandle->new(">".$path) or die "$!" };
|
||||||
if ($@) {
|
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;
|
return;
|
||||||
} else {
|
} else {
|
||||||
$newSession->output->setHandle($file);
|
$newSession->output->setHandle($file);
|
||||||
|
|
@ -271,7 +271,7 @@ sub www_exportGenerate {
|
||||||
}
|
}
|
||||||
$newSession->var->end;
|
$newSession->var->end;
|
||||||
$newSession->close;
|
$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('<a target="_parent" href="'.$self->getUrl.'">'.$i18n->get(493,'WebGUI').'</a>');
|
$self->session->output->print('<a target="_parent" href="'.$self->getUrl.'">'.$i18n->get(493,'WebGUI').'</a>');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -456,9 +456,7 @@ below to see which template variables may be used inside this loop.|,
|
||||||
},
|
},
|
||||||
|
|
||||||
'tab.field.form' => {
|
'tab.field.form' => {
|
||||||
message => q|The form element for this Use of uninitialized value in exists at varify.pl line 61, <> chunk 64.
|
message => q|The form element for this field.|,
|
||||||
Use of uninitialized value in printf at varify.pl line 62, <> chunk 64.
|
|
||||||
field.|,
|
|
||||||
lastUpdated => 1149392054,
|
lastUpdated => 1149392054,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1270,9 +1270,7 @@ not using the complete <b>searchForm</b>.|,
|
||||||
'searchFormJavascript' => {
|
'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
|
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 <b>searchForm</b> you must include this variable
|
not using the complete <b>searchForm</b> you must include this variable
|
||||||
for adUse of uninitialized value in exists at varify.pl line 62, <> chunk 26.
|
for advanced search. If you do use the complete <b>searchForm</b>
|
||||||
Use of uninitialized value in printf at varify.pl line 63, <> chunk 26.
|
|
||||||
vanced search. If you do use the complete <b>searchForm</b>
|
|
||||||
variable, however, you must not use the <b>searchFormJavascript</b> variable.|,
|
variable, however, you must not use the <b>searchFormJavascript</b> variable.|,
|
||||||
lastUpdated => 1149822982,
|
lastUpdated => 1149822982,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue