From 01dcd2b416cbc8ed1578d00926ceee8713fe296d Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 5 Dec 2005 05:31:07 +0000 Subject: [PATCH] fix broken i18n labels and add i18n labels to Matrix --- lib/WebGUI/Asset/Event.pm | 8 +-- lib/WebGUI/Asset/File/Image.pm | 2 +- lib/WebGUI/Asset/Wobject/Matrix.pm | 26 ++++----- lib/WebGUI/AssetExportHtml.pm | 2 +- lib/WebGUI/i18n/English/Asset_Matrix.pm | 66 +++++++++++++++++++++++ lib/WebGUI/i18n/English/Asset_RichEdit.pm | 5 ++ 6 files changed, 90 insertions(+), 19 deletions(-) diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index a8784db3b..092e0e388 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -75,20 +75,20 @@ sub getEditForm { $tabform->getTab("properties")->HTMLArea( -name=>"description", -label=>WebGUI::International::get(512,"Asset_Event"), - -hoverHelp=>WebGUI::International::get('512 description',"Asset_Event"), + -hoverHelp=>WebGUI::International::get('Description description',"Asset_Event"), -value=>$self->getValue("description") ); $tabform->getTab("properties")->dateTime( -name=>"eventStartDate", -label=>WebGUI::International::get(513,"Asset_Event"), - -hoverHelp=>WebGUI::International::get('513 description',"Asset_Event"), + -hoverHelp=>WebGUI::International::get('Start Date description',"Asset_Event"), -extras=>'onBlur="this.form.eventEndDate.value=this.form.eventStartDate.value;this.form.until.value=this.form.eventStartDate.value;"', -value=>$self->getValue("eventStartDate") ); $tabform->getTab("properties")->dateTime( -name=>"eventEndDate", -label=>WebGUI::International::get(514,"Asset_Event"), - -hoverHelp=>WebGUI::International::get('514 description',"Asset_Event"), + -hoverHelp=>WebGUI::International::get('End Date description',"Asset_Event"), -extras=>'onBlur="this.form.until.value=this.form.eventEndDate.value;"', -value=>$self->getValue("eventEndDate") ); @@ -110,7 +110,7 @@ sub getEditForm { ); $tabform->getTab("properties")->readOnly( -label=>WebGUI::International::get(8,"Asset_Event"), - -hoverHelp=>WebGUI::International::get('8 description',"Asset_Event"), + -hoverHelp=>WebGUI::International::get('Recurs every description',"Asset_Event"), -value=>WebGUI::Form::integer({ name=>"interval", defaultValue=>1 diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm index 0900f003a..72ecc1547 100644 --- a/lib/WebGUI/Asset/File/Image.pm +++ b/lib/WebGUI/Asset/File/Image.pm @@ -130,7 +130,7 @@ sub getEditForm { ); if ($self->get("filename") ne "") { $tabform->getTab("properties")->readOnly( - -label=>WebGUI::International::get('Thumbnail', 'Asset_Image'), + -label=>WebGUI::International::get('thumbnail', 'Asset_Image'), -hoverHelp=>WebGUI::International::get('thumbnail description', 'Asset_Image'), -value=>'thumbnail' ); diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index fa591356c..3ac5b56a1 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -350,73 +350,73 @@ sub getEditForm { my $tabform = $self->SUPER::getEditForm(); $tabform->getTab("properties")->textarea( -name=>"categories", - -label=>"Categories", + -label=>WebGUI::International::get('categories', 'Asset_Matrix'), -value=>$self->getValue("categories"), -subtext=>"
Enter one per line in the order you want them to appear. Be sure to watch leading and trailing whitespace." ); $tabform->getTab("properties")->integer( -name=>"maxComparisons", - -label=>"Maximum Comparisons", + -label=>WebGUI::International::get("max comparisons","Asset_Matrix"), -value=>$self->getValue("maxComparisons") ); $tabform->getTab("properties")->integer( -name=>"maxComparisonsPrivileged", - -label=>"Maximum Comparisons (For Privileged Users)", + -label=>WebGUI::International::get("max comparisons privileged","Asset_Matrix"), -value=>$self->getValue("maxComparisonsPrivileged") ); $tabform->getTab("properties")->interval( -name=>"ratingTimeout", - -label=>"Time Required Between Ratings", + -label=>WebGUI::International::get("rating timeout","Asset_Matrix"), -value=>$self->getValue("ratingTimeout") ); $tabform->getTab("properties")->interval( -name=>"ratingTimeoutPrivileged", - -label=>"Time Required Between Ratings (For Privileged Users)", + -label=>WebGUI::International::get("rating timeout privileged","Asset_Matrix"), -value=>$self->getValue("ratingTimeoutPrivileged") ); $tabform->getTab("security")->group( -name=>"groupToAdd", - -label=>"Who can add listings?", + -label=>WebGUI::International::get("group to add","Asset_Matrix"), -value=>[$self->getValue("groupToAdd")] ); $tabform->getTab("security")->group( -name=>"privilegedGroup", - -label=>"Who should have privileged rights?", + -label=>WebGUI::International::get("privileged group","Asset_Matrix"), -value=>[$self->getValue("privilegedGroup")] ); $tabform->getTab("security")->group( -name=>"groupToRate", - -label=>"Who can rate listings?", + -label=>WebGUI::International::get("rating group","Asset_Matrix"), -value=>[$self->getValue("groupToRate")] ); $tabform->getTab("display")->template( -name=>"templateId", -value=>$self->getValue("templateId"), - -label=>"Main Template", + -label=>WebGUI::International::get("main template","Asset_Matrix"), -namespace=>"Matrix" ); $tabform->getTab("display")->template( -name=>"detailTemplateId", -value=>$self->getValue("detailTemplateId"), - -label=>"Detail Template", + -label=>WebGUI::International::get("detail template","Asset_Matrix"), -namespace=>"Matrix/Detail" ); $tabform->getTab("display")->template( -name=>"ratingDetailTemplateId", -value=>$self->getValue("ratingDetailTemplateId"), - -label=>"Rating Detail Template", + -label=>WebGUI::International::get("rating detail template","Asset_Matrix"), -namespace=>"Matrix/RatingDetail" ); $tabform->getTab("display")->template( -name=>"searchTemplateId", -value=>$self->getValue("searchTemplateId"), - -label=>"Search Template", + -label=>WebGUI::International::get("search template","Asset_Matrix"), -namespace=>"Matrix/Search" ); $tabform->getTab("display")->template( -name=>"compareTemplateId", -value=>$self->getValue("compareTemplateId"), - -label=>"Compare Template", + -label=>WebGUI::International::get("compare template","Asset_Matrix"), -namespace=>"Matrix/Compare" ); return $tabform; diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm index 1e6137055..ed66c7312 100644 --- a/lib/WebGUI/AssetExportHtml.pm +++ b/lib/WebGUI/AssetExportHtml.pm @@ -177,7 +177,7 @@ sub www_export { -value=>$session{config}{uploadsURL} ); $f->submit; - $self->getAdminConsole->render($self->checkExportPath.$f->print,WebGUI::International::get('Export Page'),"Asset"); + $self->getAdminConsole->render($self->checkExportPath.$f->print,WebGUI::International::get('Export Page',"Asset")); } diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm index a7d390d9d..1bac9bed6 100644 --- a/lib/WebGUI/i18n/English/Asset_Matrix.pm +++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm @@ -699,6 +699,72 @@ our $I18N = { Select a template to be used to show the listing comparison data.

| }, + + 'categories' => { + message => q|Categories|, + lastUpdated => 1133758944, + }, + + 'max comparisons' => { + message => q|Maximum Comparisons|, + lastUpdated => 1133758944, + }, + + 'max comparisons privileged' => { + message => q|Maximum Comparisons (For Privileged Users)|, + lastUpdated => 1133758944, + }, + + 'rating timeout' => { + message => q|Time Required Between Ratings|, + lastUpdated => 1133758944, + }, + + 'rating timeout privileged' => { + message => q|Time Required Between Ratings (For Privileged Users)|, + lastUpdated => 1133758944, + }, + + 'group to add' => { + message => q|Who can add listings?|, + lastUpdated => 1133758944, + }, + + 'privileged group' => { + message => q|Who should have privileged rights?|, + lastUpdated => 1133758944, + }, + + 'rating group' => { + message => q|Who can rate listings?|, + lastUpdated => 1133758944, + }, + + 'main template' => { + message => q|Main Template|, + lastUpdated => 1133758944, + }, + + 'detail template' => { + message => q|Detail Template|, + lastUpdated => 1133758944, + }, + + 'rating detail template' => { + message => q|Rating Detail Template|, + lastUpdated => 1133758944, + }, + + 'search template' => { + message => q|Search Template|, + lastUpdated => 1133758944, + }, + + 'compare template' => { + message => q|Compare Template|, + lastUpdated => 1133758944, + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/Asset_RichEdit.pm b/lib/WebGUI/i18n/English/Asset_RichEdit.pm index cfad535e4..942fbb848 100644 --- a/lib/WebGUI/i18n/English/Asset_RichEdit.pm +++ b/lib/WebGUI/i18n/English/Asset_RichEdit.pm @@ -7,6 +7,11 @@ our $I18N = { lastUpdated => 1115139736, }, + 'toolbar buttons description' => { + message => q|Shows which toolbar buttons will be used in the editor.|, + lastUpdated => 1133760935, + }, + 'using rich edit' => { message => q|Ask user about using rich edit?|, lastUpdated => 1115139819,