[Phpgroupware-cvs] CVS: phpgwapi/inc class.translation_file.inc.php,1.4,1.5

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv14837

Modified Files:
        class.translation_file.inc.php 
Log Message:
Fix the 'too early to get the userlang' problem



Index: class.translation_file.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.translation_file.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.translation_file.inc.php      20 May 2002 00:45:52 -0000      1.4
--- class.translation_file.inc.php      20 May 2002 01:11:27 -0000      1.5
***************
*** 80,83 ****
--- 80,89 ----
                function load_langs($all=False)
                {
+                       
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) &&
+                               
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'])
+                       {
+                               $this->userlang = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
+                       }
+ 
                        if($all)
                        {
***************
*** 109,112 ****
--- 115,119 ----
  
                        $userlang = $this->userlang ? $this->userlang : 'en';
+                       //echo '<br>add_app(): userlang is: ' . $userlang;
  
                        $fn = PHPGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . 
SEP . 'phpgw_' . $userlang . '.lang';
***************
*** 118,122 ****
                        if(file_exists($fn))
                        {
!                               $fp = fopen($fn,'rb');
                                while($data = fgets($fp,8000))
                                {
--- 125,129 ----
                        if(file_exists($fn))
                        {
!                               $fp = fopen($fn,'r');
                                while($data = fgets($fp,8000))
                                {