Fix a failing International.t test I caused.

WGBP the conditionals in getLanguages
Fix a typo in a comment
This commit is contained in:
Colin Kuskie 2007-12-27 04:38:21 +00:00
parent af271b9f26
commit 2fa12f41b7

View file

@ -105,7 +105,7 @@ sub get {
$file =~ s{::}{/}g; $file =~ s{::}{/}g;
$file .= '.pm'; $file .= '.pm';
if (!exists $INC{ $file }) { ##Alread loaded? if (!exists $INC{ $file }) { ##Already loaded?
eval{ require $file }; eval{ require $file };
$self->session->errorHandler->warn($cmd." failed to compile because ".$@) if ($@); $self->session->errorHandler->warn($cmd." failed to compile because ".$@) if ($@);
} }
@ -142,15 +142,17 @@ sub getLanguage {
$file .= '.pm'; $file .= '.pm';
eval{require $file}; eval{require $file};
unless ($@) { unless ($@) {
#$cmd = "\$".$cmd."::LANGUAGE"; $cmd = "\$".$cmd."::LANGUAGE";
my $hashRef = eval{ $cmd::LANGUAGE }; my $hashRef = eval($cmd);
$self->session->errorHandler->warn("Failed to retrieve language properties because ".$@) if ($@); $self->session->errorHandler->warn("Failed to retrieve language properties because ".$@) if ($@);
if ($property) { if ($property) {
return $hashRef->{$property}; return $hashRef->{$property};
} else { }
else {
return $hashRef; return $hashRef;
} }
} else { }
else {
$self->session->errorHandler->warn("Language failed to compile: $language. ".$@); $self->session->errorHandler->warn("Language failed to compile: $language. ".$@);
} }
} }