X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Flang%2Fgettext.php;h=72f246001c8ac6304f63f191a283d672c9ef8ec7;hb=8f9265a8c89570c7815998dce800b5145dcf160e;hp=cc2f04d02a8ec1ccea44affff70c5620b9639152;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/includes/lang/gettext.php b/includes/lang/gettext.php
index cc2f04d0..72f24600 100644
--- a/includes/lang/gettext.php
+++ b/includes/lang/gettext.php
@@ -26,24 +26,24 @@ define('GETTEXT_NATIVE', 1);
 define('GETTEXT_PHP', 2);
 
 function get_text_init($managerType = GETTEXT_NATIVE) {
-
-	if (!isset($_SESSION['get_text'])) {
+	global $GetText;
+	if (!isset($GetText)) {
 
         if ($managerType == GETTEXT_NATIVE) 
         {
             if (function_exists('gettext')) 
             {
-                $_SESSION['get_text'] = new gettext_native_support();
+                $GetText = new gettext_native_support();
                 return;
             }
         }
         // fail back to php support 
-		$_SESSION['get_text'] = new gettext_php_support();
+		$GetText = new gettext_php_support();
 	}
 }
 
 function raise_error($str) {
-//	echo "$str";
+	error_log($str);
 	return 1;
 }
 
@@ -60,6 +60,7 @@ function is_error($err) {
 class gettext_native_support 
 {
     var $_interpolation_vars = array();
+    var $domain_path;
 
     /**
      * Set gettext language code.
@@ -73,10 +74,25 @@ class gettext_native_support
 
         //$set = setlocale(LC_ALL, "$lang_code");
         //$set = setlocale(LC_ALL, "$encoding");
-        $set = setlocale(LC_ALL, $lang_code.".".$encoding);
+
+		// cover a couple of country/encoding variants 
+		$up = strtoupper($encoding);
+		$low = strtolower($encoding);
+		$lshort = strtr($up, '-','');
+		$ushort = strtr($low, '-','');
+
+		if ($lang_code == 'C')
+			$set = setlocale(LC_ALL,'C');
+		else
+        	$set = setlocale(LC_ALL, $lang_code.".".$encoding, 
+				$lang_code.".".$up, $lang_code.".".$low,
+				$lang_code.".".$ushort,	$lang_code.".".$lshort);
+
         setlocale(LC_NUMERIC, 'C'); // important for numeric presentation etc.
         if ($set === false) 
         {
+			if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') // don't do this test if server is WIN
+				return 0;
             $str = sprintf('language code "%s", encoding "%s" not supported by your system',
                 $lang_code, $encoding);
             //$err = new GetText_Error($str);
@@ -85,24 +101,51 @@ class gettext_native_support
         }
 		//return 0;
     }
-    
+    /**
+	 *	Check system support for given language nedded for gettext.
+	 */
+	function check_support($lang_code, $encoding)
+    {
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') // don't do this test if server is WIN
+			return true;
+		$old = setlocale(LC_CTYPE, '0'); // LC_MESSAGES does not exist on Win
+		$up = strtoupper($encoding);
+		$low = strtolower($encoding);
+		$lshort = strtr($up, '-','');
+		$ushort = strtr($low, '-','');
+
+        $test = setlocale(LC_ALL,
+			$lang_code.".".$encoding, 
+			$lang_code.".".$up,
+			$lang_code.".".$low,
+			$lang_code.".".$ushort,
+			$lang_code.".".$lshort) !== false;
+		setlocale(LC_ALL, $old);
+		setlocale(LC_NUMERIC, 'C');
+		return $test;
+	}
     /**
      * Add a translation domain.
      */
-    function add_domain($domain, $path=false)
+    function add_domain($domain, $path=false, $version='')
     {
         if ($path === false) 
-        {
-            bindtextdomain($domain, "./locale/");
-        } 
-        else 
-        { 
-            bindtextdomain($domain, $path);
-        }
+	        $path = $this->domain_path;
+        if ($path === false) 
+	        $path = "./locale";
+	    if ($domain == "")
+	    	$domain = "?";
+		if ($version) {
+	// To avoid need for apache server restart after change of *.mo file
+	// we have to include file version as part of filename.
+	// This is alternative naming convention: $domain = $version.'/'.$domain;
+			$domain .= '-'.$version;
+		}
+        bindtextdomain($domain, $path);
         //bind_textdomain_codeset($domain, $encoding);
         textdomain($domain);
     }
-    
+
     /**
      * Retrieve translation for specified key.
      *
@@ -147,7 +190,7 @@ class gettext_native_support
      */
     function gettext($key)
     {
-        $value = $this->_get_translation($key);
+    	$value = $this->_get_translation($key);
         if ($value === false) {
             $str = sprintf('Unable to locate gettext key "%s"', $key);
             //$err = new GetText_Error($str);
@@ -242,7 +285,13 @@ class gettext_php_support extends gettext_native_support
             }            
         }
     }
-    
+    /**
+	 *	Check system support for given language (dummy).
+	 */
+	function check_support($lang_code, $encoding)
+    {
+		return true;
+    }
     /**
      * Add a translation domain.
      *
@@ -250,8 +299,17 @@ class gettext_php_support extends gettext_native_support
      * @param string $path optional -- Repository path
      * @throws GetText_Error
      */
-    function add_domain($domain, $path = "./locale/")
+    function add_domain($domain, $path = false, $version ='')
     {   
+        if ($path === false) 
+	      $path = $this->domain_path;
+        if ($path === false) 
+	        $path = "./locale";
+
+    	if ($version) {
+			$domain .= '-'.$version;
+		}
+
         if (array_key_exists($domain, $this->_domains)) 
         { 
             return; 
@@ -262,7 +320,10 @@ class gettext_php_support extends gettext_native_support
             $this->_jobs[] = array($domain, $path); 
             return;
         }
-
+        // Don't fill the domains with false data, it increased the error.log
+       	if (strpos($domain, $this->_lang_code) === false)
+        	return;
+ 
         $err = $this->_load_domain($domain, $path);
         if ($err != 0) 
         {
@@ -299,7 +360,6 @@ class gettext_php_support extends gettext_native_support
         $d = new gettext_domain();
         $d->name = $domain;
         $d->path = $path;
-        
         if (!file_exists($php_domain) || (filemtime($php_domain) < filemtime($src_domain))) 
         {
             
@@ -416,6 +476,7 @@ class gettext_php_support_parser
      */
     function _parse_line($line, $nbr)
     {
+        $line = str_replace("\\\"", "'", $line); // Should be inside preg_match, but I couldn't find the solution. This works.
         if (preg_match('/^\s*?#/', $line)) { return; }
         if (preg_match('/^\s*?msgid \"(.*?)(?!<\\\)\"/', $line, $m)) {
             $this->_store_key();
@@ -487,9 +548,25 @@ class gettext_php_support_compiler
     }
 }
 
-/**
-* get_text related error.
+/*
+	Set current gettext domain path
 */
-//class GetText_Error extends PEAR_Error {}
+function set_ext_domain($path='') {
+	global $path_to_root, $GetText;
+	static $domain_stack = array('');
+
+	if ($path)	// save path on domain stack
+		array_unshift($domain_stack,  $path);
+	else
+	{
+		array_shift($domain_stack);
+		$path = $domain_stack[0];
+	}
 
+	$lang_path = $path_to_root . ($path ? '/' : '') .$path.'/lang';
+	// ignore change when extension does not provide translation structure and test for valid gettext.
+	if (file_exists($lang_path) && isset($GetText))
+		$GetText->add_domain($_SESSION['language']->code,
+			$lang_path, $path ? '' : $_SESSION['language']->version);
+}
 ?>