From ee9772d543a9ee8deef9304694630dc148f21224 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Sun, 27 Jul 2008 02:59:33 +0000 Subject: [PATCH] fix broken i18n labels in Asset export, and in the Shop --- lib/WebGUI/Asset.pm | 2 +- lib/WebGUI/Shop/Tax.pm | 4 ++-- lib/WebGUI/i18n/English/Asset.pm | 7 +++++++ lib/WebGUI/i18n/English/Shop.pm | 12 ++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 1e4e56ebf..5b29ae1a2 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -1354,7 +1354,7 @@ sub getToolbar { if ($userUiLevel >= $uiLevels->{"export"} && $self->session->config->get("exportPath")) { $output .= '
  • ' . $i18n->get("export") . '
  • '; + . $self->getUrl('func=export') . '">' . $i18n->get('Export','Icon') . ''; } if ($userUiLevel >= $uiLevels->{"promote"}) { $output diff --git a/lib/WebGUI/Shop/Tax.pm b/lib/WebGUI/Shop/Tax.pm index b528710a7..0d9e2c0c0 100644 --- a/lib/WebGUI/Shop/Tax.pm +++ b/lib/WebGUI/Shop/Tax.pm @@ -552,10 +552,10 @@ sub www_manage { my $i18n=WebGUI::International->new($session, 'Tax'); my $exportForm = WebGUI::Form::formHeader($session,{action => $url->page('shop=tax;method=exportTax')}) - . WebGUI::Form::submit($session,{value=>$i18n->get('export','Shop'), extras=>q{style="float: left;"} }) + . WebGUI::Form::submit($session,{value=>$i18n->get('export tax','Shop'), extras=>q{style="float: left;"} }) . WebGUI::Form::formFooter($session); my $importForm = WebGUI::Form::formHeader($session,{action => $url->page('shop=tax;method=importTax')}) - . WebGUI::Form::submit($session,{value=>$i18n->get('import','Shop'), extras=>q{style="float: left;"} }) + . WebGUI::Form::submit($session,{value=>$i18n->get('import tax','Shop'), extras=>q{style="float: left;"} }) . q{} . WebGUI::Form::formFooter($session); diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index e2d7f2134..9268933de 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -1096,6 +1096,13 @@ Couldn't open %-s because %-s
    lastUpdated => 0, context => q{Label for the menu to show actions to perform on an asset}, }, + + 'export' => { + message => q{More}, + lastUpdated => 0, + context => q{Label for the menu to show actions to perform on an asset}, + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/Shop.pm b/lib/WebGUI/i18n/English/Shop.pm index 97fd34c84..751a173c1 100644 --- a/lib/WebGUI/i18n/English/Shop.pm +++ b/lib/WebGUI/i18n/English/Shop.pm @@ -1389,6 +1389,18 @@ our $I18N = { context => q|Message asking the user to choose one of the available payment options.|, }, + 'import tax' => { + message => q|Import Taxes|, + lastUpdated => 1217125374, + context => q|Label for the manage tax screen|, + }, + + 'export tax' => { + message => q|Export Taxes|, + lastUpdated => 1217125391, + context => q|Label for the manage tax screen|, + }, + }; 1;