Fixed cash only payment terms.

[fa-stable.git] / includes / lang / gettext.php

diff --git a/includes/lang/gettext.php b/includes/lang/gettext.php
index f2115a9aa95a17b46932072b77faab517d6554e8..3dc2e88df711bbbc0a2870f45dcf2ef9b40aece0 100644 (file)
--- a/includes/lang/gettext.php
+++ b/includes/lang/gettext.php
@@ -80,10 +80,13 @@ class gettext_native_support
                $lshort = strtr($up, '-','');
                $ushort = strtr($low, '-','');
 
-        $set = setlocale(LC_ALL, $lang_code.".".$encoding, 
-                       $lang_code.".".$up, $lang_code.".".$low,
-                       $lang_code.".".$ushort, $lang_code.".".$lshort);
-                       
+               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) 
         {
@@ -100,20 +103,21 @@ class gettext_native_support
         */
        function check_support($lang_code, $encoding)
     {
-               $old = setlocale(LC_MESSAGES, '0');
+
+               $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_MESSAGES,
+        $test = setlocale(LC_ALL,
                        $lang_code.".".$encoding, 
                        $lang_code.".".$up,
                        $lang_code.".".$low,
                        $lang_code.".".$ushort,
                        $lang_code.".".$lshort) !== false;
-
-               setlocale(LC_MESSAGES, $old);
+               setlocale(LC_ALL, $old);
+               setlocale(LC_NUMERIC, 'C');
                return $test;
        }
     /**
@@ -123,6 +127,8 @@ class gettext_native_support
     {
         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.
@@ -528,9 +534,14 @@ 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;
 
+       $_SESSION['get_text']->add_domain($_SESSION['language']->code,
+               $path_to_root . ($path ? '/' : '') .$path.'/lang',
+               $path ? '' : $_SESSION['language']->version);
+}
 ?>