[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.45.2.
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.45.2.1.2.2,1.45.2.1.2.3 |
Date: |
Fri, 04 Apr 2003 22:21:34 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv30278
Modified Files:
Tag: Version-0_9_16-branch
class.applications.inc.php
Log Message:
give the title from the lang-file precedens over the untranslated one from the
depricated title field
Index: class.applications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.applications.inc.php,v
retrieving revision 1.45.2.1.2.2
retrieving revision 1.45.2.1.2.3
diff -C2 -r1.45.2.1.2.2 -r1.45.2.1.2.3
*** class.applications.inc.php 1 Apr 2003 01:37:33 -0000 1.45.2.1.2.2
--- class.applications.inc.php 5 Apr 2003 03:21:32 -0000 1.45.2.1.2.3
***************
*** 295,307 ****
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(
--- 295,309 ----
while ($this->db->next_record())
{
! $app_name = $this->db->f('app_name');
! $title = $this->db->f('app_title');
!
if
(@is_array($GLOBALS['phpgw_info']['user']['preferences']) &&
! ($t = lang($app_name)) !=
$app_name.'*')
{
$title = $t;
+ }
+ if (empty($title))
+ {
+ $title =
$this->db->f('app_name'); // HEAD apps dont have a title anymore
}
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array(
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.45.2.1.2.2,1.45.2.1.2.3,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.6,1.7 property.xsl,1.7,1.8
- Next by Date:
[Phpgroupware-cvs] CVS: developer_tools/setup phpgw_de.lang,1.1.2.1,1.1.2.1.2.1 phpgw_en.lang,1.5.2.1,1.5.2.1.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.6,1.7 property.xsl,1.7,1.8
- Next by thread:
[Phpgroupware-cvs] CVS: developer_tools/setup phpgw_de.lang,1.1.2.1,1.1.2.1.2.1 phpgw_en.lang,1.5.2.1,1.5.2.1.2.1
- Index(es):