[Phpgroupware-cvs] api class.lang.php, 1.1.2.2, 1.1.2.3 class.phpgw.php, 1.1.1.1.2.3, 1.1.1.1.2.4

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv22553/api

Modified Files:
      Tag: proposal-branch
        class.lang.php class.phpgw.php 
Log Message:
fixed some issues with lang class

Index: class.lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.lang.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.lang.php      24 Oct 2003 22:17:11 -0000      1.1.2.2
--- class.lang.php      24 Oct 2003 23:17:43 -0000      1.1.2.3
***************
*** 42,45 ****
--- 42,111 ----
                }
  
+               function _translate($msg)
+               {
+ 
+ //echo '$this->language: '.$this->language."<br>\n";
+                       if($this->language == 'en')
+                       {
+                               return $msg;
+                       }
+                       $omsg = $msg;
+                       $msg = strtolower($msg);
+                       $result = gettext($msg);
+                       
+                       if($result == $msg && $this->registered_app != 'api')
+                       {
+                               $current_app = $this->registered_app;
+                               $this->switchapp('api');
+                               $result = gettext($msg);
+                               $this->registered_app = $current_app;
+                       }
+ 
+                       if($result == $msg)
+                       {
+                               //if(1 == 1)
+                               
if($GLOBALS['phpgw_data']['server']['usebabelfish'] == 'Yes')
+                               {
+                                       return 
$this->_babelfish_translate($omsg);
+                               }
+                               return $omsg;                                   
+                       }
+ 
+                       return $result;
+               }
+ 
+               function _babelfish_translate($msg)
+               {
+                       if(!function_exists('curl_init'))
+                       {
+                               return $msg;
+                       }
+                       $str = 
'urltext='.urlencode($msg).'&lp=en_'.$this->language.'&submit=Translate';
+                       $ch = curl_init();
+                       curl_setopt($ch, 
CURLOPT_URL,"http://babelfish.altavista.com/babelfish/tr";);
+                       curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+                       curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+                       curl_setopt($ch, CURLOPT_TIMEOUT, 3);
+                       curl_setopt ($ch, CURLOPT_HEADER, 0);
+                       curl_setopt($ch, CURLOPT_POST, 1);
+                       curl_setopt($ch, CURLOPT_POSTFIELDS, $str);
+                       ob_start();
+                       curl_exec ($ch);
+                       $buffer = ob_get_contents();
+                       ob_end_clean();
+                       curl_close ($ch);
+                       $lang_length = strlen($this->language);
+                       $start = strpos ($buffer, 'padding:10px; 
lang=')+20+$lang_length;
+                       $buffer = substr($buffer, $start);
+                       $end = strpos ($buffer, '</div>');
+                       $buffer = trim(substr($buffer, 0, $end));
+                       if(!empty($buffer))
+                       {
+                               return $buffer;
+                       }
+                       return $msg;                            
+               }
+ 
+               
                function get()
                {
***************
*** 63,74 ****
                        $this->switchapp($args['app']);
  
!                       $result = gettext($args['msg']);
!                       if($result == $args['msg'] && $this->registered_app != 
'api')
!                       {
!                               $this->switchapp('api');
!                               $result = gettext($args['msg']);                
        
!                       }
!                       
!                       return $result;
                }
  
--- 129,133 ----
                        $this->switchapp($args['app']);
  
!                       return $this->_translate($args['msg']);
                }
  
***************
*** 94,98 ****
                                $this->envset = False;
                        }
-                       $this->language = 'es';
                        if(!$this->envset)
                        {
--- 153,156 ----
***************
*** 115,127 ****
                                        foreach($strings as $msg=>$val)         
                
                                        {
!                                               $translated = gettext($msg);
  
-                                               if($translated == $msg && $app 
!= 'api')
-                                               {
-                                                       $this->switchapp('api');
-                                                       $translated = 
gettext($msg);
-                                                       $this->switchapp($app); 
                                                
-                                               }
-                                               
                                                $lang_node = 
createobject('api_xmltool',array('node_type'=>'node','name'=>'LANG'));
                                                
$lang_node->set_attribute('name', $msg);
--- 173,178 ----
                                        foreach($strings as $msg=>$val)         
                
                                        {
!                                               $translated = 
$this->_translate($msg);
  
                                                $lang_node = 
createobject('api_xmltool',array('node_type'=>'node','name'=>'LANG'));
                                                
$lang_node->set_attribute('name', $msg);
***************
*** 169,180 ****
                                        foreach ($messages['message'] as $val)
                                        {
!                                               $translated = gettext($val);
                                                
-                                               if($translated == $val && $app 
!= 'api')
-                                               {
-                                                       $this->switchapp('api');
-                                                       $translated = 
gettext($val);
-                                                       $this->switchapp($app); 
                                                
-                                               }
                                                $lang_node = 
createobject('api_xmltool',array('node_type'=>'node','name'=>'LANG'));
                                                
$lang_node->set_attribute('name', $val);
--- 220,225 ----
                                        foreach ($messages['message'] as $val)
                                        {
!                                               $translated = 
$this->_translate($val);
                                                
                                                $lang_node = 
createobject('api_xmltool',array('node_type'=>'node','name'=>'LANG'));
                                                
$lang_node->set_attribute('name', $val);

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4
*** class.phpgw.php     24 Oct 2003 22:09:44 -0000      1.1.1.1.2.3
--- class.phpgw.php     24 Oct 2003 23:17:43 -0000      1.1.1.1.2.4
***************
*** 95,103 ****
                        $this->acl      = createobject('api_acl');
  
-                       $this->apps = createobject('api_apps');
-                       $this->apps->fill_phpgw_data();
-                       
                        $this->prefs = createobject('api_prefs');
                        $this->prefs->fill_phpgw_data();
                }
                
--- 95,105 ----
                        $this->acl      = createobject('api_acl');
  
                        $this->prefs = createobject('api_prefs');
                        $this->prefs->fill_phpgw_data();
+ 
+                       $GLOBALS['lang']->switchlang();
+ 
+                       $this->apps = createobject('api_apps');
+                       $this->apps->fill_phpgw_data();                 
                }