[Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.45,1.45.2.1 functions.inc.php,1.121.2.12,1.121.2.13

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.applications.inc.php functions.inc.php 
Log Message:
moved generation and translation of app-title into applications-class

Index: class.applications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.applications.inc.php,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C2 -r1.45 -r1.45.2.1
*** class.applications.inc.php  13 Dec 2001 06:23:42 -0000      1.45
--- class.applications.inc.php  22 Mar 2003 12:10:26 -0000      1.45.2.1
***************
*** 289,294 ****
                                while ($this->db->next_record())
                                {
                                        
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array(
!                                               'title'   => 
$this->db->f('app_title'),
                                                'name'    => 
$this->db->f('app_name'),
                                                'enabled' => True,
--- 289,304 ----
                                while ($this->db->next_record())
                                {
+                                       $title = $this->db->f('app_title');
+                                       if (empty($title))
+                                       {
+                                               $title = 
$this->db->f('app_name');      // HEAD apps dont have a title anymore
+                                       }
+                                       if 
(@is_array($GLOBALS['phpgw_info']['user']['preferences']) && 
+                                           ($t = lang($title)) != $title.'*')
+                                       {
+                                               $title = $t;
+                                       }
                                        
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array(
!                                               'title'   => $title,
                                                'name'    => 
$this->db->f('app_name'),
                                                'enabled' => True,

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.12
retrieving revision 1.121.2.13
diff -C2 -r1.121.2.12 -r1.121.2.13
*** functions.inc.php   21 Sep 2002 21:51:34 -0000      1.121.2.12
--- functions.inc.php   22 Mar 2003 12:10:26 -0000      1.121.2.13
***************
*** 896,899 ****
--- 896,901 ----
                        $GLOBALS['phpgw']->datetime = 
CreateObject('phpgwapi.datetime');
                }
+               $GLOBALS['phpgw']->applications->read_installed_apps(); // to 
get translated app-titles
+               
                
/*************************************************************************\
                * Load the header unless the developer turns it off             
          *