WordPress 4.6.3-scripts

[autoinstalls/wordpress.git] / wp-includes / pomo / mo.php

diff --git a/wp-includes/pomo/mo.php b/wp-includes/pomo/mo.php
index d76cda5c6be884a1503aa22e305046607770aa6a..6bc44d614d69c899078889a62f8035ae44f8131e 100644 (file)
--- a/wp-includes/pomo/mo.php
+++ b/wp-includes/pomo/mo.php
@@ -2,7 +2,7 @@
 /**
  * Class for working with MO files
  *
 /**
  * Class for working with MO files
  *

- * @version $Id: mo.php 602 2011-01-30 12:43:29Z nbachiyski $
+ * @version $Id: mo.php 1157 2015-11-20 04:30:11Z dd32 $

  * @package pomo
  * @subpackage mo
  */
  * @package pomo
  * @subpackage mo
  */


@@ -10,7 +10,7 @@
 require_once dirname(__FILE__) . '/translations.php';
 require_once dirname(__FILE__) . '/streams.php';
 
 require_once dirname(__FILE__) . '/translations.php';
 require_once dirname(__FILE__) . '/streams.php';
 

-if ( !class_exists( 'MO' ) ):
+if ( ! class_exists( 'MO', false ) ):

 class MO extends Gettext_Translations {
 
        var $_nplurals = 2;
 class MO extends Gettext_Translations {
 
        var $_nplurals = 2;


@@ -27,6 +27,10 @@ class MO extends Gettext_Translations {
                return $this->import_from_reader($reader);
        }
 
                return $this->import_from_reader($reader);
        }
 

+       /**
+        * @param string $filename
+        * @return bool
+        */

        function export_to_file($filename) {
                $fh = fopen($filename, 'wb');
                if ( !$fh ) return false;
        function export_to_file($filename) {
                $fh = fopen($filename, 'wb');
                if ( !$fh ) return false;


@@ -34,7 +38,10 @@ class MO extends Gettext_Translations {
                fclose($fh);
                return $res;
        }
                fclose($fh);
                return $res;
        }

-       
+
+       /**
+        * @return string|false
+        */

        function export() {
                $tmp_fh = fopen("php://temp", 'r+');
                if ( !$tmp_fh ) return false;
        function export() {
                $tmp_fh = fopen("php://temp", 'r+');
                if ( !$tmp_fh ) return false;


@@ -42,9 +49,29 @@ class MO extends Gettext_Translations {
                rewind( $tmp_fh );
                return stream_get_contents( $tmp_fh );
        }
                rewind( $tmp_fh );
                return stream_get_contents( $tmp_fh );
        }

-       
+
+       /**
+        * @param Translation_Entry $entry
+        * @return bool
+        */
+       function is_entry_good_for_export( $entry ) {
+               if ( empty( $entry->translations ) ) {
+                       return false;
+               }
+
+               if ( !array_filter( $entry->translations ) ) {
+                       return false;
+               }
+
+               return true;
+       }
+
+       /**
+        * @param resource $fh
+        * @return true
+        */

        function export_to_file_handle($fh) {
        function export_to_file_handle($fh) {

-               $entries = array_filter($this->entries, create_function('$e', 'return !empty($e->translations);'));
+               $entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );

                ksort($entries);
                $magic = 0x950412de;
                $revision = 0;
                ksort($entries);
                $magic = 0x950412de;
                $revision = 0;


@@ -57,49 +84,62 @@ class MO extends Gettext_Translations {
                fwrite($fh, pack('V*', $magic, $revision, $total, $originals_lenghts_addr,
                        $translations_lenghts_addr, $size_of_hash, $hash_addr));
                fseek($fh, $originals_lenghts_addr);
                fwrite($fh, pack('V*', $magic, $revision, $total, $originals_lenghts_addr,
                        $translations_lenghts_addr, $size_of_hash, $hash_addr));
                fseek($fh, $originals_lenghts_addr);

-               
+

                // headers' msgid is an empty string
                fwrite($fh, pack('VV', 0, $current_addr));
                $current_addr++;
                $originals_table = chr(0);
 
                // headers' msgid is an empty string
                fwrite($fh, pack('VV', 0, $current_addr));
                $current_addr++;
                $originals_table = chr(0);
 

+               $reader = new POMO_Reader();
+

                foreach($entries as $entry) {
                        $originals_table .= $this->export_original($entry) . chr(0);
                foreach($entries as $entry) {
                        $originals_table .= $this->export_original($entry) . chr(0);

-                       $length = strlen($this->export_original($entry));
+                       $length = $reader->strlen($this->export_original($entry));

                        fwrite($fh, pack('VV', $length, $current_addr));
                        $current_addr += $length + 1; // account for the NULL byte after
                }
                        fwrite($fh, pack('VV', $length, $current_addr));
                        $current_addr += $length + 1; // account for the NULL byte after
                }

-               
+

                $exported_headers = $this->export_headers();
                $exported_headers = $this->export_headers();

-               fwrite($fh, pack('VV', strlen($exported_headers), $current_addr));
+               fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));

                $current_addr += strlen($exported_headers) + 1;
                $translations_table = $exported_headers . chr(0);
                $current_addr += strlen($exported_headers) + 1;
                $translations_table = $exported_headers . chr(0);

-               
+

                foreach($entries as $entry) {
                        $translations_table .= $this->export_translations($entry) . chr(0);
                foreach($entries as $entry) {
                        $translations_table .= $this->export_translations($entry) . chr(0);

-                       $length = strlen($this->export_translations($entry));
+                       $length = $reader->strlen($this->export_translations($entry));

                        fwrite($fh, pack('VV', $length, $current_addr));
                        $current_addr += $length + 1;
                }
                        fwrite($fh, pack('VV', $length, $current_addr));
                        $current_addr += $length + 1;
                }

-               
+

                fwrite($fh, $originals_table);
                fwrite($fh, $translations_table);
                return true;
        }
                fwrite($fh, $originals_table);
                fwrite($fh, $translations_table);
                return true;
        }

-       
+
+       /**
+        * @param Translation_Entry $entry
+        * @return string
+        */

        function export_original($entry) {
                //TODO: warnings for control characters
                $exported = $entry->singular;
                if ($entry->is_plural) $exported .= chr(0).$entry->plural;
        function export_original($entry) {
                //TODO: warnings for control characters
                $exported = $entry->singular;
                if ($entry->is_plural) $exported .= chr(0).$entry->plural;

-               if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
+               if ($entry->context) $exported = $entry->context . chr(4) . $exported;

                return $exported;
        }
                return $exported;
        }

-       
+
+       /**
+        * @param Translation_Entry $entry
+        * @return string
+        */

        function export_translations($entry) {
                //TODO: warnings for control characters
        function export_translations($entry) {
                //TODO: warnings for control characters

-               return implode(chr(0), $entry->translations);
+               return $entry->is_plural ? implode(chr(0), $entry->translations) : $entry->translations[0];

        }
        }

-       
+
+       /**
+        * @return string
+        */

        function export_headers() {
                $exported = '';
                foreach($this->headers as $header => $value) {
        function export_headers() {
                $exported = '';
                foreach($this->headers as $header => $value) {


@@ -108,6 +148,10 @@ class MO extends Gettext_Translations {
                return $exported;
        }
 
                return $exported;
        }
 

+       /**
+        * @param int $magic
+        * @return string|false
+        */

        function get_byteorder($magic) {
                // The magic is 0x950412de
 
        function get_byteorder($magic) {
                // The magic is 0x950412de
 


@@ -125,6 +169,9 @@ class MO extends Gettext_Translations {
                }
        }
 
                }
        }
 

+       /**
+        * @param POMO_FileReader $reader
+        */

        function import_from_reader($reader) {
                $endian_string = MO::get_byteorder($reader->readint32());
                if (false === $endian_string) {
        function import_from_reader($reader) {
                $endian_string = MO::get_byteorder($reader->readint32());
                if (false === $endian_string) {


@@ -143,46 +190,49 @@ class MO extends Gettext_Translations {
                if (!is_array($header))
                        return false;
 
                if (!is_array($header))
                        return false;
 

-               extract( $header );
-

                // support revision 0 of MO format specs, only
                // support revision 0 of MO format specs, only

-               if ($revision != 0)
+               if ( $header['revision'] != 0 ) {

                        return false;
                        return false;

+               }

 
                // seek to data blocks
 
                // seek to data blocks

-               $reader->seekto($originals_lenghts_addr);
+               $reader->seekto( $header['originals_lenghts_addr'] );

 
                // read originals' indices
 
                // read originals' indices

-               $originals_lengths_length = $translations_lenghts_addr - $originals_lenghts_addr;
-               if ( $originals_lengths_length != $total * 8 )
+               $originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
+               if ( $originals_lengths_length != $header['total'] * 8 ) {

                        return false;
                        return false;

+               }

 
                $originals = $reader->read($originals_lengths_length);
 
                $originals = $reader->read($originals_lengths_length);

-               if ( $reader->strlen( $originals ) != $originals_lengths_length )
+               if ( $reader->strlen( $originals ) != $originals_lengths_length ) {

                        return false;
                        return false;

+               }

 
                // read translations' indices
 
                // read translations' indices

-               $translations_lenghts_length = $hash_addr - $translations_lenghts_addr;
-               if ( $translations_lenghts_length != $total * 8 )
+               $translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
+               if ( $translations_lenghts_length != $header['total'] * 8 ) {

                        return false;
                        return false;

+               }

 
                $translations = $reader->read($translations_lenghts_length);
 
                $translations = $reader->read($translations_lenghts_length);

-               if ( $reader->strlen( $translations ) != $translations_lenghts_length )
+               if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {

                        return false;
                        return false;

+               }

 
                // transform raw data into set of indices
                $originals    = $reader->str_split( $originals, 8 );
                $translations = $reader->str_split( $translations, 8 );
 
                // skip hash table
 
                // transform raw data into set of indices
                $originals    = $reader->str_split( $originals, 8 );
                $translations = $reader->str_split( $translations, 8 );
 
                // skip hash table

-               $strings_addr = $hash_addr + $hash_length * 4;
+               $strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;

 
                $reader->seekto($strings_addr);
 
                $strings = $reader->read_all();
                $reader->close();
 
 
                $reader->seekto($strings_addr);
 
                $strings = $reader->read_all();
                $reader->close();
 

-               for ( $i = 0; $i < $total; $i++ ) {
+               for ( $i = 0; $i < $header['total']; $i++ ) {

                        $o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
                        $t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
                        if ( !$o || !$t ) return false;
                        $o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
                        $t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
                        if ( !$o || !$t ) return false;


@@ -195,8 +245,7 @@ class MO extends Gettext_Translations {
                        $translation = $reader->substr( $strings, $t['pos'], $t['length'] );
 
                        if ('' === $original) {
                        $translation = $reader->substr( $strings, $t['pos'], $t['length'] );
 
                        if ('' === $original) {

-                               $headers = $this->make_headers($translation);
-                               $this->set_headers($headers);
+                               $this->set_headers($this->make_headers($translation));

                        } else {
                                $entry = &$this->make_entry($original, $translation);
                                $this->entries[$entry->key()] = &$entry;
                        } else {
                                $entry = &$this->make_entry($original, $translation);
                                $this->entries[$entry->key()] = &$entry;


@@ -208,7 +257,7 @@ class MO extends Gettext_Translations {
        /**
         * Build a Translation_Entry from original string and translation strings,
         * found in a MO file
        /**
         * Build a Translation_Entry from original string and translation strings,
         * found in a MO file

-        * 
+        *

         * @static
         * @param string $original original string to translate from MO file. Might contain
         *      0x04 as context separator or 0x00 as singular/plural separator
         * @static
         * @param string $original original string to translate from MO file. Might contain
         *      0x04 as context separator or 0x00 as singular/plural separator


@@ -235,10 +284,17 @@ class MO extends Gettext_Translations {
                return $entry;
        }
 
                return $entry;
        }
 

+       /**
+        * @param int $count
+        * @return string
+        */

        function select_plural_form($count) {
                return $this->gettext_select_plural_form($count);
        }
 
        function select_plural_form($count) {
                return $this->gettext_select_plural_form($count);
        }
 

+       /**
+        * @return int
+        */

        function get_plural_forms_count() {
                return $this->_nplurals;
        }
        function get_plural_forms_count() {
                return $this->_nplurals;
        }