WordPress.org
Get WordPress

Make WordPress Core

Ticket #25631: 25631.patch

File 25631.patch, 6.6 KB (added by SergeyBiryukov, 11 years ago)

  • src/wp-includes/pomo/po.php

     
    274274                                        return false;
    275275                                }
    276276                                // add comment
    277                                 $this->add_comment_to_entry($entry, $line);;
     277                                $this->add_comment_to_entry($entry, $line);
    278278                        } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
    279279                                if ($is_final($context)) {
    280280                                        PO::read_line($f, 'put-back');

  • tests/phpunit/tests/pomo/po.php

     
    3737    }
    3838
    3939        function test_prepend_each_line() {
    40                 $this->assertEquals('baba_', @PO::prepend_each_line('', 'baba_'));
    41                 $this->assertEquals('baba_dyado', @PO::prepend_each_line('dyado', 'baba_'));
    42                 $this->assertEquals("# baba\n# dyado\n# \n", @PO::prepend_each_line("baba\ndyado\n\n", '# '));
     40                $po = new PO();
     41                $this->assertEquals('baba_', $po->prepend_each_line('', 'baba_'));
     42                $this->assertEquals('baba_dyado', $po->prepend_each_line('dyado', 'baba_'));
     43                $this->assertEquals("# baba\n# dyado\n# \n", $po->prepend_each_line("baba\ndyado\n\n", '# '));
    4344        }
    4445
    4546        function test_poify() {
     47                $po = new PO();
    4648                //simple
    47                 $this->assertEquals('"baba"', @PO::poify('baba'));
     49                $this->assertEquals('"baba"', $po->poify('baba'));
    4850                //long word
    49                 $this->assertEquals($this->po_a90, @PO::poify($this->a90));
     51                $this->assertEquals($this->po_a90, $po->poify($this->a90));
    5052                // tab
    51                 $this->assertEquals('"ba\tba"', @PO::poify("ba\tba"));
     53                $this->assertEquals('"ba\tba"', $po->poify("ba\tba"));
    5254                // do not add leading empty string of one-line string ending on a newline
    53                 $this->assertEquals('"\\\\a\\\\n\\n"', @PO::poify("\a\\n\n"));
     55                $this->assertEquals('"\\\\a\\\\n\\n"', $po->poify("\a\\n\n"));
    5456                // backslash
    55                 $this->assertEquals('"ba\\\\ba"', @PO::poify('ba\\ba'));
     57                $this->assertEquals('"ba\\\\ba"', $po->poify('ba\\ba'));
    5658                // random wordpress.pot string
    5759                $src = 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.';
    58                 $this->assertEquals("\"Categories can be selectively converted to tags using the <a href=\\\"%s\\\">category to tag converter</a>.\"", @PO::poify($src));
     60                $this->assertEquals("\"Categories can be selectively converted to tags using the <a href=\\\"%s\\\">category to tag converter</a>.\"", $po->poify($src));
    5961
    60                 $this->assertEquals($this->po_mail, @PO::poify($this->mail));
     62                $this->assertEquals($this->po_mail, $po->poify($this->mail));
    6163        }
    6264
    6365        function test_unpoify() {
    64                 $this->assertEquals('baba', @PO::unpoify('"baba"'));
    65                 $this->assertEquals("baba\ngugu", @PO::unpoify('"baba\n"'."\t\t\t\n".'"gugu"'));
    66                 $this->assertEquals($this->a90, @PO::unpoify($this->po_a90));
    67                 $this->assertEquals('\\t\\n', @PO::unpoify('"\\\\t\\\\n"'));
     66                $po = new PO();
     67                $this->assertEquals('baba', $po->unpoify('"baba"'));
     68                $this->assertEquals("baba\ngugu", $po->unpoify('"baba\n"'."\t\t\t\n".'"gugu"'));
     69                $this->assertEquals($this->a90, $po->unpoify($this->po_a90));
     70                $this->assertEquals('\\t\\n', $po->unpoify('"\\\\t\\\\n"'));
    6871                // wordwrapped
    69                 $this->assertEquals('babadyado', @PO::unpoify("\"\"\n\"baba\"\n\"dyado\""));
    70                 $this->assertEquals($this->mail, @PO::unpoify($this->po_mail));
     72                $this->assertEquals('babadyado', $po->unpoify("\"\"\n\"baba\"\n\"dyado\""));
     73                $this->assertEquals($this->mail, $po->unpoify($this->po_mail));
    7174        }
    7275
    7376        function test_export_entry() {
     77                $po = new PO();
    7478                $entry = new Translation_Entry(array('singular' => 'baba'));
    75                 $this->assertEquals("msgid \"baba\"\nmsgstr \"\"", @PO::export_entry($entry));
     79                $this->assertEquals("msgid \"baba\"\nmsgstr \"\"", $po->export_entry($entry));
    7680                // plural
    7781                $entry = new Translation_Entry(array('singular' => 'baba', 'plural' => 'babas'));
    7882                $this->assertEquals('msgid "baba"
    7983msgid_plural "babas"
    8084msgstr[0] ""
    81 msgstr[1] ""', @PO::export_entry($entry));
     85msgstr[1] ""', $po->export_entry($entry));
    8286                $entry = new Translation_Entry(array('singular' => 'baba', 'translator_comments' => "baba\ndyado"));
    8387                $this->assertEquals('#  baba
    8488#  dyado
    8589msgid "baba"
    86 msgstr ""', @PO::export_entry($entry));
     90msgstr ""', $po->export_entry($entry));
    8791                $entry = new Translation_Entry(array('singular' => 'baba', 'extracted_comments' => "baba"));
    8892                $this->assertEquals('#. baba
    8993msgid "baba"
    90 msgstr ""', @PO::export_entry($entry));
     94msgstr ""', $po->export_entry($entry));
    9195                $entry = new Translation_Entry(array(
    9296                        'singular' => 'baba',
    9397                        'extracted_comments' => "baba",
    … …  
    96100#: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
    97101#: 29
    98102msgid "baba"
    99 msgstr ""', @PO::export_entry($entry));
     103msgstr ""', $po->export_entry($entry));
    100104                $entry = new Translation_Entry(array('singular' => 'baba', 'translations' => array()));
    101                 $this->assertEquals("msgid \"baba\"\nmsgstr \"\"", @PO::export_entry($entry));
     105                $this->assertEquals("msgid \"baba\"\nmsgstr \"\"", $po->export_entry($entry));
    102106
    103107                $entry = new Translation_Entry(array('singular' => 'baba', 'translations' => array('куку', 'буку')));
    104                 $this->assertEquals("msgid \"baba\"\nmsgstr \"куку\"", @PO::export_entry($entry));
     108                $this->assertEquals("msgid \"baba\"\nmsgstr \"куку\"", $po->export_entry($entry));
    105109
    106110                $entry = new Translation_Entry(array('singular' => 'baba', 'plural' => 'babas', 'translations' => array('кукубуку')));
    107111                $this->assertEquals('msgid "baba"
    108112msgid_plural "babas"
    109 msgstr[0] "кукубуку"', @PO::export_entry($entry));
     113msgstr[0] "кукубуку"', $po->export_entry($entry));
    110114
    111115                $entry = new Translation_Entry(array('singular' => 'baba', 'plural' => 'babas', 'translations' => array('кукубуку', 'кукуруку', 'бабаяга')));
    112116                $this->assertEquals('msgid "baba"
    … …  
    113117msgid_plural "babas"
    114118msgstr[0] "кукубуку"
    115119msgstr[1] "кукуруку"
    116 msgstr[2] "бабаяга"', @PO::export_entry($entry));
     120msgstr[2] "бабаяга"', $po->export_entry($entry));
    117121                // context
    118122                $entry = new Translation_Entry(array('context' => 'ctxt', 'singular' => 'baba', 'plural' => 'babas', 'translations' => array('кукубуку', 'кукуруку', 'бабаяга'), 'flags' => array('fuzzy', 'php-format')));
    119123                $this->assertEquals('#, fuzzy, php-format
    … …  
    122126msgid_plural "babas"
    123127msgstr[0] "кукубуку"
    124128msgstr[1] "кукуруку"
    125 msgstr[2] "бабаяга"', @PO::export_entry($entry));
     129msgstr[2] "бабаяга"', $po->export_entry($entry));
    126130    }
    127131
    128132        function test_export_entries() {