Changeset 18528 for trunk/wp-includes/pomo/translations.php

Timestamp:

08/11/2011 04:29:35 AM (14 years ago)

Author:

nbachiyski

Message:

Sync pomo library with the current GlotPress version

File:

• trunk/wp-includes/pomo/translations.php (modified) (8 diffs)

trunk/wp-includes/pomo/translations.php

@@ -3 +3 @@
  * Class for a set of entries for translation and their associated headers
  *
- * @version $Id: translations.php 406 2010-02-07 11:10:24Z nbachiyski $
+ * @version $Id: translations.php 590 2010-12-20 19:58:37Z nbachiyski $
  * @package pomo
  * @subpackage translations
@@ -28 +28 @@
         if (false === $key) return false;
         $this->entries[$key] = &$entry;
+        return true;
+    }
+    
+    function add_entry_or_merge($entry) {
+        if (is_array($entry)) {
+            $entry = new Translation_Entry($entry);
+        }
+        $key = $entry->key();
+        if (false === $key) return false;
+        if (isset($this->entries[$key]))
+            $this->entries[$key]->merge_with($entry);
+        else
+            $this->entries[$key] = &$entry;
         return true;
     }
@@ -109 +122 @@
         }
     }
+    
+    function merge_originals_with(&$other) {
+        foreach( $other->entries as $entry ) {
+            if ( !isset( $this->entries[$entry->key()] ) )
+                $this->entries[$entry->key()] = $entry;
+            else
+                $this->entries[$entry->key()]->merge_with($entry);
+        }
+    }
 }
 
@@ -127 +149 @@
         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)) {
@@ -153 +175 @@
      * Adds parantheses to the inner parts of ternary operators in
      * plural expressions, because PHP evaluates ternary oerators from left to right
-     *
+     * 
      * @param string $expression the expression without parentheses
      * @return string the expression with parentheses added
@@ -181 +203 @@
         return rtrim($res, ';');
     }
-
+    
     function make_headers($translation) {
         $headers = array();
@@ -194 +216 @@
         return $headers;
     }
-
+    
     function set_header($header, $value) {
         parent::set_header($header, $value);
@@ -213 +235 @@
     var $entries = array();
     var $headers = array();
-
+    
     function add_entry($entry) {
         return true;