codysnider / tt-rss

lib/accept-to-gettext.php

Indentation +50 added lines, -50 removed lines

@@ -70,17 +70,17 @@ 
 /* not really important, this one; perhaps I could've put it inline with
  * the rest. */
 function find_match($curlscore,$curcscore,$curgtlang,$langval,$charval,
-                    $gtlang)
+					$gtlang)
 {
   if($curlscore < $langval) {
-    $curlscore=$langval;
-    $curcscore=$charval;
-    $curgtlang=$gtlang;
+	$curlscore=$langval;
+	$curcscore=$charval;
+	$curgtlang=$gtlang;
   } else if ($curlscore == $langval) {
-    if($curcscore < $charval) {
-      $curcscore=$charval;
-      $curgtlang=$gtlang;
-    }
+	if($curcscore < $charval) {
+	  $curcscore=$charval;
+	  $curgtlang=$gtlang;
+	}
   }
   return array($curlscore, $curcscore, $curgtlang);
 }
@@ -88,22 +88,22 @@ 
 function al2gt($gettextlangs, $mime) {
   /* default to "everything is acceptable", as RFC2616 specifies */
   $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
-      $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+	  $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
   $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
-      $_SERVER["HTTP_ACCEPT_CHARSET"]);
+	  $_SERVER["HTTP_ACCEPT_CHARSET"]);
   $alparts=@preg_split("/,/",$acceptLang);
   $acparts=@preg_split("/,/",$acceptChar);
   
   /* Parse the contents of the Accept-Language header.*/
   foreach($alparts as $part) {
-    $part=trim($part);
-    if(preg_match("/;/", $part)) {
-      $lang=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$lang[1]);
-      $alscores[$lang[0]]=$score[1];
-    } else {
-      $alscores[$part]=1;
-    }
+	$part=trim($part);
+	if(preg_match("/;/", $part)) {
+	  $lang=@preg_split("/;/",$part);
+	  $score=@preg_split("/=/",$lang[1]);
+	  $alscores[$lang[0]]=$score[1];
+	} else {
+	  $alscores[$part]=1;
+	}
   }
 
   /* Do the same for the Accept-Charset header. */
@@ -119,17 +119,17 @@ 
   $acscores["ISO-8859-1"]=2;
 
   foreach($acparts as $part) {
-    $part=trim($part);
-    if(preg_match("/;/", $part)) {
-      $cs=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$cs[1]);
-      $acscores[strtoupper($cs[0])]=$score[1];
-    } else {
-      $acscores[strtoupper($part)]=1;
-    }
+	$part=trim($part);
+	if(preg_match("/;/", $part)) {
+	  $cs=@preg_split("/;/",$part);
+	  $score=@preg_split("/=/",$cs[1]);
+	  $acscores[strtoupper($cs[0])]=$score[1];
+	} else {
+	  $acscores[strtoupper($part)]=1;
+	}
   }
   if($acscores["ISO-8859-1"]==2) {
-    $acscores["ISO-8859-1"]=(isset($acscores["*"])?$acscores["*"]:1);
+	$acscores["ISO-8859-1"]=(isset($acscores["*"])?$acscores["*"]:1);
   }
 
   /* 
@@ -142,31 +142,31 @@ 
   $curgtlang=NULL;
   foreach($gettextlangs as $gtlang) {
 
-    $tmp1=preg_replace("/\_/","-",$gtlang);
-    $tmp2=@preg_split("/\./",$tmp1);
-    $allang=strtolower($tmp2[0]);
-    $gtcs=strtoupper($tmp2[1]);
-    $noct=@preg_split("/-/",$allang);
+	$tmp1=preg_replace("/\_/","-",$gtlang);
+	$tmp2=@preg_split("/\./",$tmp1);
+	$allang=strtolower($tmp2[0]);
+	$gtcs=strtoupper($tmp2[1]);
+	$noct=@preg_split("/-/",$allang);
 
-    $testvals=array(
-         array(@$alscores[$allang], @$acscores[$gtcs]),
-     array(@$alscores[$noct[0]], @$acscores[$gtcs]),
-     array(@$alscores[$allang], @$acscores["*"]),
-     array(@$alscores[$noct[0]], @$acscores["*"]),
-     array(@$alscores["*"], @$acscores[$gtcs]),
-     array(@$alscores["*"], @$acscores["*"]));
+	$testvals=array(
+		 array(@$alscores[$allang], @$acscores[$gtcs]),
+	 array(@$alscores[$noct[0]], @$acscores[$gtcs]),
+	 array(@$alscores[$allang], @$acscores["*"]),
+	 array(@$alscores[$noct[0]], @$acscores["*"]),
+	 array(@$alscores["*"], @$acscores[$gtcs]),
+	 array(@$alscores["*"], @$acscores["*"]));
 
-    $found=FALSE;
-    foreach($testvals as $tval) {
-      if(!$found && isset($tval[0]) && isset($tval[1])) {
-        $arr=find_match($curlscore, $curcscore, $curgtlang, $tval[0],
-              $tval[1], $gtlang);
-        $curlscore=$arr[0];
-        $curcscore=$arr[1];
-        $curgtlang=$arr[2];
-    $found=TRUE;
-      }
-    }
+	$found=FALSE;
+	foreach($testvals as $tval) {
+	  if(!$found && isset($tval[0]) && isset($tval[1])) {
+		$arr=find_match($curlscore, $curcscore, $curgtlang, $tval[0],
+			  $tval[1], $gtlang);
+		$curlscore=$arr[0];
+		$curcscore=$arr[1];
+		$curgtlang=$arr[2];
+	$found=TRUE;
+	  }
+	}
   }
 
   /* We must re-parse the gettext-string now, since we may have found it

lib/gettext/gettext.inc

Indentation +244 added lines, -244 removed lines

@@ -74,38 +74,38 @@ 
   $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)) {
-
-      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");
-          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 ($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);
-    }
-
-    // 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 (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)) {
+
+	  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");
+		  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 ($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);
+	}
+
+	// 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;
 }
@@ -114,60 +114,60 @@ 
  * Utility function to get a StreamReader for the given text domain.
  */
 function _get_reader($domain=null, $category=5, $enable_cache=true) {
-    global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
-    if (!isset($text_domains[$domain]->l10n)) {
-        // get the current locale
-        $locale = _setlocale(LC_MESSAGES, 0);
-        $bound_path = isset($text_domains[$domain]->path) ?
-          $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
-
-        $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)) {
-            $input = new FileReader($full_path);
-            break;
-          }
-        }
-
-        if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
-        }
-        $text_domains[$domain]->l10n = new gettext_reader($input,
-                                                          $enable_cache);
-    }
-    return $text_domains[$domain]->l10n;
+	global $text_domains, $default_domain, $LC_CATEGORIES;
+	if (!isset($domain)) $domain = $default_domain;
+	if (!isset($text_domains[$domain]->l10n)) {
+		// get the current locale
+		$locale = _setlocale(LC_MESSAGES, 0);
+		$bound_path = isset($text_domains[$domain]->path) ?
+		  $text_domains[$domain]->path : './';
+		$subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
+
+		$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)) {
+			$input = new FileReader($full_path);
+			break;
+		  }
+		}
+
+		if (!array_key_exists($domain, $text_domains)) {
+		  // Initialize an empty domain object.
+		  $text_domains[$domain] = new domain();
+		}
+		$text_domains[$domain]->l10n = new gettext_reader($input,
+														  $enable_cache);
+	}
+	return $text_domains[$domain]->l10n;
 }
 
 /**
  * Returns whether we are using our emulated gettext API or PHP built-in one.
  */
 function locale_emulation() {
-    global $EMULATEGETTEXT;
-    return $EMULATEGETTEXT;
+	global $EMULATEGETTEXT;
+	return $EMULATEGETTEXT;
 }
 
 /**
  * Checks if the current locale is supported on this system.
  */
 function _check_locale_and_function($function=false) {
-    global $EMULATEGETTEXT;
-    if ($function and !function_exists($function))
-        return false;
-    return !$EMULATEGETTEXT;
+	global $EMULATEGETTEXT;
+	if ($function and !function_exists($function))
+		return false;
+	return !$EMULATEGETTEXT;
 }
 
 /**
  * Get the codeset for the given domain.
  */
 function _get_codeset($domain=null) {
-    global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
-    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
+	global $text_domains, $default_domain, $LC_CATEGORIES;
+	if (!isset($domain)) $domain = $default_domain;
+	return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
 /**
@@ -176,9 +176,9 @@ 
 function _encode($text) {
   $target_encoding = _get_codeset();
   if (function_exists("mb_detect_encoding")) {
-    $source_encoding = mb_detect_encoding($text);
-    if ($source_encoding != $target_encoding)
-      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+	$source_encoding = mb_detect_encoding($text);
+	if ($source_encoding != $target_encoding)
+	  $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
   }
   return $text;
 }
@@ -191,185 +191,185 @@ 
  */
 function _get_default_locale($locale) {
   if ($locale == '') // emulate variable support
-    return getenv('LANG');
+	return getenv('LANG');
   else
-    return $locale;
+	return $locale;
 }
 
 /**
  * Sets a requested locale, if needed emulates it.
  */
 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
-            // even if we tried to read locale without setting it first
-            return _setlocale($category, $CURRENTLOCALE);
-    } else {
-        if (function_exists('setlocale')) {
-          $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 {
-            $CURRENTLOCALE = $ret;
-            $EMULATEGETTEXT = 0;
-          }
-        } else {
-          // 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;
-        if (array_key_exists($default_domain, $text_domains)) {
-            unset($text_domains[$default_domain]->l10n);
-        }
-        return $CURRENTLOCALE;
-    }
+	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
+			// even if we tried to read locale without setting it first
+			return _setlocale($category, $CURRENTLOCALE);
+	} else {
+		if (function_exists('setlocale')) {
+		  $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 {
+			$CURRENTLOCALE = $ret;
+			$EMULATEGETTEXT = 0;
+		  }
+		} else {
+		  // 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;
+		if (array_key_exists($default_domain, $text_domains)) {
+			unset($text_domains[$default_domain]->l10n);
+		}
+		return $CURRENTLOCALE;
+	}
 }
 
 /**
  * Sets the path for a domain.
  */
 function _bindtextdomain($domain, $path) {
-    global $text_domains;
-    // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
-    if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
-        $path .= '\\';
-    } else {
-      if ($path[strlen($path)-1] != '/')
-        $path .= '/';
-    }
-    if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
-    }
-    $text_domains[$domain]->path = $path;
+	global $text_domains;
+	// ensure $path ends with a slash ('/' should work for both, but lets still play nice)
+	if (substr(php_uname(), 0, 7) == "Windows") {
+	  if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+		$path .= '\\';
+	} else {
+	  if ($path[strlen($path)-1] != '/')
+		$path .= '/';
+	}
+	if (!array_key_exists($domain, $text_domains)) {
+	  // Initialize an empty domain object.
+	  $text_domains[$domain] = new domain();
+	}
+	$text_domains[$domain]->path = $path;
 }
 
 /**
  * Specify the character encoding in which the messages from the DOMAIN message catalog will be returned.
  */
 function _bind_textdomain_codeset($domain, $codeset) {
-    global $text_domains;
-    $text_domains[$domain]->codeset = $codeset;
+	global $text_domains;
+	$text_domains[$domain]->codeset = $codeset;
 }
 
 /**
  * Sets the default domain.
  */
 function _textdomain($domain) {
-    global $default_domain;
-    $default_domain = $domain;
+	global $default_domain;
+	$default_domain = $domain;
 }
 
 /**
  * Lookup a message in the current domain.
  */
 function _gettext($msgid) {
-    $l10n = _get_reader();
-    return _encode($l10n->translate($msgid));
+	$l10n = _get_reader();
+	return _encode($l10n->translate($msgid));
 }
 
 /**
  * Alias for gettext.
  */
 function __($msgid) {
-    return _gettext($msgid);
+	return _gettext($msgid);
 }
 
 /**
  * Plural version of gettext.
  */
 function _ngettext($singular, $plural, $number) {
-    $l10n = _get_reader();
-    return _encode($l10n->ngettext($singular, $plural, $number));
+	$l10n = _get_reader();
+	return _encode($l10n->ngettext($singular, $plural, $number));
 }
 
 /**
  * Override the current domain.
  */
 function _dgettext($domain, $msgid) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->translate($msgid));
+	$l10n = _get_reader($domain);
+	return _encode($l10n->translate($msgid));
 }
 
 /**
  * Plural version of dgettext.
  */
 function _dngettext($domain, $singular, $plural, $number) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->ngettext($singular, $plural, $number));
+	$l10n = _get_reader($domain);
+	return _encode($l10n->ngettext($singular, $plural, $number));
 }
 
 /**
  * Overrides the domain and category for a single lookup.
  */
 function _dcgettext($domain, $msgid, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->translate($msgid));
+	$l10n = _get_reader($domain, $category);
+	return _encode($l10n->translate($msgid));
 }
 /**
  * Plural version of dcgettext.
  */
 function _dcngettext($domain, $singular, $plural, $number, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->ngettext($singular, $plural, $number));
+	$l10n = _get_reader($domain, $category);
+	return _encode($l10n->ngettext($singular, $plural, $number));
 }
 
 /**
  * Context version of gettext.
  */
 function _pgettext($context, $msgid) {
-    $l10n = _get_reader();
-    return _encode($l10n->pgettext($context, $msgid));
+	$l10n = _get_reader();
+	return _encode($l10n->pgettext($context, $msgid));
 }
 
 /**
  * Override the current domain in a context gettext call.
  */
 function _dpgettext($domain, $context, $msgid) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->pgettext($context, $msgid));
+	$l10n = _get_reader($domain);
+	return _encode($l10n->pgettext($context, $msgid));
 }
 
 /**
  * Overrides the domain and category for a single context-based lookup.
  */
 function _dcpgettext($domain, $context, $msgid, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->pgettext($context, $msgid));
+	$l10n = _get_reader($domain, $category);
+	return _encode($l10n->pgettext($context, $msgid));
 }
 
 /**
  * Context version of ngettext.
  */
 function _npgettext($context, $singular, $plural) {
-    $l10n = _get_reader();
-    return _encode($l10n->npgettext($context, $singular, $plural));
+	$l10n = _get_reader();
+	return _encode($l10n->npgettext($context, $singular, $plural));
 }
 
 /**
  * Override the current domain in a context ngettext call.
  */
 function _dnpgettext($domain, $context, $singular, $plural) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->npgettext($context, $singular, $plural));
+	$l10n = _get_reader($domain);
+	return _encode($l10n->npgettext($context, $singular, $plural));
 }
 
 /**
  * Overrides the domain and category for a plural context-based lookup.
  */
 function _dcnpgettext($domain, $context, $singular, $plural, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->npgettext($context, $singular, $plural));
+	$l10n = _get_reader($domain, $category);
+	return _encode($l10n->npgettext($context, $singular, $plural));
 }
 
 
@@ -380,99 +380,99 @@ 
 // custom impl otherwise.
 
 function T_setlocale($category, $locale) {
-    return _setlocale($category, $locale);
+	return _setlocale($category, $locale);
 }
 
 function T_bindtextdomain($domain, $path) {
-    if (_check_locale_and_function()) return bindtextdomain($domain, $path);
-    else return _bindtextdomain($domain, $path);
+	if (_check_locale_and_function()) return bindtextdomain($domain, $path);
+	else return _bindtextdomain($domain, $path);
 }
 function T_bind_textdomain_codeset($domain, $codeset) {
-    // bind_textdomain_codeset is available only in PHP 4.2.0+
-    if (_check_locale_and_function('bind_textdomain_codeset'))
-        return bind_textdomain_codeset($domain, $codeset);
-    else return _bind_textdomain_codeset($domain, $codeset);
+	// bind_textdomain_codeset is available only in PHP 4.2.0+
+	if (_check_locale_and_function('bind_textdomain_codeset'))
+		return bind_textdomain_codeset($domain, $codeset);
+	else return _bind_textdomain_codeset($domain, $codeset);
 }
 function T_textdomain($domain) {
-    if (_check_locale_and_function()) return textdomain($domain);
-    else return _textdomain($domain);
+	if (_check_locale_and_function()) return textdomain($domain);
+	else return _textdomain($domain);
 }
 function T_gettext($msgid) {
-    if (_check_locale_and_function()) return gettext($msgid);
-    else return _gettext($msgid);
+	if (_check_locale_and_function()) return gettext($msgid);
+	else return _gettext($msgid);
 }
 function T_($msgid) {
-    if (_check_locale_and_function()) return _($msgid);
-    return __($msgid);
+	if (_check_locale_and_function()) return _($msgid);
+	return __($msgid);
 }
 function T_ngettext($singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return ngettext($singular, $plural, $number);
-    else return _ngettext($singular, $plural, $number);
+	if (_check_locale_and_function())
+		return ngettext($singular, $plural, $number);
+	else return _ngettext($singular, $plural, $number);
 }
 function T_dgettext($domain, $msgid) {
-    if (_check_locale_and_function()) return dgettext($domain, $msgid);
-    else return _dgettext($domain, $msgid);
+	if (_check_locale_and_function()) return dgettext($domain, $msgid);
+	else return _dgettext($domain, $msgid);
 }
 function T_dngettext($domain, $singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return dngettext($domain, $singular, $plural, $number);
-    else return _dngettext($domain, $singular, $plural, $number);
+	if (_check_locale_and_function())
+		return dngettext($domain, $singular, $plural, $number);
+	else return _dngettext($domain, $singular, $plural, $number);
 }
 function T_dcgettext($domain, $msgid, $category) {
-    if (_check_locale_and_function())
-        return dcgettext($domain, $msgid, $category);
-    else return _dcgettext($domain, $msgid, $category);
+	if (_check_locale_and_function())
+		return dcgettext($domain, $msgid, $category);
+	else return _dcgettext($domain, $msgid, $category);
 }
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
-    if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
-    else return _dcngettext($domain, $singular, $plural, $number, $category);
+	if (_check_locale_and_function())
+	  return dcngettext($domain, $singular, $plural, $number, $category);
+	else return _dcngettext($domain, $singular, $plural, $number, $category);
 }
 
 function T_pgettext($context, $msgid) {
   if (_check_locale_and_function('pgettext'))
-      return pgettext($context, $msgid);
+	  return pgettext($context, $msgid);
   else
-      return _pgettext($context, $msgid);
+	  return _pgettext($context, $msgid);
 }
 
 function T_dpgettext($domain, $context, $msgid) {
   if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
+	  return dpgettext($domain, $context, $msgid);
   else
-      return _dpgettext($domain, $context, $msgid);
+	  return _dpgettext($domain, $context, $msgid);
 }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
   if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
+	  return dcpgettext($domain, $context, $msgid, $category);
   else
-      return _dcpgettext($domain, $context, $msgid, $category);
+	  return _dcpgettext($domain, $context, $msgid, $category);
 }
 
 function T_npgettext($context, $singular, $plural, $number) {
-    if (_check_locale_and_function('npgettext'))
-        return npgettext($context, $singular, $plural, $number);
-    else
-        return _npgettext($context, $singular, $plural, $number);
+	if (_check_locale_and_function('npgettext'))
+		return npgettext($context, $singular, $plural, $number);
+	else
+		return _npgettext($context, $singular, $plural, $number);
 }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
   if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
+	  return dnpgettext($domain, $context, $singular, $plural, $number);
   else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
+	  return _dnpgettext($domain, $context, $singular, $plural, $number);
 }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
-                       $number, $category) {
-    if (_check_locale_and_function('dcnpgettext'))
-        return dcnpgettext($domain, $context, $singular,
-                           $plural, $number, $category);
-    else
-        return _dcnpgettext($domain, $context, $singular,
-                            $plural, $number, $category);
+					   $number, $category) {
+	if (_check_locale_and_function('dcnpgettext'))
+		return dcnpgettext($domain, $context, $singular,
+						   $plural, $number, $category);
+	else
+		return _dcnpgettext($domain, $context, $singular,
+							$plural, $number, $category);
 }
 
 
@@ -480,56 +480,56 @@ 
 // Wrappers used as a drop in replacement for the standard gettext functions
 
 if (!function_exists('gettext')) {
-    function bindtextdomain($domain, $path) {
-        return _bindtextdomain($domain, $path);
-    }
-    function bind_textdomain_codeset($domain, $codeset) {
-        return _bind_textdomain_codeset($domain, $codeset);
-    }
-    function textdomain($domain) {
-        return _textdomain($domain);
-    }
-    function gettext($msgid) {
-        return _gettext($msgid);
-    }
-    function _($msgid) {
-        return __($msgid);
-    }
-    function ngettext($singular, $plural, $number) {
-        return _ngettext($singular, $plural, $number);
-    }
-    function dgettext($domain, $msgid) {
-        return _dgettext($domain, $msgid);
-    }
-    function dngettext($domain, $singular, $plural, $number) {
-        return _dngettext($domain, $singular, $plural, $number);
-    }
-    function dcgettext($domain, $msgid, $category) {
-        return _dcgettext($domain, $msgid, $category);
-    }
-    function dcngettext($domain, $singular, $plural, $number, $category) {
-        return _dcngettext($domain, $singular, $plural, $number, $category);
-    }
-    function pgettext($context, $msgid) {
-        return _pgettext($context, $msgid);
-    }
-    function npgettext($context, $singular, $plural, $number) {
-        return _npgettext($context, $singular, $plural, $number);
-    }
-    function dpgettext($domain, $context, $msgid) {
-        return _dpgettext($domain, $context, $msgid);
-    }
-    function dnpgettext($domain, $context, $singular, $plural, $number) {
-        return _dnpgettext($domain, $context, $singular, $plural, $number);
-    }
-    function dcpgettext($domain, $context, $msgid, $category) {
-        return _dcpgettext($domain, $context, $msgid, $category);
-    }
-    function dcnpgettext($domain, $context, $singular, $plural,
-                         $number, $category) {
-      return _dcnpgettext($domain, $context, $singular, $plural,
-                          $number, $category);
-    }
+	function bindtextdomain($domain, $path) {
+		return _bindtextdomain($domain, $path);
+	}
+	function bind_textdomain_codeset($domain, $codeset) {
+		return _bind_textdomain_codeset($domain, $codeset);
+	}
+	function textdomain($domain) {
+		return _textdomain($domain);
+	}
+	function gettext($msgid) {
+		return _gettext($msgid);
+	}
+	function _($msgid) {
+		return __($msgid);
+	}
+	function ngettext($singular, $plural, $number) {
+		return _ngettext($singular, $plural, $number);
+	}
+	function dgettext($domain, $msgid) {
+		return _dgettext($domain, $msgid);
+	}
+	function dngettext($domain, $singular, $plural, $number) {
+		return _dngettext($domain, $singular, $plural, $number);
+	}
+	function dcgettext($domain, $msgid, $category) {
+		return _dcgettext($domain, $msgid, $category);
+	}
+	function dcngettext($domain, $singular, $plural, $number, $category) {
+		return _dcngettext($domain, $singular, $plural, $number, $category);
+	}
+	function pgettext($context, $msgid) {
+		return _pgettext($context, $msgid);
+	}
+	function npgettext($context, $singular, $plural, $number) {
+		return _npgettext($context, $singular, $plural, $number);
+	}
+	function dpgettext($domain, $context, $msgid) {
+		return _dpgettext($domain, $context, $msgid);
+	}
+	function dnpgettext($domain, $context, $singular, $plural, $number) {
+		return _dnpgettext($domain, $context, $singular, $plural, $number);
+	}
+	function dcpgettext($domain, $context, $msgid, $category) {
+		return _dcpgettext($domain, $context, $msgid, $category);
+	}
+	function dcnpgettext($domain, $context, $singular, $plural,
+						 $number, $category) {
+	  return _dcnpgettext($domain, $context, $singular, $plural,
+						  $number, $category);
+	}
 }
 
 ?>

lib/gettext/streams.php

Indentation +64 added lines, -64 removed lines

@@ -26,22 +26,22 @@ 
 class StreamReader {
   // should return a string [FIXME: perhaps return array of bytes?]
   function read($bytes) {
-    return false;
+	return false;
   }
 
   // should return new position
   function seekto($position) {
-    return false;
+	return false;
   }
 
   // returns current position
   function currentpos() {
-    return false;
+	return false;
   }
 
   // returns length of entire stream (limit for seekto()s)
   function length() {
-    return false;
+	return false;
   }
 };
 
@@ -50,32 +50,32 @@ 
   var $_str;
 
   function StringReader($str='') {
-    $this->_str = $str;
-    $this->_pos = 0;
+	$this->_str = $str;
+	$this->_pos = 0;
   }
 
   function read($bytes) {
-    $data = substr($this->_str, $this->_pos, $bytes);
-    $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+	$data = substr($this->_str, $this->_pos, $bytes);
+	$this->_pos += $bytes;
+	if (strlen($this->_str)<$this->_pos)
+	  $this->_pos = strlen($this->_str);
 
-    return $data;
+	return $data;
   }
 
   function seekto($pos) {
-    $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
-    return $this->_pos;
+	$this->_pos = $pos;
+	if (strlen($this->_str)<$this->_pos)
+	  $this->_pos = strlen($this->_str);
+	return $this->_pos;
   }
 
   function currentpos() {
-    return $this->_pos;
+	return $this->_pos;
   }
 
   function length() {
-    return strlen($this->_str);
+	return strlen($this->_str);
   }
 
 };
@@ -87,55 +87,55 @@ 
   var $_length;
 
   function FileReader($filename) {
-    if (file_exists($filename)) {
+	if (file_exists($filename)) {
 
-      $this->_length=filesize($filename);
-      $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
-      if (!$this->_fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
+	  $this->_length=filesize($filename);
+	  $this->_pos = 0;
+	  $this->_fd = fopen($filename,'rb');
+	  if (!$this->_fd) {
+		$this->error = 3; // Cannot read file, probably permissions
+		return false;
+	  }
+	} else {
+	  $this->error = 2; // File doesn't exist
+	  return false;
+	}
   }
 
   function read($bytes) {
-    if ($bytes) {
-      fseek($this->_fd, $this->_pos);
+	if ($bytes) {
+	  fseek($this->_fd, $this->_pos);
 
-      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
-      // the discussions at PHP Bugs suggest it's the intended behaviour
-      $data = '';
-      while ($bytes > 0) {
-        $chunk  = fread($this->_fd, $bytes);
-        $data  .= $chunk;
-        $bytes -= strlen($chunk);
-      }
-      $this->_pos = ftell($this->_fd);
+	  // PHP 5.1.1 does not read more than 8192 bytes in one fread()
+	  // the discussions at PHP Bugs suggest it's the intended behaviour
+	  $data = '';
+	  while ($bytes > 0) {
+		$chunk  = fread($this->_fd, $bytes);
+		$data  .= $chunk;
+		$bytes -= strlen($chunk);
+	  }
+	  $this->_pos = ftell($this->_fd);
 
-      return $data;
-    } else return '';
+	  return $data;
+	} else return '';
   }
 
   function seekto($pos) {
-    fseek($this->_fd, $pos);
-    $this->_pos = ftell($this->_fd);
-    return $this->_pos;
+	fseek($this->_fd, $pos);
+	$this->_pos = ftell($this->_fd);
+	return $this->_pos;
   }
 
   function currentpos() {
-    return $this->_pos;
+	return $this->_pos;
   }
 
   function length() {
-    return $this->_length;
+	return $this->_length;
   }
 
   function close() {
-    fclose($this->_fd);
+	fclose($this->_fd);
   }
 
 };
@@ -144,22 +144,22 @@ 
 // over it (it assumes knowledge of StringReader internals)
 class CachedFileReader extends StringReader {
   function CachedFileReader($filename) {
-    if (file_exists($filename)) {
-
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
-
-      if (!$fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-      $this->_str = fread($fd, $length);
-      fclose($fd);
-
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
+	if (file_exists($filename)) {
+
+	  $length=filesize($filename);
+	  $fd = fopen($filename,'rb');
+
+	  if (!$fd) {
+		$this->error = 3; // Cannot read file, probably permissions
+		return false;
+	  }
+	  $this->_str = fread($fd, $length);
+	  fclose($fd);
+
+	} else {
+	  $this->error = 2; // File doesn't exist
+	  return false;
+	}
   }
 };
 

lib/gettext/gettext.php

Indentation +241 added lines, -241 removed lines

@@ -61,19 +61,19 @@ 
    * @return Integer from the Stream
    */
   function readint() {
-      if ($this->BYTEORDER == 0) {
-        // low endian
-        $input=unpack('V', $this->STREAM->read(4));
-        return array_shift($input);
-      } else {
-        // big endian
-        $input=unpack('N', $this->STREAM->read(4));
-        return array_shift($input);
-      }
-    }
+	  if ($this->BYTEORDER == 0) {
+		// low endian
+		$input=unpack('V', $this->STREAM->read(4));
+		return array_shift($input);
+	  } else {
+		// big endian
+		$input=unpack('N', $this->STREAM->read(4));
+		return array_shift($input);
+	  }
+	}
 
   function read($bytes) {
-    return $this->STREAM->read($bytes);
+	return $this->STREAM->read($bytes);
   }
 
   /**
@@ -83,13 +83,13 @@ 
    * @return Array of Integers
    */
   function readintarray($count) {
-    if ($this->BYTEORDER == 0) {
-        // low endian
-        return unpack('V'.$count, $this->STREAM->read(4 * $count));
-      } else {
-        // big endian
-        return unpack('N'.$count, $this->STREAM->read(4 * $count));
-      }
+	if ($this->BYTEORDER == 0) {
+		// low endian
+		return unpack('V'.$count, $this->STREAM->read(4 * $count));
+	  } else {
+		// big endian
+		return unpack('N'.$count, $this->STREAM->read(4 * $count));
+	  }
   }
 
   /**
@@ -99,35 +99,35 @@ 
    * @param boolean enable_cache Enable or disable caching of strings (default on)
    */
   function __construct($Reader, $enable_cache = true) {
-    // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader || isset($Reader->error) ) {
-      $this->short_circuit = true;
-      return;
-    }
-
-    // Caching can be turned off
-    $this->enable_cache = $enable_cache;
-
-    $MAGIC1 = "\x95\x04\x12\xde";
-    $MAGIC2 = "\xde\x12\x04\x95";
-
-    $this->STREAM = $Reader;
-    $magic = $this->read(4);
-    if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 1;
-    } elseif ($magic == $MAGIC2) {
-      $this->BYTEORDER = 0;
-    } else {
-      $this->error = 1; // not MO file
-      return false;
-    }
-
-    // FIXME: Do we care about revision? We should.
-    $revision = $this->readint();
-
-    $this->total = $this->readint();
-    $this->originals = $this->readint();
-    $this->translations = $this->readint();
+	// If there isn't a StreamReader, turn on short circuit mode.
+	if (! $Reader || isset($Reader->error) ) {
+	  $this->short_circuit = true;
+	  return;
+	}
+
+	// Caching can be turned off
+	$this->enable_cache = $enable_cache;
+
+	$MAGIC1 = "\x95\x04\x12\xde";
+	$MAGIC2 = "\xde\x12\x04\x95";
+
+	$this->STREAM = $Reader;
+	$magic = $this->read(4);
+	if ($magic == $MAGIC1) {
+	  $this->BYTEORDER = 1;
+	} elseif ($magic == $MAGIC2) {
+	  $this->BYTEORDER = 0;
+	} else {
+	  $this->error = 1; // not MO file
+	  return false;
+	}
+
+	// FIXME: Do we care about revision? We should.
+	$revision = $this->readint();
+
+	$this->total = $this->readint();
+	$this->originals = $this->readint();
+	$this->translations = $this->readint();
   }
 
   /**
@@ -138,32 +138,32 @@ 
    * @access private
    */
   function load_tables() {
-    if (is_array($this->cache_translations) &&
-      is_array($this->table_originals) &&
-      is_array($this->table_translations))
-      return;
-
-    /* get original and translations tables */
-    if (!is_array($this->table_originals)) {
-      $this->STREAM->seekto($this->originals);
-      $this->table_originals = $this->readintarray($this->total * 2);
-    }
-    if (!is_array($this->table_translations)) {
-      $this->STREAM->seekto($this->translations);
-      $this->table_translations = $this->readintarray($this->total * 2);
-    }
-
-    if ($this->enable_cache) {
-      $this->cache_translations = array ();
-      /* read all strings in the cache */
-      for ($i = 0; $i < $this->total; $i++) {
-        $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
-        $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
-        $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
-        $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
-        $this->cache_translations[$original] = $translation;
-      }
-    }
+	if (is_array($this->cache_translations) &&
+	  is_array($this->table_originals) &&
+	  is_array($this->table_translations))
+	  return;
+
+	/* get original and translations tables */
+	if (!is_array($this->table_originals)) {
+	  $this->STREAM->seekto($this->originals);
+	  $this->table_originals = $this->readintarray($this->total * 2);
+	}
+	if (!is_array($this->table_translations)) {
+	  $this->STREAM->seekto($this->translations);
+	  $this->table_translations = $this->readintarray($this->total * 2);
+	}
+
+	if ($this->enable_cache) {
+	  $this->cache_translations = array ();
+	  /* read all strings in the cache */
+	  for ($i = 0; $i < $this->total; $i++) {
+		$this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
+		$original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
+		$this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
+		$translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
+		$this->cache_translations[$original] = $translation;
+	  }
+	}
   }
 
   /**
@@ -174,13 +174,13 @@ 
    * @return string Requested string if found, otherwise ''
    */
   function get_original_string($num) {
-    $length = $this->table_originals[$num * 2 + 1];
-    $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
+	$length = $this->table_originals[$num * 2 + 1];
+	$offset = $this->table_originals[$num * 2 + 2];
+	if (! $length)
+	  return '';
+	$this->STREAM->seekto($offset);
+	$data = $this->STREAM->read($length);
+	return (string)$data;
   }
 
   /**
@@ -191,13 +191,13 @@ 
    * @return string Requested string if found, otherwise ''
    */
   function get_translation_string($num) {
-    $length = $this->table_translations[$num * 2 + 1];
-    $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
+	$length = $this->table_translations[$num * 2 + 1];
+	$offset = $this->table_translations[$num * 2 + 2];
+	if (! $length)
+	  return '';
+	$this->STREAM->seekto($offset);
+	$data = $this->STREAM->read($length);
+	return (string)$data;
   }
 
   /**
@@ -210,35 +210,35 @@ 
    * @return int string number (offset in originals table)
    */
   function find_string($string, $start = -1, $end = -1) {
-    if (($start == -1) or ($end == -1)) {
-      // find_string is called with only one parameter, set start end end
-      $start = 0;
-      $end = $this->total;
-    }
-    if (abs($start - $end) <= 1) {
-      // We're done, now we either found the string, or it doesn't exist
-      $txt = $this->get_original_string($start);
-      if ($string == $txt)
-        return $start;
-      else
-        return -1;
-    } else if ($start > $end) {
-      // start > end -> turn around and start over
-      return $this->find_string($string, $end, $start);
-    } else {
-      // Divide table in two parts
-      $half = (int)(($start + $end) / 2);
-      $cmp = strcmp($string, $this->get_original_string($half));
-      if ($cmp == 0)
-        // string is exactly in the middle => return it
-        return $half;
-      else if ($cmp < 0)
-        // The string is in the upper half
-        return $this->find_string($string, $start, $half);
-      else
-        // The string is in the lower half
-        return $this->find_string($string, $half, $end);
-    }
+	if (($start == -1) or ($end == -1)) {
+	  // find_string is called with only one parameter, set start end end
+	  $start = 0;
+	  $end = $this->total;
+	}
+	if (abs($start - $end) <= 1) {
+	  // We're done, now we either found the string, or it doesn't exist
+	  $txt = $this->get_original_string($start);
+	  if ($string == $txt)
+		return $start;
+	  else
+		return -1;
+	} else if ($start > $end) {
+	  // start > end -> turn around and start over
+	  return $this->find_string($string, $end, $start);
+	} else {
+	  // Divide table in two parts
+	  $half = (int)(($start + $end) / 2);
+	  $cmp = strcmp($string, $this->get_original_string($half));
+	  if ($cmp == 0)
+		// string is exactly in the middle => return it
+		return $half;
+	  else if ($cmp < 0)
+		// The string is in the upper half
+		return $this->find_string($string, $start, $half);
+	  else
+		// The string is in the lower half
+		return $this->find_string($string, $half, $end);
+	}
   }
 
   /**
@@ -249,24 +249,24 @@ 
    * @return string translated string (or original, if not found)
    */
   function translate($string) {
-    if ($this->short_circuit)
-      return $string;
-    $this->load_tables();
-
-    if ($this->enable_cache) {
-      // Caching enabled, get translated string from cache
-      if (array_key_exists($string, $this->cache_translations))
-        return $this->cache_translations[$string];
-      else
-        return $string;
-    } else {
-      // Caching not enabled, try to find string
-      $num = $this->find_string($string);
-      if ($num == -1)
-        return $string;
-      else
-        return $this->get_translation_string($num);
-    }
+	if ($this->short_circuit)
+	  return $string;
+	$this->load_tables();
+
+	if ($this->enable_cache) {
+	  // Caching enabled, get translated string from cache
+	  if (array_key_exists($string, $this->cache_translations))
+		return $this->cache_translations[$string];
+	  else
+		return $string;
+	} else {
+	  // Caching not enabled, try to find string
+	  $num = $this->find_string($string);
+	  if ($num == -1)
+		return $string;
+	  else
+		return $this->get_translation_string($num);
+	}
   }
 
   /**
@@ -276,32 +276,32 @@ 
    * @return string sanitized plural form expression
    */
   function sanitize_plural_expression($expr) {
-    // Get rid of disallowed characters.
-    $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
-
-    // Add parenthesis for tertiary '?' operator.
-    $expr .= ';';
-    $res = '';
-    $p = 0;
-    for ($i = 0; $i < strlen($expr); $i++) {
-      $ch = $expr[$i];
-      switch ($ch) {
-      case '?':
-        $res .= ' ? (';
-        $p++;
-        break;
-      case ':':
-        $res .= ') : (';
-        break;
-      case ';':
-        $res .= str_repeat( ')', $p) . ';';
-        $p = 0;
-        break;
-      default:
-        $res .= $ch;
-      }
-    }
-    return $res;
+	// Get rid of disallowed characters.
+	$expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
+
+	// Add parenthesis for tertiary '?' operator.
+	$expr .= ';';
+	$res = '';
+	$p = 0;
+	for ($i = 0; $i < strlen($expr); $i++) {
+	  $ch = $expr[$i];
+	  switch ($ch) {
+	  case '?':
+		$res .= ' ? (';
+		$p++;
+		break;
+	  case ':':
+		$res .= ') : (';
+		break;
+	  case ';':
+		$res .= str_repeat( ')', $p) . ';';
+		$p = 0;
+		break;
+	  default:
+		$res .= $ch;
+	  }
+	}
+	return $res;
   }
 
   /**
@@ -311,11 +311,11 @@ 
    * @return string verbatim plural form header field
    */
   function extract_plural_forms_header_from_po_header($header) {
-    if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
-      $expr = $regs[2];
-    else
-      $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
-    return $expr;
+	if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
+	  $expr = $regs[2];
+	else
+	  $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+	return $expr;
   }
 
   /**
@@ -325,21 +325,21 @@ 
    * @return string plural form header
    */
   function get_plural_forms() {
-    // lets assume message number 0 is header
-    // this is true, right?
-    $this->load_tables();
-
-    // cache header field for plural forms
-    if (! is_string($this->pluralheader)) {
-      if ($this->enable_cache) {
-        $header = $this->cache_translations[""];
-      } else {
-        $header = $this->get_translation_string(0);
-      }
-      $expr = $this->extract_plural_forms_header_from_po_header($header);
-      $this->pluralheader = $this->sanitize_plural_expression($expr);
-    }
-    return $this->pluralheader;
+	// lets assume message number 0 is header
+	// this is true, right?
+	$this->load_tables();
+
+	// cache header field for plural forms
+	if (! is_string($this->pluralheader)) {
+	  if ($this->enable_cache) {
+		$header = $this->cache_translations[""];
+	  } else {
+		$header = $this->get_translation_string(0);
+	  }
+	  $expr = $this->extract_plural_forms_header_from_po_header($header);
+	  $this->pluralheader = $this->sanitize_plural_expression($expr);
+	}
+	return $this->pluralheader;
   }
 
   /**
@@ -350,21 +350,21 @@ 
    * @return int array index of the right plural form
    */
   function select_string($n) {
-    if (!is_int($n)) {
-      throw new InvalidArgumentException(
-        "Select_string only accepts integers: " . $n);
-    }
-    $string = $this->get_plural_forms();
-    $string = str_replace('nplurals',"\$total",$string);
-    $string = str_replace("n",$n,$string);
-    $string = str_replace('plural',"\$plural",$string);
-
-    $total = 0;
-    $plural = 0;
-
-    eval("$string");
-    if ($plural >= $total) $plural = $total - 1;
-    return $plural;
+	if (!is_int($n)) {
+	  throw new InvalidArgumentException(
+		"Select_string only accepts integers: " . $n);
+	}
+	$string = $this->get_plural_forms();
+	$string = str_replace('nplurals',"\$total",$string);
+	$string = str_replace("n",$n,$string);
+	$string = str_replace('plural',"\$plural",$string);
+
+	$total = 0;
+	$plural = 0;
+
+	eval("$string");
+	if ($plural >= $total) $plural = $total - 1;
+	return $plural;
   }
 
   /**
@@ -377,58 +377,58 @@ 
    * @return translated plural form
    */
   function ngettext($single, $plural, $number) {
-    if ($this->short_circuit) {
-      if ($number != 1)
-        return $plural;
-      else
-        return $single;
-    }
-
-    // find out the appropriate form
-    $select = $this->select_string($number);
-
-    // this should contains all strings separated by NULLs
-    $key = $single . chr(0) . $plural;
-
-
-    if ($this->enable_cache) {
-      if (! array_key_exists($key, $this->cache_translations)) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->cache_translations[$key];
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    } else {
-      $num = $this->find_string($key);
-      if ($num == -1) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->get_translation_string($num);
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    }
+	if ($this->short_circuit) {
+	  if ($number != 1)
+		return $plural;
+	  else
+		return $single;
+	}
+
+	// find out the appropriate form
+	$select = $this->select_string($number);
+
+	// this should contains all strings separated by NULLs
+	$key = $single . chr(0) . $plural;
+
+
+	if ($this->enable_cache) {
+	  if (! array_key_exists($key, $this->cache_translations)) {
+		return ($number != 1) ? $plural : $single;
+	  } else {
+		$result = $this->cache_translations[$key];
+		$list = explode(chr(0), $result);
+		return $list[$select];
+	  }
+	} else {
+	  $num = $this->find_string($key);
+	  if ($num == -1) {
+		return ($number != 1) ? $plural : $single;
+	  } else {
+		$result = $this->get_translation_string($num);
+		$list = explode(chr(0), $result);
+		return $list[$select];
+	  }
+	}
   }
 
   function pgettext($context, $msgid) {
-    $key = $context . chr(4) . $msgid;
-    $ret = $this->translate($key);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $msgid;
-    } else {
-      return $ret;
-    }
+	$key = $context . chr(4) . $msgid;
+	$ret = $this->translate($key);
+	if (strpos($ret, "\004") !== FALSE) {
+	  return $msgid;
+	} else {
+	  return $ret;
+	}
   }
 
   function npgettext($context, $singular, $plural, $number) {
-    $key = $context . chr(4) . $singular;
-    $ret = $this->ngettext($key, $plural, $number);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $singular;
-    } else {
-      return $ret;
-    }
+	$key = $context . chr(4) . $singular;
+	$ret = $this->ngettext($key, $plural, $number);
+	if (strpos($ret, "\004") !== FALSE) {
+	  return $singular;
+	} else {
+	  return $ret;
+	}
 
   }
 }

index.php

Indentation +18 added lines, -18 removed lines

@@ -93,9 +93,9 @@ 
 	<?php
 		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_js")) {
-			    $script = $p->get_js();
+				$script = $p->get_js();
 
-			    if ($script) {
+				if ($script) {
 					echo "try {
 					    $script
 					} catch (e) {
@@ -146,10 +146,10 @@ 
             <img src='images/indicator_tiny.gif'/>
             <?php echo  __("Loading, please wait..."); ?></div>
         <?php
-          foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_TREE) as $p) {
-            echo $p->hook_feed_tree();
-          }
-        ?>
+		  foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_TREE) as $p) {
+			echo $p->hook_feed_tree();
+		  }
+		?>
         <div id="feedTree"></div>
     </div>
 
@@ -167,10 +167,10 @@ 
                title="<?php echo __('Updates are available from Git.') ?>">new_releases</i>
 
             <?php
-            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
-                echo $p->hook_main_toolbar_button();
-            }
-            ?>
+			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
+				echo $p->hook_main_toolbar_button();
+			}
+			?>
 
             <form id="toolbar-headlines" action="" style="order : 10" onsubmit='return false'>
 
@@ -220,10 +220,10 @@ 
             <div class="action-chooser" style="order : 30">
 
                 <?php
-                    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
-                         echo $p->hook_toolbar_button();
-                    }
-                ?>
+					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
+						 echo $p->hook_toolbar_button();
+					}
+				?>
 
                 <div dojoType="fox.form.DropDownButton" class="action-button" title="<?php echo __('Actions...') ?>">
 					<span><i class="material-icons">menu</i></span>
@@ -242,10 +242,10 @@ 
                         <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
 
                         <?php
-                            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
-                             echo $p->hook_action_item();
-                            }
-                        ?>
+							foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
+							 echo $p->hook_action_item();
+							}
+						?>
 
                         <?php if (!$_SESSION["hide_logout"]) { ?>
                             <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?php echo __('Logout') ?></div>