Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile

[quix0rs-gnu-social.git] / extlib / php-gettext / gettext.inc

diff --git a/extlib/php-gettext/gettext.inc b/extlib/php-gettext/gettext.inc
index eb94b256a6bed0b73b56d8d628871df8f0f3fabe..7c95e40ec226660cf4e314de34fb3344ddad8ac4 100644 (file)
--- a/extlib/php-gettext/gettext.inc
+++ b/extlib/php-gettext/gettext.inc
@@ -129,7 +129,7 @@ function _setlocale($category, $locale) {
         $ret = 0;
         if (function_exists('setlocale')) // I don't know if this ever happens ;)
            $ret = setlocale($category, $locale);
-        if (($ret and $locale == '') or ($ret == $locale)) {
+        if ($ret and ($locale == '' or $ret == $locale)) {
             $EMULATEGETTEXT = 0;
             $CURRENTLOCALE = $ret;
         } else {
@@ -148,9 +148,9 @@ function _setlocale($category, $locale) {
  */
 function _bindtextdomain($domain, $path) {
        global $text_domains;
-       // ensure $path ends with a slash
-       if ($path[strlen($path) - 1] != '/') $path .= '/';
-       elseif ($path[strlen($path) - 1] != '\\') $path .= '\\';
+       // ensure $path ends with a slash
+       if ($path[strlen($path) - 1] != '/') $path .= '/';
+       elseif ($path[strlen($path) - 1] != '\\') $path .= '\\';
        $text_domains[$domain]->path = $path;
 }