From f1efe0d1600af5b5ed9e2e82845e63e1dd896b6a Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Sat, 21 Jul 2007 04:24:56 +0000 Subject: [PATCH] convert File, Wobject and Redirect to use addEditLabel --- lib/WebGUI/Asset/File.pm | 3 +-- lib/WebGUI/Asset/Redirect.pm | 4 +--- lib/WebGUI/Asset/Wobject.pm | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index afbb7cc25..230bfb8c5 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -425,8 +425,7 @@ sub www_edit { -namespace=>"FileAsset" ); $self->getAdminConsole->setHelp("file add/edit", "Asset_File"); - my $addEdit = ($self->session->form->process("func") eq 'add') ? $i18n->get('add','Asset_Wobject') : $i18n->get('edit','Asset_Wobject'); - return $self->getAdminConsole->render($tabform->print,$addEdit.' '.$self->getName); + return $self->getAdminConsole->render($tabform->print,$self->addEditLabel); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm index caf8935f7..71c2c7c4a 100644 --- a/lib/WebGUI/Asset/Redirect.pm +++ b/lib/WebGUI/Asset/Redirect.pm @@ -86,9 +86,7 @@ sub www_edit { return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->locked() unless $self->canEditIfLocked; $self->getAdminConsole->setHelp("redirect add/edit", "Asset_Redirect"); - my $i18n = WebGUI::International->new($self->session, 'Asset_Wobject'); - my $addEdit = ($self->session->form->process("func") eq 'add') ? $i18n->get('add') : $i18n->get('edit'); - return $self->getAdminConsole->render($self->getEditForm->print,$addEdit.' '.$self->getName); + return $self->getAdminConsole->render($self->getEditForm->print, $self->addEditLabel); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm index 7293b44a7..6b14c99e9 100644 --- a/lib/WebGUI/Asset/Wobject.pm +++ b/lib/WebGUI/Asset/Wobject.pm @@ -493,7 +493,7 @@ sub www_edit { $tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps $tag =~ s/([A-Z]+(?![a-z]))/$1 /g; #Separate acronyms $self->getAdminConsole->setHelp(lc($tag)." add/edit", "Asset_".$tag2); - return $self->getAdminConsole->render($self->getEditForm->print,$self->addEditLabel); + return $self->getAdminConsole->render($self->getEditForm->print, $self->addEditLabel); }