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

Fix a bug where looking up non-existant files croaks, instead of propagating

Browse source 
the error back up and trapping it.
This commit is contained in:
Colin Kuskie 2008-08-15 22:46:46 +00:00
parent 69ca406b38
commit b143a8db6a
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/WebGUI/International.pm
View file

@ -97,13 +97,24 @@ my $safeRe = qr/[^\.\w\d\s\/]/;
sub get {
my ($self, $id, $namespace, $language) = @_;
my $session = $self->session;
$namespace = $namespace || $self->{_namespace} || "WebGUI";
$language = $language || $self->{_language} || $self->session->user->profileField("language") || "English";
$language = $language || $self->{_language} || $session->user->profileField("language") || "English";
$id =~ s/$safeRe//g;
$language =~ s/$safeRe//g;
$namespace =~ s/$safeRe//g;
my $cmd = "WebGUI::i18n::".$language."::".$namespace;
WebGUI::Pluggable::load($cmd);
eval { WebGUI::Pluggable::load($cmd); };
if ($@) {
if ($language eq 'English') {
$session->log->error('Unable to load $cmd');
return '';
}
else {
my $output = $self->get($id, $namespace, 'English');
return $output;
}
}
our $table;
*table = *{"$cmd\::I18N"}; ##Create alias into symbol table
my $output = $table->{$id}->{message};