[Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.48,1.49 class.common.inc.php,1.184,1.185

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.applications.inc.php class.common.inc.php 
Log Message:
removed lang call from class applications, since this caused an english only 
environment. app_title gets translated in function navbar or wherever its needed

Index: class.applications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.applications.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** class.applications.inc.php  15 Nov 2002 22:31:51 -0000      1.48
--- class.applications.inc.php  22 Nov 2002 02:27:20 -0000      1.49
***************
*** 1,25 ****
  <?php
!   /**************************************************************************\
!   * phpGroupWare API - Applications manager functions                        *
!   * This file written by Mark Peters <address@hidden>              *
!   * Copyright (C) 2001 Mark Peters                                           *
!   * -------------------------------------------------------------------------*
!   * This library is part of the phpGroupWare API                             *
!   * http://www.phpgroupware.org/api                                          
* 
!   * ------------------------------------------------------------------------ *
!   * This library is free software; you can redistribute it and/or modify it  *
!   * under the terms of the GNU Lesser General Public License as published by *
!   * the Free Software Foundation; either version 2.1 of the License,         *
!   * or any later version.                                                    *
!   * This library is distributed in the hope that it will be useful, but      *
!   * WITHOUT ANY WARRANTY; without even the implied warranty of               *
!   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
!   * See the GNU Lesser General Public License for more details.              *
!   * You should have received a copy of the GNU Lesser General Public License *
!   * along with this library; if not, write to the Free Software Foundation,  *
!   * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
!   \**************************************************************************/
! 
!   /* $Id$ */
        /*!
        @class applicatons
--- 1,24 ----
  <?php
!       
/**************************************************************************\
!       * phpGroupWare API - Applications manager functions                     
   *
!       * Written by Mark Peters <address@hidden>                        *
!       * Copyright (C) 2001 - 2002 Mark Peters                                 
   *
!       * 
------------------------------------------------------------------------ *
!       * This library is part of the phpGroupWare API                          
   *
!       * http://www.phpgroupware.org/api                                       
   * 
!       * 
------------------------------------------------------------------------ *
!       * This library is free software; you can redistribute it and/or modify 
it  *
!       * under the terms of the GNU Lesser General Public License as published 
by *
!       * the Free Software Foundation; either version 2.1 of the License,      
   *
!       * or any later version.                                                 
   *
!       * This library is distributed in the hope that it will be useful, but   
   *
!       * WITHOUT ANY WARRANTY; without even the implied warranty of            
   *
!       * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  
   *
!       * See the GNU Lesser General Public License for more details.           
   *
!       * You should have received a copy of the GNU Lesser General Public 
License *
!       * along with this library; if not, write to the Free Software 
Foundation,  *
!       * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA         
   *
!       
\**************************************************************************/
!       /* $Id$ */
        /*!
        @class applicatons
***************
*** 27,30 ****
--- 26,35 ----
        @discussion Author: skeeter
        */
+ 
+       /*
+               we should remove app_title from this class and always use the 
lang function 
+               to to translate app_name for in functions, where it is needed 
(ceb)
+       */
+ 
        class applications
        {
***************
*** 155,159 ****
                                while($app = each($apps))
                                {
!                                       $this->data[$app[1]] = array(
                                                'title'         => 
$GLOBALS['phpgw_info']['apps'][$app[1]]['title'],
                                                'name'          => $app[1],
--- 160,165 ----
                                while($app = each($apps))
                                {
!                                       $this->data[$app[1]] = array
!                                       (
                                                'title'         => 
$GLOBALS['phpgw_info']['apps'][$app[1]]['title'],
                                                'name'          => $app[1],
***************
*** 167,171 ****
                        elseif(gettype($apps))
                        {
!                               $this->data[$apps] = array(
                                        'title'         => 
$GLOBALS['phpgw_info']['apps'][$apps]['title'],
                                        'name'          => $apps,
--- 173,178 ----
                        elseif(gettype($apps))
                        {
!                               $this->data[$apps] = array
!                               (
                                        'title'         => 
$GLOBALS['phpgw_info']['apps'][$apps]['title'],
                                        'name'          => $apps,
***************
*** 264,268 ****
                                if ($this->is_system_enabled($app[1]))
                                {
!                                       $this->data[$app[1]] = array(
                                                'title'         => 
$GLOBALS['phpgw_info']['apps'][$app[1]]['title'],
                                                'name'          => $app[1],
--- 271,276 ----
                                if ($this->is_system_enabled($app[1]))
                                {
!                                       $this->data[$app[1]] = array
!                                       (
                                                'title'         => 
$GLOBALS['phpgw_info']['apps'][$app[1]]['title'],
                                                'name'          => $app[1],
***************
*** 295,300 ****
                                        
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array
                                        (
!                                               //'title'       => 
str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))),
!                                               'title'         => 
lang($this->db->f('app_name')),
                                                'name'          => 
$this->db->f('app_name'),
                                                'enabled'       => True,
--- 303,307 ----
                                        
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array
                                        (
!                                               'title'         => 
$this->db->f('app_name'),
                                                '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.184
retrieving revision 1.185
diff -C2 -r1.184 -r1.185
*** class.common.inc.php        18 Nov 2002 22:08:15 -0000      1.184
--- class.common.inc.php        22 Nov 2002 02:27:20 -0000      1.185
***************
*** 1389,1393 ****
                                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;
--- 1389,1393 ----
                                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;