holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed lang call from class applications, since this caused an english only environment. app_title gets translated in function navbar or wherever its needed

Browse Source
This commit is contained in:
ceb 2002-11-22 02:27:20 +00:00
parent d70d75d745
commit 380db5df05
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
phpgwapi/inc/class.applications.inc.php
View File

@ -1,9 +1,9 @@
<?php <?php
/**************************************************************************\ /**************************************************************************\
* phpGroupWare API - Applications manager functions * * phpGroupWare API - Applications manager functions *
* This file written by Mark Peters <skeeter@phpgroupware.org> * * Written by Mark Peters <skeeter@phpgroupware.org> *
* Copyright (C) 2001 Mark Peters * * Copyright (C) 2001 - 2002 Mark Peters *
* -------------------------------------------------------------------------* * ------------------------------------------------------------------------ *
* This library is part of the phpGroupWare API * * This library is part of the phpGroupWare API *
* http://www.phpgroupware.org/api * * http://www.phpgroupware.org/api *
* ------------------------------------------------------------------------ * * ------------------------------------------------------------------------ *
@ -19,13 +19,18 @@
* along with this library; if not, write to the Free Software Foundation, * * along with this library; if not, write to the Free Software Foundation, *
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
/*! /*!
@class applicatons @class applicatons
@abstract functions for managing and installing apps @abstract functions for managing and installing apps
@discussion Author: skeeter @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 class applications
{ {
var $account_id; var $account_id;
@ -154,7 +159,8 @@
{ {
while($app = each($apps)) while($app = each($apps))
{ {
$this->data[$app[1]] = array( $this->data[$app[1]] = array
(
'title' => $GLOBALS['phpgw_info']['apps'][$app[1]]['title'], 'title' => $GLOBALS['phpgw_info']['apps'][$app[1]]['title'],
'name' => $app[1], 'name' => $app[1],
'enabled' => True, 'enabled' => True,
@ -166,7 +172,8 @@
} }
elseif(gettype($apps)) elseif(gettype($apps))
{ {
$this->data[$apps] = array( $this->data[$apps] = array
(
'title' => $GLOBALS['phpgw_info']['apps'][$apps]['title'], 'title' => $GLOBALS['phpgw_info']['apps'][$apps]['title'],
'name' => $apps, 'name' => $apps,
'enabled' => True, 'enabled' => True,
@ -263,7 +270,8 @@
{ {
if ($this->is_system_enabled($app[1])) if ($this->is_system_enabled($app[1]))
{ {
$this->data[$app[1]] = array( $this->data[$app[1]] = array
(
'title' => $GLOBALS['phpgw_info']['apps'][$app[1]]['title'], 'title' => $GLOBALS['phpgw_info']['apps'][$app[1]]['title'],
'name' => $app[1], 'name' => $app[1],
'enabled' => True, 'enabled' => True,
@ -294,8 +302,7 @@
{ {
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array $GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array
( (
//'title' => str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))), 'title' => $this->db->f('app_name'),
'title' => lang($this->db->f('app_name')),
'name' => $this->db->f('app_name'), 'name' => $this->db->f('app_name'),
'enabled' => True, 'enabled' => True,
'status' => $this->db->f('app_enabled'), 'status' => $this->db->f('app_enabled'),

2
phpgwapi/inc/class.common.inc.php
View File

@ -1388,7 +1388,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
if ($GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 && $GLOBALS['phpgw_info']['apps'][$app]['status'] != 3) 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]['title'] = lang($data['title']);
$GLOBALS['phpgw_info']['navbar'][$app]['url'] = $GLOBALS['phpgw']->link('/' . $app . '/index.php'); $GLOBALS['phpgw_info']['navbar'][$app]['url'] = $GLOBALS['phpgw']->link('/' . $app . '/index.php');
$GLOBALS['phpgw_info']['navbar'][$app]['name'] = $app; $GLOBALS['phpgw_info']['navbar'][$app]['name'] = $app;