oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

making config addToArray only add if it's not already there.

Browse source
This commit is contained in:
Matthew Wilson 2006-04-15 23:31:16 +00:00
parent 71881282aa
commit 3fad0b078f
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/WebGUI/Config.pm
View file

@ -79,6 +79,7 @@ sub addToArray {
my $property = shift; my $property = shift;
my $value = shift; my $value = shift;
my $array = $self->get($property); my $array = $self->get($property);
return undef if isIn($value,@{$array});
push(@{$array}, $value); push(@{$array}, $value);
$self->set($property, $array); $self->set($property, $array);
} }

8
lib/WebGUI/International.pm
View file

@ -17,6 +17,7 @@ package WebGUI::International;
use strict qw(vars subs); use strict qw(vars subs);
our %l10nCache;
=head1 NAME =head1 NAME
@ -79,6 +80,7 @@ sub get {
$id =~ s/$safeRe//g; $id =~ s/$safeRe//g;
$language =~ s/$safeRe//g; $language =~ s/$safeRe//g;
$namespace =~ s/$safeRe//g; $namespace =~ s/$safeRe//g;
return $l10nCache{$language}{$namespace}{$id} if $l10nCache{$language}{$namespace}{$id};
my $cmd = "WebGUI::i18n::".$language."::".$namespace; my $cmd = "WebGUI::i18n::".$language."::".$namespace;
my $load = "use ".$cmd; my $load = "use ".$cmd;
eval($load); eval($load);
@ -87,6 +89,7 @@ sub get {
my $output = eval($cmd); my $output = eval($cmd);
$self->session->errorHandler->warn("Couldn't get value from ".$cmd." because ".$@) if ($@); $self->session->errorHandler->warn("Couldn't get value from ".$cmd." because ".$@) if ($@);
$output = $self->get($id,$namespace,"English") if ($output eq "" && $language ne "English"); $output = $self->get($id,$namespace,"English") if ($output eq "" && $language ne "English");
$l10nCache{$language}{$namespace}{$id} = $output || $id;
return $output || $id; return $output || $id;
} }
@ -207,11 +210,14 @@ Specify a default language. Defaults to user preference or "English".
sub new { sub new {
my ($class, $session, $namespace, $language) = @_; my ($class, $session, $namespace, $language) = @_;
bless( { return $l10nCache{namespaces}{$namespace} if $l10nCache{namespaces}{$namespace};
my $self = bless( {
_session => $session, _session => $session,
_namespace => $namespace, _namespace => $namespace,
_language => ($language || $session->user->profileField('language')), _language => ($language || $session->user->profileField('language')),
},$class); },$class);
$l10nCache{namespaces}{$namespace} = $self;
return $self;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------