phpmyadmin / motranslator

src/gettext.inc

Indentation +51 added lines, -51 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
+    define('LC_MESSAGES',	5);
 }
 
 
@@ -50,9 +50,9 @@ 
 
 /* Class to hold a single domain included in $text_domains. */
 class domain {
-  var $l10n;
-  var $path;
-  var $codeset;
+    var $l10n;
+    var $path;
+    var $codeset;
 }
 
 // Utility functions
@@ -61,50 +61,50 @@ 
  * Return a list of locales to try for any POSIX-style locale specification.
  */
 function get_list_of_locales($locale) {
-  /* Figure out all possible locale names and start with the most
+    /* Figure out all possible locale names and start with the most
    * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
    * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
    */
-  $locale_names = array();
-  $lang = NULL;
-  $country = NULL;
-  $charset = NULL;
-  $modifier = NULL;
-  if ($locale) {
+    $locale_names = array();
+    $lang = NULL;
+    $country = NULL;
+    $charset = NULL;
+    $modifier = NULL;
+    if ($locale) {
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
-                   $locale, $matches)) {
+                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
+                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
+                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+                    $locale, $matches)) {
 
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
+        if (isset($matches["lang"])) $lang = $matches["lang"];
+        if (isset($matches["country"])) $country = $matches["country"];
+        if (isset($matches["charset"])) $charset = $matches["charset"];
+        if (isset($matches["modifier"])) $modifier = $matches["modifier"];
 
-      if ($modifier) {
+        if ($modifier) {
         if ($country) {
-          if ($charset)
+            if ($charset)
             array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          array_push($locale_names, "${lang}_$country@$modifier");
+            array_push($locale_names, "${lang}_$country@$modifier");
         } elseif ($charset)
             array_push($locale_names, "${lang}.$charset@$modifier");
         array_push($locale_names, "$lang@$modifier");
-      }
-      if ($country) {
+        }
+        if ($country) {
         if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
+            array_push($locale_names, "${lang}_$country.$charset");
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
-      array_push($locale_names, $lang);
+        } elseif ($charset)
+            array_push($locale_names, "${lang}.$charset");
+        array_push($locale_names, $lang);
     }
 
     // If the locale name doesn't match POSIX style, just include it as-is.
     if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
-  }
-  return $locale_names;
+        array_push($locale_names, $locale);
+    }
+    return $locale_names;
 }
 
 /**
@@ -123,16 +123,16 @@ 
         $locale_names = get_list_of_locales($locale);
         $input = null;
         foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
-          if (file_exists($full_path)) {
+            $full_path = $bound_path . $locale . "/" . $subpath;
+            if (file_exists($full_path)) {
             $input = new FileReader($full_path);
             break;
-          }
+            }
         }
 
         if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
+            // Initialize an empty domain object.
+            $text_domains[$domain] = new domain();
         }
         $text_domains[$domain]->l10n = new MoTranslator\MoTranslator($input);
     }
@@ -164,9 +164,9 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
+    if ($locale == '') // emulate variable support
     return getenv('LANG');
-  else
+    else
     return $locale;
 }
 
@@ -184,20 +184,20 @@ 
             return _setlocale($category, $CURRENTLOCALE);
     } else {
         if (function_exists('setlocale')) {
-          $ret = setlocale($category, $locale);
-          if (($locale == '' and !$ret) or // failed setting it by env
+            $ret = setlocale($category, $locale);
+            if (($locale == '' and !$ret) or // failed setting it by env
               ($locale != '' and $ret != $locale)) { // failed setting it
             // Failed setting it according to environment.
             $CURRENTLOCALE = _get_default_locale($locale);
             $EMULATEGETTEXT = 1;
-          } else {
+            } else {
             $CURRENTLOCALE = $ret;
             $EMULATEGETTEXT = 0;
-          }
+            }
         } else {
-          // No function setlocale(), emulate it all.
-          $CURRENTLOCALE = _get_default_locale($locale);
-          $EMULATEGETTEXT = 1;
+            // No function setlocale(), emulate it all.
+            $CURRENTLOCALE = _get_default_locale($locale);
+            $EMULATEGETTEXT = 1;
         }
         // Allow locale to be changed on the go for one translation domain.
         global $text_domains, $default_domain;
@@ -215,15 +215,15 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (DIRECTORY_SEPARATOR == '\\') {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+        if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path)-1] != '/')
+        if ($path[strlen($path)-1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
+        // Initialize an empty domain object.
+        $text_domains[$domain] = new domain();
     }
     $text_domains[$domain]->path = $path;
 }
@@ -291,8 +291,8 @@ 
     return $l10n->gettext($msgid);
 }
 /**
- * Plural version of dcgettext.
- */
+     * Plural version of dcgettext.
+     */
 function _dcngettext($domain, $singular, $plural, $number, $category) {
     $l10n = _get_reader($domain, $category);
     return $l10n->ngettext($singular, $plural, $number);

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
+  define('LC_MESSAGES', 5);
 }
 
 
@@ -74,7 +74,7 @@ 
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
                    $locale, $matches)) {
 
       if (isset($matches["lang"])) $lang = $matches["lang"];
@@ -110,7 +110,7 @@ 
 /**
  * Utility function to get a StreamReader for the given text domain.
  */
-function _get_reader($domain=null, $category=5) {
+function _get_reader($domain = null, $category = 5) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
     if (!isset($text_domains[$domain]->l10n)) {
@@ -118,7 +118,7 @@ 
         $locale = _setlocale(LC_MESSAGES, 0);
         $bound_path = isset($text_domains[$domain]->path) ?
           $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
+        $subpath = $LC_CATEGORIES[$category] . "/$domain.mo";
 
         $locale_names = get_list_of_locales($locale);
         $input = null;
@@ -150,7 +150,7 @@ 
 /**
  * Checks if the current locale is supported on this system.
  */
-function _check_locale_and_function($function=false) {
+function _check_locale_and_function($function = false) {
     global $EMULATEGETTEXT;
     if ($function and !function_exists($function))
         return false;
@@ -215,10 +215,10 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (DIRECTORY_SEPARATOR == '\\') {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path)-1] != '/')
+      if ($path[strlen($path) - 1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {

Braces +50 added lines, -29 removed lines

@@ -77,32 +77,45 @@ 
                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
                    $locale, $matches)) {
 
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
+      if (isset($matches["lang"])) {
+          $lang = $matches["lang"];
+      }
+      if (isset($matches["country"])) {
+          $country = $matches["country"];
+      }
+      if (isset($matches["charset"])) {
+          $charset = $matches["charset"];
+      }
+      if (isset($matches["modifier"])) {
+          $modifier = $matches["modifier"];
+      }
 
       if ($modifier) {
         if ($country) {
-          if ($charset)
-            array_push($locale_names, "${lang}_$country.$charset@$modifier");
+          if ($charset) {
+                      array_push($locale_names, "${lang}_$country.$charset@$modifier");
+          }
           array_push($locale_names, "${lang}_$country@$modifier");
-        } elseif ($charset)
-            array_push($locale_names, "${lang}.$charset@$modifier");
+        } elseif ($charset) {
+                    array_push($locale_names, "${lang}.$charset@$modifier");
+        }
         array_push($locale_names, "$lang@$modifier");
       }
       if ($country) {
-        if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
+        if ($charset) {
+                  array_push($locale_names, "${lang}_$country.$charset");
+        }
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
+      } elseif ($charset) {
+                array_push($locale_names, "${lang}.$charset");
+      }
       array_push($locale_names, $lang);
     }
 
     // If the locale name doesn't match POSIX style, just include it as-is.
-    if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
+    if (!in_array($locale, $locale_names)) {
+          array_push($locale_names, $locale);
+    }
   }
   return $locale_names;
 }
@@ -112,7 +125,9 @@ 
  */
 function _get_reader($domain=null, $category=5) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($domain)) {
+        $domain = $default_domain;
+    }
     if (!isset($text_domains[$domain]->l10n)) {
         // get the current locale
         $locale = _setlocale(LC_MESSAGES, 0);
@@ -152,8 +167,9 @@ 
  */
 function _check_locale_and_function($function=false) {
     global $EMULATEGETTEXT;
-    if ($function and !function_exists($function))
-        return false;
+    if ($function and !function_exists($function)) {
+            return false;
+    }
     return !$EMULATEGETTEXT;
 }
 
@@ -164,11 +180,13 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
+  if ($locale == '') {
+      // emulate variable support
     return getenv('LANG');
-  else
-    return $locale;
-}
+  } else {
+      return $locale;
+  }
+  }
 
 /**
  * Sets a requested locale, if needed emulates it.
@@ -176,12 +194,13 @@ 
 function _setlocale($category, $locale) {
     global $CURRENTLOCALE, $EMULATEGETTEXT;
     if ($locale === 0) { // use === to differentiate between string "0"
-        if ($CURRENTLOCALE != '')
-            return $CURRENTLOCALE;
-        else
-            // obey LANG variable, maybe extend to support all of LC_* vars
+        if ($CURRENTLOCALE != '') {
+                    return $CURRENTLOCALE;
+        } else {
+                    // obey LANG variable, maybe extend to support all of LC_* vars
             // even if we tried to read locale without setting it first
             return _setlocale($category, $CURRENTLOCALE);
+        }
     } else {
         if (function_exists('setlocale')) {
           $ret = setlocale($category, $locale);
@@ -215,11 +234,13 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (DIRECTORY_SEPARATOR == '\\') {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
-        $path .= '\\';
+      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/') {
+              $path .= '\\';
+      }
     } else {
-      if ($path[strlen($path)-1] != '/')
-        $path .= '/';
+      if ($path[strlen($path)-1] != '/') {
+              $path .= '/';
+      }
     }
     if (!array_key_exists($domain, $text_domains)) {
       // Initialize an empty domain object.

src/MoLoader.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
             if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
                 ."(?:_(?P<country>[A-Z]{2}))?"           // country code
                 ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+                ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
                 $locale, $matches)) {
 
                 extract($matches);
@@ -94,7 +94,7 @@ 
         return $locale_names;
     }
 
-    public function get_translator($domain='')
+    public function get_translator($domain = '')
     {
         if (empty($domain)) {
             $domain = $this->default_domain;

Braces +3 added lines, -2 removed lines

@@ -71,8 +71,9 @@
                             array_push($locale_names, "${lang}_$country.$charset@$modifier");
                         }
                         array_push($locale_names, "${lang}_$country@$modifier");
-                    } elseif ($charset)
-                        array_push($locale_names, "${lang}.$charset@$modifier");
+                    } elseif ($charset) {
+                                            array_push($locale_names, "${lang}.$charset@$modifier");
+                    }
                         array_push($locale_names, "$lang@$modifier");
                     }
                 if ($country) {