Changeset 1526

Timestamp:

10/27/09 09:13:59 (15 years ago)

Author:

amuller

Message:

Ticket #622 - Removendo lang com xml/xsl descricao adicional no ticket

Location:

trunk/expressoMail1_2

Files:

• inc/class.functions.inc.php (modified) (1 diff)
• inc/load_lang.php (added)
• index.php (modified) (2 diffs)
• js/common_functions.js (modified) (1 diff)
• js/globals.js (modified) (2 diffs)
• js/xtools.js (deleted)
• setup/language.xsl (deleted)
• setup/phpgw_pt-br.xml (deleted)

trunk/expressoMail1_2/inc/class.functions.inc.php

@@ -99 +99 @@
                         return $response;
                 }
-
-                function getLang( $key )
-                {
-                        static $language = NULL;
-
-                        if ( ! $language )
-                        {
-                                $_SESSION[ 'debug' ][ 'init_t' ] = time( );
-                                $_SESSION[ 'debug' ][ 'init_m' ] = microtime( );
-
-                                $xml = new DOMDocument;
-                                $xml -> preserveWhiteSpace = false;
-                                $xml -> load( dirname( __FILE__ )
-                                        . '/../setup/phpgw_'
-                                        . $_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang']
-                                        . '.xml'
-                                );
-
-                                $xpath = new DOMXPath( $xml );
-
-                                $_key = 'key';
-                                $_lang = 'translation';
-
-                                $language = array( );
-                                foreach( $xml -> documentElement -> childNodes as $entry )
-                                        $language[ $xpath->query( $_key, $entry ) -> item( 0 ) -> nodeValue ] = $xpath->query( $_lang, $entry ) -> item( 0 ) -> nodeValue;
-
-                                $_SESSION[ 'debug' ][ 'end_t' ] = time( );
-                                $_SESSION[ 'debug' ][ 'end_m' ] = microtime( );
-                        }
-
-                        if ( array_key_exists( $key, $language ) )
-                                return $language[ $key ];
-                        else
-                                return ( $key . '*' );
+                function getLang($key){
+                        if ($_SESSION['phpgw_info']['expressomail']['lang'][$key])
+                                return $_SESSION['phpgw_info']['expressomail']['lang'][$key];
                 }
 

trunk/expressoMail1_2/index.php

@@ -16 +16 @@
         echo "<script type='text/javascript'>var template = '".$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set']."';</script>";
         echo "<script src='js/modal/modal.js'></script>";
-        echo "<script src='js/xtools.js?".$update_version."' type='text/javascript'></script>";
         echo "<script src='js/globals.js?".$update_version."' type='text/javascript'></script>";
         echo "<script src='js/sniff_browser.js?".$update_version."' type='text/javascript'></script>";
@@ -155 +154 @@
         // que é utilizada em diversas partes
         echo $obj -> getFilesJs("js/common_functions.js");
+        include("inc/load_lang.php"); 
 
         // INCLUDE these JS Files: 

trunk/expressoMail1_2/js/common_functions.js

@@ -90 +90 @@
 // Translate words and phrases using user language from eGroupware.
 function get_lang(_key) {
-        if ( ! array_lang )
-        {
-                array_lang = [ ];
-
-                var source = xtools.parse( 'setup/phpgw_pt-br.xml', 'setup/language.xsl' );
-
-                try
-                {
-                        var lang = document.createElement( 'script' );
-                                lang.appendChild( document.createTextNode( source ) );
-
-                        document.getElementsByTagName( 'head' ).item( 0 ).appendChild( lang );
-                }
-                catch( e )
-                {
-                        // IE don't run code above.
-                        eval( source );
-                }
-        }
         var key = _key.toLowerCase();
         if(array_lang[key])

trunk/expressoMail1_2/js/globals.js

@@ -13 +13 @@
 var sort_box_reverse = 1;
 var last_message_selected = '';
-var array_lang = false;//new Array();
+var array_lang = new Array();
 var cyrus_delimiter = '';
 var ccaddress_array = new Array();
@@ -44 +44 @@
 var divStatusBar = document.getElementById("divStatusBar");
 var denyFileExtensions = new Array('exe','com','reg','chm','cnf','hta','ins','jse','job','lnk','pif','src','scf','sct','shb','vbe','vbs','wsc','wsf','wsh','cer','its','mau','','mda','mar','mdz','prf','pst');
-var rootPath = document.location.toString();
-rootPath = rootPath.substr(0,rootPath.lastIndexOf('/'));
-var xtools = new XTools( rootPath );
+