Changeset 12079

Timestamp:

10/21/2009 07:06:55 AM (15 years ago)

Author:

westi

Message:

Merge updated pomo code. Includes new NOOP_Translations class see #10971 props nbachiyski.

Location:

trunk/wp-includes/pomo

Files:

• entry.php (modified) (2 diffs)
• mo.php (modified) (5 diffs)
• po.php (modified) (4 diffs)
• streams.php (modified) (5 diffs)
• translations.php (modified) (7 diffs)

trunk/wp-includes/pomo/entry.php

@@ -3 +3 @@
  * Contains Translation_Entry class
  *
- * @version $Id: entry.php 115 2009-05-11 18:56:15Z nbachiyski $
+ * @version $Id: entry.php 222 2009-09-07 21:14:23Z nbachiyski $
  * @package pomo
  * @subpackage entry
  */
 
-
+if ( !class_exists( 'Translation_Entry' ) ):
 /**
  * Translation_Entry class encapsulates a translatable string
@@ -68 +68 @@
     }
 }
-?>
+endif;

trunk/wp-includes/pomo/mo.php

@@ -3 +3 @@
  * Class for working with MO files
  *
- * @version $Id: mo.php 106 2009-04-23 19:48:22Z nbachiyski $
+ * @version $Id: mo.php 221 2009-09-07 21:08:21Z nbachiyski $
  * @package pomo
  * @subpackage mo
@@ -11 +11 @@
 require_once dirname(__FILE__) . '/streams.php';
 
+if ( !class_exists( 'MO' ) ):
 class MO extends Gettext_Translations {
 
@@ -96 +97 @@
 
     function get_byteorder($magic) {
-
         // The magic is 0x950412de
 
@@ -103 +103 @@
         $magic_little_64 = (int) 2500072158;
         // 0xde120495
-        $magic_big = ((int) - 569244523) && 0xFFFFFFFF;
-        
+        $magic_big = ((int) - 569244523) & 0xFFFFFFFF;
         if ($magic_little == $magic || $magic_little_64 == $magic) {
             return 'little';
@@ -183 +182 @@
 
 }
-?>
+endif;

trunk/wp-includes/pomo/po.php

@@ -3 +3 @@
  * Class for working with PO files
  *
- * @version $Id: po.php 123 2009-05-13 19:35:43Z nbachiyski $
+ * @version $Id: po.php 283 2009-09-23 16:21:51Z nbachiyski $
  * @package pomo
  * @subpackage po
@@ -17 +17 @@
  * Routines for working with PO files
  */
+if ( !class_exists( 'PO' ) ):
 class PO extends Gettext_Translations {
     
@@ -317 +318 @@
             }
         }
-        if (array() == array_filter($entry->translations)) $entry->translations = array();
+        if (array() == array_filter($entry->translations, create_function('$t', 'return $t || "0" === $t;'))) {
+            $entry->translations = array();
+        }
         return array('entry' => $entry, 'lineno' => $lineno);
     }
@@ -358 +361 @@
     }
 }
-?>
+endif;

trunk/wp-includes/pomo/streams.php

@@ -4 +4 @@
  * Based on the classes from Danilo Segan <danilo@kvota.net>
  *
- * @version $Id: streams.php 138 2009-06-23 13:22:09Z nbachiyski $
+ * @version $Id: streams.php 223 2009-09-07 21:20:13Z nbachiyski $
  * @package pomo
  * @subpackage streams
@@ -10 +10 @@
 
 
+if ( !class_exists( 'POMO_StringReader' ) ):
 /**
  * Provides file-like methods for manipulating a string instead
@@ -62 +63 @@
 
 }
+endif;
 
+if ( !class_exists( 'POMO_CachedFileReader' ) ):
 /**
  * Reads the contents of the file in the beginning.
@@ -75 +78 @@
     }
 }
+endif;
 
+if ( !class_exists( 'POMO_CachedIntFileReader' ) ):
 /**
  * Allows reading integers from a file.
@@ -134 +139 @@
     }
 }
-
-?>
+endif;

trunk/wp-includes/pomo/translations.php

@@ -3 +3 @@
  * Class for a set of entries for translation and their associated headers
  *
- * @version $Id: translations.php 114 2009-05-11 17:30:38Z nbachiyski $
+ * @version $Id: translations.php 291 2009-10-21 05:46:08Z nbachiyski $
  * @package pomo
  * @subpackage translations
@@ -10 +10 @@
 require_once dirname(__FILE__) . '/entry.php';
 
+if ( !class_exists( 'Translations' ) ):
 class Translations {
     var $entries = array();
@@ -26 +27 @@
         $key = $entry->key();
         if (false === $key) return false;
-        $this->entries[$key] = $entry;
+        $this->entries[$key] = &$entry;
         return true;
     }
@@ -118 +119 @@
     function gettext_select_plural_form($count) {
         if (!isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
-            $plural_header = $this->get_header('Plural-Forms');
-            $this->_gettext_select_plural_form = $this->_make_gettext_select_plural_form($plural_header);
+            list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+            $this->_nplurals = $nplurals;
+            $this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
         }
         return call_user_func($this->_gettext_select_plural_form, $count);
+    }
+    
+    function nplurals_and_expression_from_header($header) {
+        if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
+            $nplurals = (int)$matches[1];
+            $expression = trim($this->parenthesize_plural_exression($matches[2]));
+            return array($nplurals, $expression);
+        } else {
+            return array(2, 'n != 1');
+        }
     }
 
@@ -128 +140 @@
      * plural forms header
      */
-    function _make_gettext_select_plural_form($plural_header) {
-        $res = create_function('$count', 'return 1 == $count? 0 : 1;');
-        if ($plural_header && (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $plural_header, $matches))) {
-            $nplurals = (int)$matches[1];
-            $this->_nplurals = $nplurals;
-            $plural_expr = trim($this->_parenthesize_plural_exression($matches[2]));
-            $plural_expr = str_replace('n', '$n', $plural_expr);
-            $func_body = "
-                \$index = (int)($plural_expr);
-                return (\$index < $nplurals)? \$index : $nplurals - 1;";
-            $res = create_function('$n', $func_body);
-        }
-        return $res;
+    function make_plural_form_function($nplurals, $expression) {
+        $expression = str_replace('n', '$n', $expression);
+        $func_body = "
+            \$index = (int)($expression);
+            return (\$index < $nplurals)? \$index : $nplurals - 1;";
+        return create_function('$n', $func_body);
     }
 
@@ -150 +155 @@
      * @return string the expression with parentheses added
      */
-    function _parenthesize_plural_exression($expression) {
+    function parenthesize_plural_exression($expression) {
         $expression .= ';';
         $res = '';
@@ -187 +192 @@
         return $headers;
     }
-
+    
     function set_header($header, $value) {
         parent::set_header($header, $value);
-        if ('Plural-Forms' == $header)
-            $this->_gettext_select_plural_form = $this->_make_gettext_select_plural_form($value);
-    }
-
-    
+        if ('Plural-Forms' == $header) {
+            list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+            $this->_nplurals = $nplurals;
+            $this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
+        }
+    }
 }
-
-?>
+endif;
+
+if ( !class_exists( 'NOOP_Translations' ) ):
+/**
+ * Provides the same interface as Translations, but doesn't do anything
+ */
+class NOOP_Translations {
+    var $entries = array();
+    var $headers = array();
+    
+    function add_entry($entry) {
+        return true;
+    }
+
+    function set_header($header, $value) {
+    }
+
+    function set_headers(&$headers) {
+    }
+
+    function get_header($header) {
+        return false;
+    }
+
+    function translate_entry(&$entry) {
+        return false;
+    }
+
+    function translate($singular, $context=null) {
+        return $singular;
+    }
+
+    function select_plural_form($count) {
+        return 1 == $count? 0 : 1;
+    }
+
+    function get_plural_forms_count() {
+        return 2;
+    }
+
+    function translate_plural($singular, $plural, $count, $context = null) {
+            return 1 == $count? $singular : $plural;
+    }
+
+    function merge_with(&$other) {
+    }
+}
+endif;