diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm index f349d75c9..7b3c90474 100644 --- a/lib/WebGUI/Asset/File/ZipArchive.pm +++ b/lib/WebGUI/Asset/File/ZipArchive.pm @@ -106,7 +106,7 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { - assetName=>WebGUI::International::get('asset label',"Asset_ZipArchive"), + assetName=>WebGUI::International::get('assetName',"Asset_ZipArchive"), tableName=>'ZipArchiveAsset', className=>'WebGUI::Asset::File', properties=>{ diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm index 725768117..799b4ccdb 100644 --- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm +++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm @@ -68,6 +68,7 @@ sub definition { push(@{$definition}, { tableName=>'InOutBoard', className=>'WebGUI::Asset::Wobject::InOutBoard', + assetName=>WebGUI::International::get('assetName',"Asset_InOutBoard"), icon=>'iob.gif', properties=>{ statusList => { @@ -142,11 +143,6 @@ sub getEditForm { } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(9,"Asset_InOutBoard"); -} - #------------------------------------------------------------------- sub view { my $self = shift; diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm index fbb934ad4..d6c745084 100644 --- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm +++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm @@ -24,6 +24,7 @@ sub definition { push (@{$definition}, { tableName=>'IndexedSearch', className=>'WebGUI::Asset::Wobject::IndexedSearch', + assetName=>WebGUI::International::get('assetName',"Asset_IndexedSearch"), properties=>{ templateId=>{ fieldType=>"template", @@ -213,11 +214,6 @@ sub getIcon { return $session{config}{extrasURL}.'/assets/search.gif'; } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(17,"Asset_IndexedSearch"); -} - #------------------------------------------------------------------- sub view { my $self = shift; diff --git a/lib/WebGUI/Asset/Wobject/MultiSearch.pm b/lib/WebGUI/Asset/Wobject/MultiSearch.pm index dd2389cdb..9f0a181ac 100644 --- a/lib/WebGUI/Asset/Wobject/MultiSearch.pm +++ b/lib/WebGUI/Asset/Wobject/MultiSearch.pm @@ -64,7 +64,7 @@ sub definition { push(@{$definition}, { tableName=>'MultiSearch', className=>'WebGUI::Asset::Wobject::MultiSearch', - assetName=>$i18n->get('MultiSearch'), + assetName=>$i18n->get('assetName'), icon=>'multiSearch.gif', autoGenerateForms=>1, properties=>$properties diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm index 1770ec614..1b108a77f 100644 --- a/lib/WebGUI/Asset/Wobject/StockData.pm +++ b/lib/WebGUI/Asset/Wobject/StockData.pm @@ -303,7 +303,7 @@ sub definition { tableName=>'StockData', className=>'WebGUI::Asset::Wobject::StockData', icon=>'stockData.gif', - assetName=>WebGUI::International::get("app_name","Asset_StockData"), + assetName=>WebGUI::International::get("assetName","Asset_StockData"), properties=>$properties }); return $class->SUPER::definition($definition); diff --git a/lib/WebGUI/Asset/Wobject/WeatherData.pm b/lib/WebGUI/Asset/Wobject/WeatherData.pm index a05aa9617..98f460226 100644 --- a/lib/WebGUI/Asset/Wobject/WeatherData.pm +++ b/lib/WebGUI/Asset/Wobject/WeatherData.pm @@ -66,7 +66,7 @@ sub definition { push(@{$definition}, { tableName=>'WeatherData', className=>'WebGUI::Asset::Wobject::WeatherData', - assetName=>$i18n->get("WeatherData"), + assetName=>$i18n->get("assetName"), icon=>'weatherData.gif', autoGenerateForms=>1, properties=>$properties diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm index c16afddcb..336db6505 100644 --- a/lib/WebGUI/Operation/Help.pm +++ b/lib/WebGUI/Operation/Help.pm @@ -79,15 +79,15 @@ sub _getHelpName { my $file = shift; my $helpName; if ($file =~ /^Asset_/) { - $helpName = WebGUI::International::get('assetName',$file); + $helpName = 'assetName'; } elsif ($file =~ /^Macro_/) { - $helpName = WebGUI::International::get('macroName',$file); + $helpName = 'macroName'; } else { - $helpName = WebGUI::International::get('topicName',$file); + $helpName = 'topicName'; } - return $helpName; + return WebGUI::International::get($helpName,$file); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/i18n/English/Asset_InOutBoard.pm b/lib/WebGUI/i18n/English/Asset_InOutBoard.pm index 77d9dc675..7b2019951 100644 --- a/lib/WebGUI/i18n/English/Asset_InOutBoard.pm +++ b/lib/WebGUI/i18n/English/Asset_InOutBoard.pm @@ -139,7 +139,7 @@ A variable that returns the HTML necessary to create a Traditional Pagination Ba lastUpdated =>1091624565 }, - '9' => { + 'assetName' => { message => q|In/Out Board|, lastUpdated =>1091624565 }, diff --git a/lib/WebGUI/i18n/English/Asset_IndexedSearch.pm b/lib/WebGUI/i18n/English/Asset_IndexedSearch.pm index 366651cbf..cb6346d71 100644 --- a/lib/WebGUI/i18n/English/Asset_IndexedSearch.pm +++ b/lib/WebGUI/i18n/English/Asset_IndexedSearch.pm @@ -21,7 +21,7 @@ our $I18N = { lastUpdated => 1067346336 }, - '17' => { + 'assetName' => { message => q|Search|, lastUpdated => 1066593262 }, diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm index cfb037c73..d74ebacc2 100644 --- a/lib/WebGUI/i18n/English/Asset_Matrix.pm +++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm @@ -855,6 +855,11 @@ our $I18N = { lastUpdated => 1133758944, }, + 'assetName' => { + lastUpdated => 1134256651, + message => q|Matrix| + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/Asset_MultiSearch.pm b/lib/WebGUI/i18n/English/Asset_MultiSearch.pm index a33282a05..e12febec5 100644 --- a/lib/WebGUI/i18n/English/Asset_MultiSearch.pm +++ b/lib/WebGUI/i18n/English/Asset_MultiSearch.pm @@ -7,7 +7,7 @@ our $I18N = { lastUpdated => 1133619940, }, - 'MultiSearch' => { + 'assetName' => { message => q|MultiSearch|, lastUpdated => 1133619940, }, diff --git a/lib/WebGUI/i18n/English/Asset_StockData.pm b/lib/WebGUI/i18n/English/Asset_StockData.pm index 79b00ee6a..d7d80bad4 100644 --- a/lib/WebGUI/i18n/English/Asset_StockData.pm +++ b/lib/WebGUI/i18n/English/Asset_StockData.pm @@ -12,7 +12,7 @@ our $I18N = { lastUpdated => 1121703035, }, - 'app_name' => { + 'assetName' => { message => q|Stock Data|, lastUpdated => 1119068745 }, @@ -509,4 +509,4 @@ our $I18N = { }; -1; \ No newline at end of file +1; diff --git a/lib/WebGUI/i18n/English/Asset_WeatherData.pm b/lib/WebGUI/i18n/English/Asset_WeatherData.pm index 8db0c92a3..5a596a440 100644 --- a/lib/WebGUI/i18n/English/Asset_WeatherData.pm +++ b/lib/WebGUI/i18n/English/Asset_WeatherData.pm @@ -32,7 +32,7 @@ our $I18N = { lastUpdated => 1133619940, }, - 'WeatherData' => { + 'assetName' => { message => q|WeatherData|, lastUpdated => 1133619940, }, diff --git a/lib/WebGUI/i18n/English/Asset_ZipArchive.pm b/lib/WebGUI/i18n/English/Asset_ZipArchive.pm index 7fe15456a..84bfff89a 100644 --- a/lib/WebGUI/i18n/English/Asset_ZipArchive.pm +++ b/lib/WebGUI/i18n/English/Asset_ZipArchive.pm @@ -30,11 +30,11 @@ our $I18N = { lastUpdated => 1106762088 }, - 'asset label' => { - message => q|Zip Archive|, - context => q|label for Asset Manager, getName|, - lastUpdated => 1121703035, - }, + 'assetName' => { + message => q|Zip Archive|, + context => q|label for Asset Manager, getName|, + lastUpdated => 1121703035, + }, 'show page description' => { message => q|Enter the name of the file which serves as the "base" file for this archive. This is the page which will initially be served up|, diff --git a/lib/WebGUI/i18n/English/Macro_FetchMimeType.pm b/lib/WebGUI/i18n/English/Macro_FetchMimeType.pm index 066148297..006b41352 100644 --- a/lib/WebGUI/i18n/English/Macro_FetchMimeType.pm +++ b/lib/WebGUI/i18n/English/Macro_FetchMimeType.pm @@ -18,6 +18,11 @@ to the file is required. A URL to the file will not work. lastUpdated => 1134252720, }, + 'macroName' => { + message => q|FetchMimeType|, + lastUpdated => 1134256852 + }, + }; 1;