From 20a36e272e57f20e255440a92d2e5696beec101f Mon Sep 17 00:00:00 2001
From: Colin Kuskie
Date: Sun, 16 Oct 2005 04:21:31 +0000
Subject: [PATCH] internationalize Asset export report
---
lib/WebGUI/AssetExportHtml.pm | 11 +++++------
lib/WebGUI/i18n/English/Asset.pm | 25 +++++++++++++++++++++++--
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm
index 08b3ce31d..dbb4f8806 100644
--- a/lib/WebGUI/AssetExportHtml.pm
+++ b/lib/WebGUI/AssetExportHtml.pm
@@ -230,9 +230,9 @@ sub www_exportGenerate {
my $assets = $self->getLineage(["self","descendants"],{returnObjects=>1,endingLineageLength=>$self->getLineageLength+$session{form}{depth}});
foreach my $asset (@{$assets}) {
my $url = $asset->get("url");
- print WebGUI::International::get('exporting page', 'Asset').' '.$url."......";
+ printf WebGUI::International::get('exporting page', 'Asset'), $url;
unless ($asset->canView($userId)) {
- print WebGUI::International::get('bad user privileges', 'Asset')."
\n";
+ print WebGUI::International::get('bad user privileges', 'Asset')."\n";
next;
}
my $path;
@@ -253,15 +253,14 @@ sub www_exportGenerate {
$path = $session{config}{exportPath} . "/" . $path;
eval { mkpath($path) };
if($@) {
- print "Couldn't create $path because $@
\n";
- print "This most likely means that you have a page with the same name as folder that you're trying to create.
\n";
+ printf WebGUI::International::get('could not create path', 'Asset'), $path, $@;
return;
}
}
$path .= "/".$filename;
eval { open(FILE, "> $path") or die "$!" };
if ($@) {
- print "Couldn't open $path because $@
\n";
+ printf WebGUI::International::get('could not open path', 'Asset'), $path, $@;
return;
} else {
print FILE $self->exportAsHtml({userId=>$userId,extrasUrl=>$extrasURL,uploadsUrl=>$uploadsURL});
@@ -269,7 +268,7 @@ sub www_exportGenerate {
}
print WebGUI::International::get('done','Asset');
}
- print "Exported ".scalar(@{$assets})." pages in ".(time()-$startTime)." seconds.
";
+ printf WebGUI::International::get('export information','Asset'), scalar(@{$assets}), (time()-$startTime);
print ''.WebGUI::International::get(493,"Asset").'';
return;
}
diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm
index 6a8c0f904..5e2f3b82b 100644
--- a/lib/WebGUI/i18n/English/Asset.pm
+++ b/lib/WebGUI/i18n/English/Asset.pm
@@ -792,15 +792,36 @@ config file must be enabled for this function to be available.
},
'exporting page' => {
- message => q|Exporting page|,
+ message => q|Exporting page %-s ......|,
lastUpdated => 1129420080,
},
'bad user privileges' => {
- message => q|User has no privileges to view this page.|,
+ message => q|User has no privileges to view this page.
|,
lastUpdated => 1129420080,
},
+ 'could not create path' => {
+ message => q|
+Couldn't create %-s because %-s
+This most likely means that you have a page with the same name as folder that you're trying to create.
+|,
+ lastUpdated => 1129436410,
+ },
+
+ 'could not open path' => {
+ message => q|
+Couldn't open %-s because %-s
+|,
+ lastUpdated => 1129436544,
+ },
+
+ 'export information' => {
+ message => q|
+Exported %d pages in %d seconds.
|,
+ lastUpdated => 1129436684,
+ },
+
'done' => {
message => q|DONE
|,
lastUpdated => 1129420080,