[Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.49,1.50 class.common.inc.php,1.192,1.193 functions.inc.php,1.164,1.165

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.applications.inc.php class.common.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.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** class.applications.inc.php  22 Nov 2002 02:27:20 -0000      1.49
--- class.applications.inc.php  22 Mar 2003 12:29:23 -0000      1.50
***************
*** 21,24 ****
--- 21,25 ----
        
\**************************************************************************/
        /* $Id$ */
+ 
        /*!
        @class applicatons
***************
*** 301,307 ****
                                while ($this->db->next_record())
                                {
                                        
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array
                                        (
!                                               'title'         => 
$this->db->f('app_name'),
                                                'name'          => 
$this->db->f('app_name'),
                                                'enabled'       => True,
--- 302,314 ----
                                while ($this->db->next_record())
                                {
+                                       $title = $this->db->f('app_name');
+                                       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: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -r1.192 -r1.193
*** class.common.inc.php        21 Mar 2003 00:46:55 -0000      1.192
--- class.common.inc.php        22 Mar 2003 12:29:23 -0000      1.193
***************
*** 1260,1264 ****
                                        (
                                                'icon'                  => 
$data['icon'],
!                                               'title'                 => 
$data['title'],
                                                'img_src_over'  => 
$data['icon_hover'],
                                                'url'                   => 
$data['url'],
--- 1260,1264 ----
                                        (
                                                'icon'                  => 
$data['icon'],
!                                               'title'                 => 
$GLOBALS['phpgw_info']['apps'][$app]['title'],
                                                'img_src_over'  => 
$data['icon_hover'],
                                                'url'                   => 
$data['url'],
***************
*** 1385,1389 ****
                                if 
($GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 && 
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 3)
                                {
!                                       
$GLOBALS['phpgw_info']['navbar'][$app]['title'] = lang($data['title']);
                                        
$GLOBALS['phpgw_info']['navbar'][$app]['url']   = $GLOBALS['phpgw']->link('/' . 
$app . '/index.php');
                                        
$GLOBALS['phpgw_info']['navbar'][$app]['name']  = $app;
--- 1385,1389 ----
                                if 
($GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 && 
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 3)
                                {
!                                       
$GLOBALS['phpgw_info']['navbar'][$app]['title'] = $data['title'];
                                        
$GLOBALS['phpgw_info']['navbar'][$app]['url']   = $GLOBALS['phpgw']->link('/' . 
$app . '/index.php');
                                        
$GLOBALS['phpgw_info']['navbar'][$app]['name']  = $app;

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -r1.164 -r1.165
*** functions.inc.php   4 Jan 2003 00:54:55 -0000       1.164
--- functions.inc.php   22 Mar 2003 12:29:23 -0000      1.165
***************
*** 352,355 ****
--- 352,356 ----
                /* This will make sure that a user has the basic default prefs. 
If not it will add them */
                $GLOBALS['phpgw']->preferences->verify_basic_settings();
+               $GLOBALS['phpgw']->applications->read_installed_apps(); // to 
get translated app-titles
  
                /********* Optional classes, which can be disabled for 
performance increases *********/