[Phpgroupware-cvs] phpgwapi/inc functions.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/22 03:16:49

Modified files:
        inc            : functions.inc.php 

Log message:
        make lang() work properly when translations are available, forgot to 
remove the forced option :(

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/functions.inc.php?cvsroot=phpgwapi&r1=1.202&r2=1.203

Patches:
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -b -r1.202 -r1.203
--- functions.inc.php   22 Sep 2006 03:15:07 -0000      1.202
+++ functions.inc.php   22 Sep 2006 03:16:49 -0000      1.203
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: functions.inc.php,v 1.202 2006/09/22 03:15:07 skwashd 
Exp $
+       * @version $Id: functions.inc.php,v 1.203 2006/09/22 03:16:49 skwashd 
Exp $
        */
        
        
@@ -96,7 +96,7 @@
                {
                        $vars = array($m1,$m2,$m3,$m4,$m5,$m6,$m7,$m8,$m9,$m10);
                }
-               if ( true )//!isset($GLOBALS['phpgw']->translation) || 
!is_object($GLOBALS['phpgw']->translation) )
+               if ( !isset($GLOBALS['phpgw']->translation) || 
!is_object($GLOBALS['phpgw']->translation) )
                {
                        return sprintf( preg_replace('/(%\d)+/', '%s', $key),  
$m1, $m2, $m3, $m4, $m5, $m6, $m7, $m8, $m9, $m10) . ' *#*';
                }