Changeset 13228

Timestamp:

02/19/2010 06:01:50 PM (17 years ago)

Author:

ryan

Message:

Sync pomo. Props nbachiyski. fixes #11832

Location:

trunk/wp-includes/pomo

Files:

• entry.php (modified) (1 diff)
• mo.php (modified) (2 diffs)
• po.php (modified) (2 diffs)
• streams.php (modified) (1 diff)
• translations.php (modified) (2 diffs)

trunk/wp-includes/pomo/entry.php

@@ -3 +3 @@
  * Contains Translation_Entry class
  *
- * @version $Id: entry.php 351 2009-12-03 11:39:08Z nbachiyski $
+ * @version $Id: entry.php 406 2010-02-07 11:10:24Z nbachiyski $
  * @package pomo
  * @subpackage entry

trunk/wp-includes/pomo/mo.php

@@ -3 +3 @@
  * Class for working with MO files
  *
- * @version $Id: mo.php 293 2009-11-12 15:43:50Z nbachiyski $
+ * @version $Id: mo.php 406 2010-02-07 11:10:24Z nbachiyski $
  * @package pomo
  * @subpackage mo
@@ -202 +202 @@
          */
         function &make_entry($original, $translation) {
-                $entry = & new Translation_Entry();
+                $entry = new Translation_Entry();
                 // look for context
                 $parts = explode(chr(4), $original);

trunk/wp-includes/pomo/po.php

@@ -3 +3 @@
  * Class for working with PO files
  *
- * @version $Id: po.php 283 2009-09-23 16:21:51Z nbachiyski $
+ * @version $Id: po.php 406 2010-02-07 11:10:24Z nbachiyski $
  * @package pomo
  * @subpackage po
@@ -255 +255 @@
                                 }
                                 // add comment
-                                $this->add_comment_to_entry($entry, $line);
+                                $this->add_comment_to_entry($entry, $line);;
                         } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
                                 if ($is_final($context)) {

trunk/wp-includes/pomo/streams.php

@@ -4 +4 @@
  * Based on the classes from Danilo Segan <danilo@kvota.net>
  *
- * @version $Id: streams.php 293 2009-11-12 15:43:50Z nbachiyski $
+ * @version $Id: streams.php 406 2010-02-07 11:10:24Z nbachiyski $
  * @package pomo
  * @subpackage streams

trunk/wp-includes/pomo/translations.php

@@ -3 +3 @@
  * Class for a set of entries for translation and their associated headers
  *
- * @version $Id: translations.php 291 2009-10-21 05:46:08Z nbachiyski $
+ * @version $Id: translations.php 406 2010-02-07 11:10:24Z nbachiyski $
  * @package pomo
  * @subpackage translations
@@ -105 +105 @@
          **/
         function merge_with(&$other) {
-                $this->entries = array_merge($this->entries, $other->entries);
+                foreach( $other->entries as $entry ) {
+                        $this->entries[$entry->key()] = $entry;
+                }
         }
 }