update to php-gettext 1.0.9

src/php-gettext/ChangeLog

@@ -1,152 +0,0 @@
----- semanticscuttle-specific -----
-2009-11-03 Christian Weiske <cweiske@cweiske.de>
-	* fix magic detection on 64 bit systems, apply patch from:
-	  http://source.ibiblio.org/trac/lyceum/attachment/ticket/652/gettext-64bit-fix.diff
-
-
----- version 1.07 -----
-
-2006-02-07  Danilo Šegan  <danilo@gnome.org>
-
-	* examples/pigs_dropin.php: comment-out bind_textdomain_codeset
-
-	* gettext.inc (T_bind_textdomain_codeset): bind_textdomain_codeset
-	is available only in PHP 4.2.0+ (thanks to Jens A. Tkotz).
-
-	* Makefile: Include gettext.inc in DIST_FILES, VERSION up to
-	1.0.7.
-
-2006-02-03  Danilo Šegan  <danilo@gnome.org>
-
-	Added setlocale() emulation as well.
-	
-	* examples/pigs_dropin.php: Use T_setlocale() and locale_emulation().
-	* examples/pigs_fallback.php: Use T_setlocale() and locale_emulation().
-
-	* gettext.inc: 	Added globals $EMULATEGETTEXT and $CURRENTLOCALE.
-	(locale_emulation): Whether emulation is active.
-	(_check_locale): Rewrite.
-	(_setlocale): Added emulated setlocale function.
-	(T_setlocale): Wrapper around _setlocale.
-	(_get_reader): Use variables and _setlocale.
-
-2006-02-02  Danilo Šegan  <danilo@gnome.org>
-
-	Fix bug #12192.
-
-	* examples/locale/sr_CS/LC_MESSAGES/messages.po: Correct grammar.
-	* examples/locale/sr_CS/LC_MESSAGES/messages.mo: Rebuild.
-
-2006-02-02  Danilo Šegan  <danilo@gnome.org>
-
-	Fix bug #15419.
-	
-	* streams.php: Support for PHP 5.1.1 fread() which reads most 8kb.
-	(Fix by Piotr Szotkowski <shot@hot.pl>)
-
-2006-02-02  Danilo Šegan  <danilo@gnome.org>
-
-	Merge Steven Armstrong's changes, supporting standard gettext
-	interfaces: 
-
-	* examples/*: Restructured examples.
-	* gettext.inc: Added.
-	* AUTHORS: Added Steven.
-	* Makefile (VERSION): Up to 1.0.6.
-	
-2006-01-28  Nico Kaiser  <nico@siriux.net>
-
-	* gettext.php (select_string): Fix "true" <-> 1 difference of PHP
-
-2005-07-29  Danilo Šegan  <danilo@gnome.org>
-
-	* Makefile (VERSION): Up to 1.0.5.
-
-2005-07-29  Danilo Šegan  <danilo@gnome.org>
-
-	Fixes bug #13850.
-	
-	* gettext.php (gettext_reader): check $Reader->error as well.
-
-2005-07-29  Danilo Šegan  <danilo@gnome.org>
-
-	* Makefile (VERSION): Up to 1.0.4.
-
-2005-07-29  Danilo Šegan  <danilo@gnome.org>
-
-	Fixes bug #13771.
-
-	* gettext.php (gettext_reader->get_plural_forms): Plural forms
-	header extraction regex change.  Reported by Edgar Gonzales.
-	
-2005-02-28  Danilo Šegan  <dsegan@gmx.net>
-
-	* AUTHORS: Added Nico to the list.
-
-	* Makefile (VERSION): Up to 1.0.3.
-
-	* README: Updated.
-
-2005-02-28  Danilo Šegan  <dsegan@gmx.net>
-
-	* gettext.php: Added pre-loading, code documentation, and many
-	code clean-ups by Nico Kaiser <nico@siriux.net>.
-
-2005-02-28  Danilo Šegan  <dsegan@gmx.net>
-
-	* streams.php (FileReader.read): Handle read($bytes = 0).
-
-	* examples/pigs.php: Prefix gettext function names with T or T_.
-
-	* examples/update: Use the same keywords T_ and T_ngettext.
-
-	* streams.php: Added CachedFileReader.
-
-2003-11-11  Danilo Šegan  <dsegan@gmx.net>
-
-	* gettext.php: Added hashing to find_string.
-
-2003-11-01  Danilo Šegan  <dsegan@gmx.net>
-
-	* Makefile (DIST_FILES): Replaced LICENSE with COPYING.
-	(VERSION): Up to 1.0.2.
-
-	* AUTHORS: Minor edits.
-
-	* README: Minor edits.
-
-	* COPYING: Removed LICENSE, added this file.
-
-	* gettext.php: Added copyright notice and disclaimer.
-	* streams.php: Same.
-	* examples/pigs.php: Same.
-
-2003-10-23  Danilo Šegan  <dsegan@gmx.net>
-
-	* Makefile: Upped version to 1.0.1.
-
-	* gettext.php (gettext_reader): Remove a call to set_total_plurals.
-	(set_total_plurals): Removed unused function for some better days.
-
-2003-10-23  Danilo Šegan  <dsegan@gmx.net>
-
-	* Makefile: Added, version 1.0.0.
-
-	* examples/*: Added an example of usage.
-
-	* README: Described all the crap.
-	
-2003-10-22  Danilo Šegan  <dsegan@gmx.net>
-
-	* gettext.php: Plural forms implemented too.
-
-	* streams.php: Added FileReader for direct access to files (no
-	need to keep file in memory).
-
-	* gettext.php: It works, except for plural forms.
-
-	* streams.php: Created abstract class StreamReader.
-	Added StringReader class.
-
-	* gettext.php: Started writing gettext_reader.
-

src/php-gettext/Makefile

@@ -1,12 +1,11 @@
 PACKAGE = php-gettext-$(VERSION)
-VERSION = 1.0.7
+VERSION = 1.0.9
 
 DIST_FILES = \
 	gettext.php \
 	gettext.inc \
 	streams.php \
 	AUTHORS     \
-	ChangeLog   \
 	README      \
 	COPYING     \
 	Makefile    \
@@ -30,3 +29,5 @@ dist:
 	    rm -rf $(PACKAGE); \
 	fi;
 
+clean:
+	rm -f $(PACKAGE).tar.gz

src/php-gettext/README

@@ -1,6 +1,6 @@
-PHP-gettext 1.0
+PHP-gettext 1.0 (https://launchpad.net/php-gettext)
 
-Copyright 2003, 2006 -- Danilo "angry with PHP[1]" Segan
+Copyright 2003, 2006, 2009 -- Danilo "angry with PHP[1]" Segan
 Licensed under GPLv2 (or any later version, see COPYING)
 
 [1] PHP is actually cyrillic, and translates roughly to
@@ -59,27 +59,7 @@ Features
 
 Bugs
 
-    Plural-forms field in MO header (translation for empty string,
+    Report them on https://bugs.launchpad.net/php-gettext
-    i.e. "") is treated according to PHP syntactic rules (it's
-    eval()ed). Since these should actually follow C syntax, there are
-    some problems.
-
-    For instance, I'm used to using this:
-      Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 : \
-         n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;
-    but it fails with PHP (it sets $plural=2 instead of 0 for $n==1).
-
-    The fix is usually simple, but I'm lazy to go into the details of
-    PHP operator precedence, and maybe try to fix it. In here, I had
-    to put everything after the first ':' in parenthesis:
-      Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 : \
-         (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
-    That works, and I'm satisfied.
-
-    Besides this one, there are probably a bunch of other bugs, since
-    I hate PHP (did I mention it already? no? strange), and don't
-    know it very well. So, feel free to fix any of those and report
-    them back to me at <danilo@kvota.net>.
 
 Usage
 
@@ -137,18 +117,10 @@ Example
     There is also simple "update" script that can be used to generate
     POT file and to update the translation using msgmerge.
 
-Interesting TODO:
+TODO:
 
-  o Try to parse "plural-forms" header field, and to follow C syntax
+  o Improve speed to be even more comparable to the native gettext
-    rules. This won't be easy.
+    implementation.
-
-Boring TODO:
-
-  o Learn PHP and fix bugs, slowness and other stuff resulting from
-    my lack of knowledge (but *maybe*, it's not my knowledge that is
-    bad, but PHP itself ;-).  
-
-    (This is mostly done thanks to Nico Kaiser.)
 
   o Try to use hash tables in MO files: with pre-loading, would it
     be useful at all?

src/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po

@@ -12,7 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: pigs.php:19
 msgid ""

src/php-gettext/examples/pigs_dropin.php

@@ -1,6 +1,6 @@
 <?php
 /*
-   Copyright (c) 2003,2004,2005 Danilo Segan <danilo@kvota.net>.
+   Copyright (c) 2003,2004,2005,2009 Danilo Segan <danilo@kvota.net>.
    Copyright (c) 2005,2006 Steven Armstrong <sa@c-area.ch>
 
    This file is part of PHP-gettext.
@@ -21,10 +21,12 @@
 
 */
 
+error_reporting(E_STRICT);
+
 // define constants
-define(PROJECT_DIR, realpath('./'));
+define('PROJECT_DIR', realpath('./'));
-define(LOCALE_DIR, PROJECT_DIR .'/locale');
+define('LOCALE_DIR', PROJECT_DIR .'/locale');
-define(DEFAULT_LOCALE, 'en_US');
+define('DEFAULT_LOCALE', 'en_US');
 
 require_once('../gettext.inc');
 

src/php-gettext/examples/pigs_fallback.php

@@ -1,6 +1,6 @@
 <?php
 /*
-   Copyright (c) 2003,2004,2005 Danilo Segan <danilo@kvota.net>.
+   Copyright (c) 2003,2004,2005,2009 Danilo Segan <danilo@kvota.net>.
    Copyright (c) 2005,2006 Steven Armstrong <sa@c-area.ch>
 
    This file is part of PHP-gettext.
@@ -21,10 +21,12 @@
 
 */
 
+error_reporting(E_STRICT);
+
 // define constants
-define(PROJECT_DIR, realpath('./'));
+define('PROJECT_DIR', realpath('./'));
-define(LOCALE_DIR, PROJECT_DIR .'/locale');
+define('LOCALE_DIR', PROJECT_DIR .'/locale');
-define(DEFAULT_LOCALE, 'en_US');
+define('DEFAULT_LOCALE', 'en_US');
 
 require_once('../gettext.inc');
 

src/php-gettext/examples/update

@@ -1,7 +1,7 @@
 #!/bin/sh
 TEMPLATE=pigs.pot
-xgettext -kT_ngettext:1,2 -kT_ -L PHP -o $TEMPLATE pigs.php
+xgettext -kT_ngettext:1,2 -kT_ -L PHP -o $TEMPLATE pigs_dropin.php
-if [ x$1 == 'x-p' ]; then
+if [ "x$1" = "x-p" ]; then
     msgfmt --statistics $TEMPLATE
 else
     if [ -f $1.po ]; then

src/php-gettext/gettext.inc

@@ -1,6 +1,7 @@
 <?php
 /*
    Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
+   Copyright (c) 2009 Danilo Segan <danilo@kvota.net>
 
    Drop in replacement for native gettext.
 
@@ -31,6 +32,13 @@ LC_MESSAGES	5
 LC_ALL          6
 */
 
+
+// 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);
+}
+
 require('streams.php');
 require('gettext.php');
 
@@ -44,6 +52,12 @@ $LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MO
 $EMULATEGETTEXT = 0;
 $CURRENTLOCALE = '';
 
+/* Class to hold a single domain included in $text_domains. */
+class domain {
+  var $l10n;
+  var $path;
+  var $codeset;
+}
 
 // Utility functions
 
@@ -56,15 +70,45 @@ function _get_reader($domain=null, $category=5, $enable_cache=true) {
     if (!isset($text_domains[$domain]->l10n)) {
         // get the current locale
         $locale = _setlocale(LC_MESSAGES, 0);
-		$p = isset($text_domains[$domain]->path) ? $text_domains[$domain]->path : './';
+        $bound_path = isset($text_domains[$domain]->path) ?
-		$path = $p . "$locale/". $LC_CATEGORIES[$category] ."/$domain.mo";
+          $text_domains[$domain]->path : './';
-		if (file_exists($path)) {
+        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
-			$input = new FileReader($path);
+        /* 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();
+        if (preg_match("/([a-z]{2,3})"            // language code
+                       ."(_([A-Z]{2}))?"          // country code
+                       ."(\.([-A-Za-z0-9_]))?"    // charset
+                       ."(@([-A-Za-z0-9_]+))?/",  // @ modifier
+                       $locale, $matches)) {
+          list(,$lang,,$country,,$charset,,$modifier) = $matches;
+          if ($modifier) {
+            $locale_names = array("${lang}_$country.$charset@$modifier",
+                                  "${lang}_$country@$modifier",
+                                  "$lang@$modifier");
           }
-		else {
+          array_push($locale_names,
+                     "${lang}_$country.$charset", "${lang}_$country", "$lang");
+        }
+        array_push($locale_names, $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;
           }
-		$text_domains[$domain]->l10n = new gettext_reader($input, $enable_cache);
+        }
+
+        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;
 }
@@ -128,7 +172,7 @@ function _setlocale($category, $locale) {
     } else {
         $ret = 0;
         if (function_exists('setlocale')) // I don't know if this ever happens ;)
-           $ret = @setlocale($category, $locale);  //the @ hides warning messages on few installations
+           $ret = setlocale($category, $locale);
         if (($ret and $locale == '') or ($ret == $locale)) {
             $EMULATEGETTEXT = 0;
             $CURRENTLOCALE = $ret;
@@ -139,6 +183,9 @@ function _setlocale($category, $locale) {
             $CURRENTLOCALE = $locale;
             $EMULATEGETTEXT = 1;
         }
+        // Allow locale to be changed on the go for one translation domain.
+        global $text_domains, $default_domain;
+        unset($text_domains[$default_domain]->l10n);
         return $CURRENTLOCALE;
     }
 }
@@ -148,9 +195,18 @@ function _setlocale($category, $locale) {
  */
 function _bindtextdomain($domain, $path) {
     global $text_domains;
-	// ensure $path ends with a slash
+    // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
-	if ($path[strlen($path) - 1] != '/') $path .= '/';
+    if (substr(php_uname(), 0, 7) == "Windows") {
-	elseif ($path[strlen($path) - 1] != '\\') $path .= '\\';
+      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;
 }
 

src/php-gettext/gettext.php

@@ -1,6 +1,6 @@
 <?php
 /*
-   Copyright (c) 2003 Danilo Segan <danilo@kvota.net>.
+   Copyright (c) 2003, 2009 Danilo Segan <danilo@kvota.net>.
    Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
 
    This file is part of PHP-gettext.
@@ -63,13 +63,19 @@ class gettext_reader {
   function readint() {
       if ($this->BYTEORDER == 0) {
         // low endian
-        return array_shift(unpack('V', $this->STREAM->read(4)));
+        $input=unpack('V', $this->STREAM->read(4));
+        return array_shift($input);
       } else {
         // big endian
-        return array_shift(unpack('N', $this->STREAM->read(4)));
+        $input=unpack('N', $this->STREAM->read(4));
+        return array_shift($input);
       }
     }
 
+  function read($bytes) {
+    return $this->STREAM->read($bytes);
+  }
+
   /**
    * Reads an array of Integers from the Stream
    *
@@ -102,17 +108,15 @@ class gettext_reader {
     // Caching can be turned off
     $this->enable_cache = $enable_cache;
 
-    // $MAGIC1 = (int)0x950412de; //bug in PHP 5
+    $MAGIC1 = "\x95\x04\x12\xde";
-    $MAGIC1 = (int) - 1794895138;
+    $MAGIC2 = "\xde\x12\x04\x95";
-    // $MAGIC2 = (int)0xde120495; //bug
-    $MAGIC2 = (int) - 569244523;
 
     $this->STREAM = $Reader;
-    $magic = $this->readint();
+    $magic = $this->read(4);
-    if ($magic == $MAGIC1 || $magic == ($MAGIC1 & 0xFFFFFFFF)) {
+    if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 0;
-    } elseif ($magic == $MAGIC2 || $magic == ($MAGIC2 & 0xFFFFFFFF)) {
       $this->BYTEORDER = 1;
+    } elseif ($magic == $MAGIC2) {
+      $this->BYTEORDER = 0;
     } else {
       $this->error = 1; // not MO file
       return false;
@@ -261,6 +265,41 @@ class gettext_reader {
     }
   }
 
+  /**
+   * Sanitize plural form expression for use in PHP eval call.
+   *
+   * @access private
+   * @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 possible plural forms from MO header
    *
@@ -283,7 +322,8 @@ class gettext_reader {
         $expr = $regs[1];
       else
         $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
-      $this->pluralheader = $expr;
+
+      $this->pluralheader = $this->sanitize_plural_expression($expr);
     }
     return $this->pluralheader;
   }

src/php-gettext/streams.php

@@ -1,6 +1,6 @@
 <?php
 /*
-   Copyright (c) 2003, 2005 Danilo Segan <danilo@kvota.net>.
+   Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
 
    This file is part of PHP-gettext.
 
@@ -43,7 +43,7 @@ class StreamReader {
   function length() {
     return false;
   }
-}
+};
 
 class StringReader {
   var $_pos;
@@ -78,7 +78,7 @@ class StringReader {
     return strlen($this->_str);
   }
 
-}
+};
 
 
 class FileReader {
@@ -138,7 +138,7 @@ class FileReader {
     fclose($this->_fd);
   }
 
-}
+};
 
 // Preloads entire file in memory first, then creates a StringReader
 // over it (it assumes knowledge of StringReader internals)
@@ -161,7 +161,7 @@ class CachedFileReader extends StringReader {
       return false;
     }
   }
-}
+};
 
 
 ?>