Merging version 2.1 RC to main trunk.

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

diff --git a/includes/lang/gettext.php b/includes/lang/gettext.php
index 58bd1139d8ab4e40333d3188c05e84f5c91b7680..4c4f163396691c2314fb0e8e4ebbaa4406aa7421 100644 (file)
--- a/includes/lang/gettext.php
+++ b/includes/lang/gettext.php
@@ -94,9 +94,9 @@ class get_text
         } 
         elseif (!isset($support_obj)) 
         {
-            trigger_error("get_text not initialized !". endl.
+            trigger_error("get_text not initialized !". '\n'.
                "Please call get_text::init() before calling ".
-                "any get_text function !" . endl , E_USER_ERROR);
+                "any get_text function !" . '\n' , E_USER_ERROR);
         }
         return $support_obj;
     }
@@ -216,7 +216,7 @@ class get_text
 }
 
 function raise_error($str) {
-       //echo "$str";
+//     echo "$str";
        return 1;
 }
 
@@ -246,7 +246,7 @@ class gettext_native_support
         
         //$set = setlocale(LC_ALL, "$lang_code");
         //$set = setlocale(LC_ALL, "$encoding");
-        $set = setlocale(LC_ALL, "$lang_code.".".$encoding");
+        $set = setlocale(LC_ALL, $lang_code.".".$encoding);
         setlocale(LC_NUMERIC, 'C'); // important for numeric presentation etc.
         if ($set === false) 
         {