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

fixing some more bugs introduced from the new i18n system

Browse source
This commit is contained in:
JT Smith 2004-06-27 16:27:36 +00:00
parent 078a5ca108
commit e531d8d5b2
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/upgrades/upgrade_6.0.3-6.1.0.pl
View file

@ -67,9 +67,9 @@ my $langs = {
16 => "Polish", 16 => "Polish",
21 => "Russian" 21 => "Russian"
}; };
WebGUI::SQL->write("update userProfileField set dataDefault='[\'".$langs->{$defaultLangId}."\']' where fieldName='language'"); WebGUI::SQL->write("update userProfileField set dataDefault=".quote("['".$langs->{$defaultLangId}."']")." where fieldName='language'");
WebGUI::SQL->write("update userProfileData set language='".$langs->{$defaultLangId}."' where fieldName='language' and fieldData<>1"); WebGUI::SQL->write("update userProfileData set fieldData='".$langs->{$defaultLangId}."' where fieldName='language' and fieldData<>1");
WebGUI::SQL->write("update userProfileData set language='English' where fieldName='language' and fieldData=1"); WebGUI::SQL->write("update userProfileData set fieldData='English' where fieldName='language' and fieldData=1");
WebGUI::Session::close(); WebGUI::Session::close();

5
lib/WebGUI/International.pm
View file

@ -84,9 +84,12 @@ sub get {
my $cmd = "WebGUI::i18n::".$language."::".$namespace; my $cmd = "WebGUI::i18n::".$language."::".$namespace;
my $load = "use ".$cmd; my $load = "use ".$cmd;
eval($load); eval($load);
WebGUI::ErrorHandler::warn($cmd." failed to compile because ".$@) if ($@);
$cmd = "\$".$cmd."::I18N->{'".$id."'}"; $cmd = "\$".$cmd."::I18N->{'".$id."'}";
my $output = eval($cmd); my $output = eval($cmd);
return $output || get($id,$namespace,"English"); WebGUI::ErrorHandler::warn("Couldn't get value from ".$cmd." because ".$@) if ($@);
$output = get($id,$namespace,"English") if ($output eq "" && $language ne "English");
return $output;
} }

5
lib/WebGUI/Session.pm
View file

@ -431,11 +431,6 @@ sub open {
###---------------------------- ###----------------------------
### current user's account and profile information (from users and userProfileData tables) ### current user's account and profile information (from users and userProfileData tables)
_setupUserInfo($session{var}{userId}); _setupUserInfo($session{var}{userId});
###----------------------------
### language settings
$session{language} = WebGUI::SQL->quickHashRef("select * from language where languageId=".quote($session{user}{language}));
###----------------------------
### loading plugins
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------