WordPress.org

Make WordPress Core

Changeset 13228


Ignore:
Timestamp:
02/19/2010 06:01:50 PM (10 years ago)
Author:
ryan
Message:

Sync pomo. Props nbachiyski. fixes #11832

Location:
trunk/wp-includes/pomo
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/pomo/entry.php

    r12505 r13228  
    33 * Contains Translation_Entry class
    44 *
    5  * @version $Id: entry.php 351 2009-12-03 11:39:08Z nbachiyski $
     5 * @version $Id: entry.php 406 2010-02-07 11:10:24Z nbachiyski $
    66 * @package pomo
    77 * @subpackage entry
  • trunk/wp-includes/pomo/mo.php

    r12174 r13228  
    33 * Class for working with MO files
    44 *
    5  * @version $Id: mo.php 293 2009-11-12 15:43:50Z nbachiyski $
     5 * @version $Id: mo.php 406 2010-02-07 11:10:24Z nbachiyski $
    66 * @package pomo
    77 * @subpackage mo
     
    202202     */
    203203    function &make_entry($original, $translation) {
    204         $entry = & new Translation_Entry();
     204        $entry = new Translation_Entry();
    205205        // look for context
    206206        $parts = explode(chr(4), $original);
  • trunk/wp-includes/pomo/po.php

    r12548 r13228  
    33 * Class for working with PO files
    44 *
    5  * @version $Id: po.php 283 2009-09-23 16:21:51Z nbachiyski $
     5 * @version $Id: po.php 406 2010-02-07 11:10:24Z nbachiyski $
    66 * @package pomo
    77 * @subpackage po
     
    255255                }
    256256                // add comment
    257                 $this->add_comment_to_entry($entry, $line);
     257                $this->add_comment_to_entry($entry, $line);;
    258258            } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
    259259                if ($is_final($context)) {
  • trunk/wp-includes/pomo/streams.php

    r12174 r13228  
    44 * Based on the classes from Danilo Segan <danilo@kvota.net>
    55 *
    6  * @version $Id: streams.php 293 2009-11-12 15:43:50Z nbachiyski $
     6 * @version $Id: streams.php 406 2010-02-07 11:10:24Z nbachiyski $
    77 * @package pomo
    88 * @subpackage streams
  • trunk/wp-includes/pomo/translations.php

    r12079 r13228  
    33 * Class for a set of entries for translation and their associated headers
    44 *
    5  * @version $Id: translations.php 291 2009-10-21 05:46:08Z nbachiyski $
     5 * @version $Id: translations.php 406 2010-02-07 11:10:24Z nbachiyski $
    66 * @package pomo
    77 * @subpackage translations
     
    105105     **/
    106106    function merge_with(&$other) {
    107         $this->entries = array_merge($this->entries, $other->entries);
     107        foreach( $other->entries as $entry ) {
     108            $this->entries[$entry->key()] = $entry;
     109        }
    108110    }
    109111}
Note: See TracChangeset for help on using the changeset viewer.