[Phpgroupware-cvs] [18484] missing files from merge

[Dave Hall]

Revision: 18484
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18484
Author:   skwashd
Date:     2008-02-15 12:57:19 +0000 (Fri, 15 Feb 2008)

Log Message:
-----------
missing files from merge

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.setup_translation.inc.php

Modified: trunk/phpgwapi/inc/class.setup_translation.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.setup_translation.inc.php  2008-02-14 11:57:25 UTC 
(rev 18483)
+++ trunk/phpgwapi/inc/class.setup_translation.inc.php  2008-02-15 12:57:19 UTC 
(rev 18484)
@@ -10,15 +10,8 @@
        * @version $Id$
        */
 
-       if (!defined('MAX_MESSAGE_ID_LENGTH'))
-       {
-               /**
-               * Maximum message id length
-               */
-               define('MAX_MESSAGE_ID_LENGTH',230);
-       }
+       phpgw::import_class('phpgwapi.translation');
 
-
        /**
        * Setup translation - Handles multi-language support using flat files
        * 
@@ -48,16 +41,16 @@
                        $strings = $this->parse_lang_file($fn, $this->userlang);
 
                        if ( !is_array($strings) || !count($strings) )
-                                       {
+                       {
                                echo "Unable to load lang file: {$fn}<br>String 
won't be translated";
                                return;
-                                       }
+                       }
                        foreach ( $strings as $string )
                        {
                                $this->lang[strtolower($string['message_id'])] 
= $string['content'];
                        }
                }
-               
+
                /**
                * Populate shared memory with the available translation strings 
- disabled for setup
                */
@@ -66,7 +59,7 @@
                
                /**
                 * Translate phrase to user selected lang
-               *
+                *
                 * @param $key  phrase to translate
                 * @param $vars vars sent to lang function, passed to us
                 */