Normalized add_domain() params in native phpgettext classes
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Sat, 30 Oct 2010 13:34:18 +0000 (13:34 +0000)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Sat, 30 Oct 2010 13:34:18 +0000 (13:34 +0000)
includes/lang/gettext.php

index 3dc2e88df711bbbc0a2870f45dcf2ef9b40aece0..dfa778e32e07cc6ab84bdabb8453ca50c9da07f8 100644 (file)
@@ -60,6 +60,7 @@ function is_error($err) {
 class gettext_native_support 
 {
     var $_interpolation_vars = array();
+    var $domain_path;
 
     /**
      * Set gettext language code.
@@ -125,6 +126,8 @@ class gettext_native_support
      */
     function add_domain($domain, $path=false, $version='')
     {
+        if ($path === false) 
+               $path = $this->domain_path;
         if ($path === false) 
                $path = "./locale";
            if ($domain == "")
@@ -293,8 +296,13 @@ class gettext_php_support extends gettext_native_support
      * @param string $path optional -- Repository path
      * @throws GetText_Error
      */
-    function add_domain($domain, $path = "./locale/", $version ='')
+    function add_domain($domain, $path = false, $version ='')
     {   
+        if ($path === false) 
+             $path = $this->domain_path;
+        if ($path === false) 
+               $path = "./locale";
+
        if ($version) {
                        $domain .= '-'.$version;
                }