Index: src/wp-includes/l10n.php
===================================================================
--- src/wp-includes/l10n.php (revisione 41249)
+++ src/wp-includes/l10n.php (copia locale)
@@ -581,13 +581,30 @@
*/
$mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain );
- if ( !is_readable( $mofile ) ) return false;
+ if ( !is_readable( $mofile ) ) return false;
- $mo = new MO();
+ if ( isset( $l10n[$domain] ) ) {
+ if ( $l10n[$domain] instanceof MO_dynamic && $l10n[$domain]->Mo_file_loaded( $mofile ) ) {
+ return true;
+ }
+ }
+
+ $use_mo_dynamic = apply_filters( 'load_mo_dynamic', true, $domain );
+ if( $use_mo_dynamic ) {
+ $cache_mo_dynamic = apply_filters( 'cache_mo_dynamic', true, $domain );
+ $mo = new MO_dynamic ( $domain, $cache_mo_dynamic );
+ } else {
+ $mo = new MO();
+ }
+
if ( !$mo->import_from_file( $mofile ) ) return false;
-
- if ( isset( $l10n[$domain] ) )
+
+ if ( isset( $l10n[$domain] ) ){
$mo->merge_with( $l10n[$domain] );
+ if ( $l10n[$domain] instanceof MO_dynamic ) {
+ $l10n[$domain]->unhook_and_close();
+ }
+ }
unset( $l10n_unloaded[ $domain ] );
Index: src/wp-includes/load.php
===================================================================
--- src/wp-includes/load.php (revisione 41249)
+++ src/wp-includes/load.php (copia locale)
@@ -870,7 +870,9 @@
require ABSPATH . WPINC . '/version.php';
// Translation and localization
+ require_once ABSPATH . WPINC . '/pomo/native.php' ;
require_once ABSPATH . WPINC . '/pomo/mo.php';
+ require_once ABSPATH . WPINC . '/pomo/mo-dynamic-loader.php';
require_once ABSPATH . WPINC . '/l10n.php';
require_once ABSPATH . WPINC . '/class-wp-locale.php';
require_once ABSPATH . WPINC . '/class-wp-locale-switcher.php';
Index: src/wp-includes/pomo/mo-dynamic-loader.php
===================================================================
--- src/wp-includes/pomo/mo-dynamic-loader.php (nonexistent)
+++ src/wp-includes/pomo/mo-dynamic-loader.php (copia locale)
@@ -0,0 +1,590 @@
+
+ * @package WP Performance Pack
+ * @since 0.1
+ */
+
+/**
+ * Class holds information about a single MO file
+ */
+class MO_item {
+ var $reader = NULL;
+ var $mofile = '';
+
+ var $loaded = false;
+ var $total = 0;
+ var $originals = array();
+ var $originals_table;
+ var $translations_table;
+ var $last_access;
+
+ var $hash_table;
+ var $hash_length = 0;
+
+ function clear_reader () {
+ if ( $this->reader !== NULL ) {
+ $this->reader->close();
+ $this->reader = NULL;
+ }
+ }
+}
+
+/**
+ * Class for working with MO files
+ * Translation entries are created dynamically.
+ * Due to this export and save functions are not implemented.
+ */
+class MO_dynamic extends Gettext_Translations {
+ private $caching = false;
+ private $modified = false;
+
+ protected $domain = '';
+ protected $_nplurals = 2;
+ protected $MOs = array();
+
+ protected $translations = NULL;
+ protected $base_translations = NULL;
+
+ function __construct( $domain, $caching = false ) {
+ $this->domain = $domain;
+ $this->caching = $caching;
+ if ( $caching ) {
+ add_action ( 'shutdown', array( $this, 'save_to_cache' ) );
+ add_action ( 'admin_init', array( $this, 'save_base_translations' ), 100 );
+ }
+ // Reader has to be destroyed befor any upgrades or else upgrade might fail, if a
+ // reader is loaded (cannot delete old plugin/theme/etc. because a language file
+ // is still opened).
+ add_filter('upgrader_pre_install', array($this, 'clear_reader_before_upgrade'), 10, 2);
+ }
+
+ static function get_byteorder($magic) {
+ // The magic is 0x950412de
+
+ // bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
+ $magic_little = (int) - 1794895138;
+ $magic_little_64 = (int) 2500072158;
+ // 0xde120495
+ $magic_big = ((int) - 569244523) & 0xFFFFFFFF;
+ if ($magic_little == $magic || $magic_little_64 == $magic) {
+ return 'little';
+ } else if ($magic_big == $magic) {
+ return 'big';
+ } else {
+ return false;
+ }
+ }
+
+ function unhook_and_close () {
+ remove_action ( 'shutdown', array( $this, 'save_to_cache' ) );
+ remove_action ( 'admin_init', array( $this, 'save_base_translations' ), 100 );
+ foreach ( $this->MOs as $moitem ) {
+ $moitem->clear_reader();
+ }
+ $this->MOs = array();
+ }
+
+ function __destruct() {
+ foreach ( $this->MOs as $moitem ) {
+ $moitem->clear_reader();
+ }
+ }
+
+ function clear_reader_before_upgrade($return, $plugin) {
+ // stripped down copy of class-wp-upgrader.php Plugin_Upgrader::deactivate_plugin_before_upgrade
+ if ( is_wp_error($return) ) //Bypass.
+ return $return;
+
+ foreach ( $this->MOs as $moitem ) {
+ $moitem->clear_reader();
+ }
+ }
+
+ function get_current_url () {
+ $current_url = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+ if ( isset($_SERVER['QUERY_STRING']) && ( $len = strlen( $_SERVER['QUERY_STRING'] ) ) > 0 ) {
+ $current_url = substr ( $current_url, 0, strlen($current_url) - $len - 1 );
+ }
+ if ( substr( $current_url, -10 ) === '/wp-admin/' ) {
+ $current_url .= 'index.php';
+ }
+ if ( isset( $_GET['page'] ) ) {
+ $current_url .= '?page=' . $_GET['page'];
+ }
+ return $current_url;
+ }
+
+ function import_from_file( $filename ) {
+ $moitem = new MO_item();
+ $moitem->mofile = $filename;
+ $this->MOs[] = $moitem;
+
+ // because only a reference to the MO file is created, at this point there is no information if $filename is a valid MO file, so the return value is always true
+ return true;
+ }
+
+ function save_base_translations () {
+ if ( is_admin() && $this->translations !== NULL && $this->base_translations === NULL ) {
+ $this->base_translations = $this->translations;
+ $this->translations = array();
+ }
+ }
+
+ private function cache_get ( $key, $cache_time ) {
+ $t = wp_cache_get( $key, 'dymoloader1.0' );
+ if ( $t !== false && isset( $t['data'] ) ) {
+ // check soft expire
+ if ( $t['softexpire'] < time() ) {
+ // update cache with new soft expire time
+ $t['softexpire'] = time() + ( $cache_time - ( 5 * MINUTE_IN_SECONDS ) );
+ wp_cache_replace( $key, $t, 'dymoloader1.0', $cache_time );
+ }
+ return json_decode( gzuncompress( $t['data'] ), true );
+ }
+ return NULL;
+ }
+
+ private function cache_set ( $key, $cache_time, $data ) {
+ $t = array();
+ $t['softexpire'] = time() + ( $cache_time - ( 5 * MINUTE_IN_SECONDS ) );
+ $t['data'] = gzcompress( json_encode( $data ) );
+ wp_cache_set( $key, $t, 'dymoloader1.0', $cache_time );
+ }
+
+ function import_domain_from_cache () {
+ // build cache key from domain and request uri
+ if ( $this->caching ) {
+ if ( is_admin() ) {
+ $this->base_translations = $this->cache_get( 'backend_' . $this->domain, HOUR_IN_SECONDS );
+ $this->translations = $this->cache_get( 'backend_' . $this->domain . '_' . $this->get_current_url(), 30 * MINUTE_IN_SECONDS );
+ } else {
+ $this->translations = $this->cache_get( 'frontend_' . $this->domain, HOUR_IN_SECONDS );
+ }
+ }
+
+ if ( $this->translations === NULL ) {
+ $this->translations = array();
+ }
+ }
+
+ function save_to_cache () {
+ if ( $this->modified ) {
+ if ( is_admin() ) {
+ $this->cache_set( 'backend_' . $this->domain . '_' . $this->get_current_url(), 30 * MINUTE_IN_SECONDS, $this->translations ); // keep admin page cache for 30 minutes
+ if ( count( $this->base_translations ) > 0 ) {
+ $this->cache_set( 'backend_'.$this->domain, HOUR_IN_SECONDS, $this->base_translations ); // keep admin base cache for 60 minutes
+ }
+ } else {
+ $this->cache_set( 'frontend_'.$this->domain, HOUR_IN_SECONDS, $this->translations ); // keep front end cache for 60 minutes
+ }
+ }
+ }
+
+ private function import_fail ( &$moitem ) {
+ $moitem->reader->close();
+ $moitem->reader = false;
+ unset( $moitem->originals );
+ unset( $moitem->originals_table );
+ unset( $moitem->translations_table );
+ unset( $moitem->hash_table );
+
+ return false;
+ }
+
+ function import_from_reader( &$moitem ) {
+ if ( $moitem->reader !== NULL) {
+ return ( $moitem->reader !== false );
+ }
+
+ $file_size = filesize( $moitem->mofile );
+ $moitem->reader=new POMO_FileReader( $moitem->mofile );
+
+ if ( $moitem->loaded === true ) {
+ return true;
+ }
+
+ $endian_string = static::get_byteorder( $moitem->reader->readint32() );
+ if ( false === $endian_string ) {
+ return $this->import_fail( $moitem );
+ }
+ $moitem->reader->setEndian( $endian_string );
+ $endian = ( 'big' == $endian_string ) ? 'N' : 'V';
+
+ $header = $moitem->reader->read( 24 );
+ if ( $moitem->reader->strlen( $header ) != 24 ) {
+ return $this->import_fail( $moitem );
+ }
+
+ // parse header
+ $header = unpack( "{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header );
+ if ( !is_array( $header ) ) {
+ return $this->import_fail( $moitem );
+ }
+ extract( $header );
+
+ // support revision 0 of MO format specs, only
+ if ( $revision !== 0 ) {
+ return $this->import_fail( $moitem );
+ }
+
+ $moitem->total = $total;
+
+ // read hashtable
+ $moitem->hash_length = $hash_length;
+ if ( $hash_length > 0 ) {
+ $moitem->reader->seekto ( $hash_addr );
+ $str = $moitem->reader->read( $hash_length * 4 );
+ if ( $moitem->reader->strlen( $str ) != $hash_length * 4 ) {
+ return $this->import_fail( $moitem );
+ }
+ if ( class_exists ( 'SplFixedArray' ) )
+ $moitem->hash_table = SplFixedArray::fromArray( unpack ( $endian.$hash_length, $str ), false );
+ else
+ $moitem->hash_table = array_slice( unpack ( $endian.$hash_length, $str ), 0 ); // force zero based index
+ }
+
+ // read originals' indices
+ $moitem->reader->seekto( $originals_lenghts_addr );
+ $originals_lengths_length = $translations_lenghts_addr - $originals_lenghts_addr;
+ if ( $originals_lengths_length != $total * 8 ) {
+ return $this->import_fail( $moitem );
+ }
+ $str = $moitem->reader->read( $originals_lengths_length );
+ if ( $moitem->reader->strlen( $str ) != $originals_lengths_length ) {
+ return $this->import_fail( $moitem );
+ }
+ if ( class_exists ( 'SplFixedArray' ) )
+ $moitem->originals_table = SplFixedArray::fromArray( unpack ( $endian.($total * 2), $str ), false );
+ else
+ $moitem->originals_table = array_slice( unpack ( $endian.($total * 2), $str ), 0 ); // force zero based index
+
+ // "sanity check" ( i.e. test for corrupted mo file )
+ for ( $i = 0, $max = $total * 2; $i < $max; $i+=2 ) {
+ if ( $moitem->originals_table[ $i + 1 ] > $file_size
+ || $moitem->originals_table[ $i + 1 ] + $moitem->originals_table[ $i ] > $file_size ) {
+ return $this->import_fail( $moitem );
+ }
+ }
+
+ // read translations' indices
+ $translations_lenghts_length = $hash_addr - $translations_lenghts_addr;
+ if ( $translations_lenghts_length != $total * 8 ) {
+ return $this->import_fail( $moitem );
+ }
+ $str = $moitem->reader->read( $translations_lenghts_length );
+ if ( $moitem->reader->strlen( $str ) != $translations_lenghts_length ) {
+ return $this->import_fail( $moitem );
+ }
+ if ( class_exists ( 'SplFixedArray' ) )
+ $moitem->translations_table = SplFixedArray::fromArray( unpack ( $endian.($total * 2), $str ), false );
+ else
+ $moitem->translations_table = array_slice( unpack ( $endian.($total * 2), $str ), 0 ); // force zero based index
+
+ // "sanity check" ( i.e. test for corrupted mo file )
+ for ( $i = 0, $max = $total * 2; $i < $max; $i+=2 ) {
+ if ( $moitem->translations_table[ $i + 1 ] > $file_size
+ || $moitem->translations_table[ $i + 1 ] + $moitem->translations_table[ $i ] > $file_size ) {
+ return $this->import_fail( $moitem );
+ }
+ }
+
+ $moitem->loaded = true; // read headers can fail, so set loaded to true
+
+ // read headers
+ for ( $i = 0, $max = $total * 2; $i < $max; $i+=2 ) {
+ $original = '';
+ if ( $moitem->originals_table[$i] > 0 ) {
+ $moitem->reader->seekto( $moitem->originals_table[$i+1] );
+ $original = $moitem->reader->read( $moitem->originals_table[$i] );
+
+ $j = strpos( $original, 0 );
+ if ( $j !== false )
+ $original = substr( $original, 0, $i );
+ }
+
+ if ( $original === '' ) {
+ $translation = '';
+ if ( $moitem->translations_table[$i] > 0 ) {
+ $moitem->reader->seekto( $moitem->translations_table[$i+1] );
+ $translation = $moitem->reader->read( $moitem->translations_table[$i] );
+ }
+
+ $this->set_headers( $this->make_headers( $translation ) );
+ } else
+ return true;
+ }
+ return true;
+ }
+
+ protected function search_translation ( $key ) {
+ $hash_val = NULL;
+ $key_len = strlen( $key );
+
+ for ( $j = 0, $max = count ( $this->MOs ); $j < $max; $j++ ) {
+ $moitem = $this->MOs[$j];
+ if ( $moitem->reader == NULL ) {
+ if ( !$this->import_from_reader( $moitem ) ) {
+ // Error reading MO file, so delete it from MO list to prevent subsequent access
+ unset( $this->MOs[$j] );
+ return false; // return or continue?
+ }
+ }
+
+ if ($moitem->hash_length>0) {
+ /* Use mo file hash table to search translation */
+
+ // calculate hash value
+ // hashpjw function by P.J. Weinberger from gettext hash-string.c
+ // adapted to php and its quirkiness caused by missing unsigned ints and shift operators...
+ if ( $hash_val === NULL) {
+ $hash_val = 0;
+ $chars = unpack ( 'C*', $key ); // faster than accessing every single char by ord(char)
+ foreach ( $chars as $char ) {
+ $hash_val = ( $hash_val << 4 ) + $char;
+ if( 0 !== ( $g = $hash_val & 0xF0000000 ) ){
+ if ( $g < 0 )
+ $hash_val ^= ( ( ($g & 0x7FFFFFFF) >> 24 ) | 0x80 ); // wordaround: php operator >> is arithmetic, not logic, so shifting negative values gives unexpected results. Cut sign bit, shift right, set sign bit again.
+ /*
+ workaround based on this function (adapted to actual used parameters):
+
+ function shr($var,$amt) {
+ $mask = 0x40000000;
+ if($var < 0) {
+ $var &= 0x7FFFFFFF;
+ $mask = $mask >> ($amt-1);
+ return ($var >> $amt) | $mask;
+ }
+ return $var >> $amt;
+ }
+ */
+ else
+ $hash_val ^= ( $g >> 24 );
+ $hash_val ^= $g;
+ }
+ }
+ }
+
+ // calculate hash table index and increment
+ if ( $hash_val >= 0 ) {
+ $idx = $hash_val % $moitem->hash_length;
+ $incr = 1 + ($hash_val % ($moitem->hash_length - 2));
+ } else {
+ $hash_val = (float) sprintf('%u', $hash_val); // workaround php not knowing unsigned int - %u outputs $hval as unsigned, then cast to float
+ $idx = fmod( $hash_val, $moitem->hash_length);
+ $incr = 1 + fmod ($hash_val, ($moitem->hash_length - 2));
+ }
+
+ $orig_idx = $moitem->hash_table[$idx];
+ while ( $orig_idx != 0 ) {
+ $orig_idx--; // index adjustment
+
+ $pos = $orig_idx * 2;
+ if ( $orig_idx < $moitem->total // orig_idx must be in range
+ && $moitem->originals_table[$pos] >= $key_len ) { // and original length must be equal or greater as key length (original can contain plural forms)
+
+ // read original string
+ $mo_original = '';
+ if ( $moitem->originals_table[$pos] > 0 ) {
+ $moitem->reader->seekto( $moitem->originals_table[$pos+1] );
+ $mo_original = $moitem->reader->read( $moitem->originals_table[$pos] );
+ }
+
+ if ( $moitem->originals_table[$pos] == $key_len
+ || ord( $mo_original{$key_len} ) == 0 ) {
+ // strings can only match if they have the same length, no need to inspect otherwise
+
+ if ( false !== ( $i = strpos( $mo_original, 0 ) ) )
+ $cmpval = strncmp( $key, $mo_original, $i );
+ else
+ $cmpval = strcmp( $key, $mo_original );
+
+ if ( $cmpval === 0 ) {
+ // key found, read translation string
+ $moitem->reader->seekto( $moitem->translations_table[$pos+1] );
+ $translation = $moitem->reader->read( $moitem->translations_table[$pos] );
+ if ( $j > 0 ) {
+ // Assuming frequent subsequent translations from the same file resort MOs by access time to avoid unnecessary search in the wrong files.
+ $moitem->last_access=time();
+ usort( $this->MOs, function ($a, $b) {return ($b->last_access - $a->last_access);} );
+ }
+ return $translation;
+ }
+ }
+ }
+
+ if ($idx >= $moitem->hash_length - $incr)
+ $idx -= ($moitem->hash_length - $incr);
+ else
+ $idx += $incr;
+ $orig_idx = $moitem->hash_table[$idx];
+ }
+ } else {
+ /* No hash-table, do binary search for matching originals entry */
+ $left = 0;
+ $right = $moitem->total-1;
+
+ while ( $left <= $right ) {
+ $pivot = $left + (int) ( ( $right - $left ) / 2 );
+ $pos = $pivot * 2;
+
+ if ( isset( $moitem->originals[$pivot] ) ) {
+ $mo_original = $moitem->originals[$pivot];
+ } else {
+ // read and "cache" original string to improve performance of subsequent searches
+ if ( $moitem->originals_table[$pos] > 0 ) {
+ $moitem->reader->seekto( $moitem->originals_table[$pos+1] );
+ $mo_original = $moitem->reader->read( $moitem->originals_table[$pos] );
+ } else {
+ $mo_original = '';
+ }
+ $moitem->originals[$pivot] = $mo_original;
+ }
+
+ if ( false !== ( $i = strpos( $mo_original, 0 ) ) )
+ $cmpval = strncmp( $key, $mo_original, $i );
+ else
+ $cmpval = strcmp( $key, $mo_original );
+
+ if ( $cmpval === 0 ) {
+ // key found read translation string
+ $moitem->reader->seekto( $moitem->translations_table[$pos+1] );
+ $translation = $moitem->reader->read( $moitem->translations_table[$pos] );
+ if ( $j > 0 ) {
+ // Assuming frequent subsequent translations from the same file resort MOs by access time to avoid unnecessary search in the wrong files.
+ $moitem->last_access=time();
+ usort( $this->MOs, function ($a, $b) {return ($b->last_access - $a->last_access);} );
+ }
+ return $translation;
+ } else if ( $cmpval < 0 ) {
+ $right = $pivot - 1;
+ } else { // if ($cmpval>0)
+ $left = $pivot + 1;
+ }
+ }
+ }
+ }
+ // key not found
+ return false;
+ }
+
+ function translate ($singular, $context = NULL) {
+ if ( !isset ($singular{0} ) ) return $singular;
+
+ if ( $context == NULL ) {
+ $s = $singular;
+ } else {
+ $s = $context . chr(4) . $singular;
+ }
+
+ if ( $this->translations === NULL ) {
+ $this->import_domain_from_cache();
+ }
+
+ if ( isset( $this->translations[$s] ) ) {
+ $t = $this->translations[$s];
+ } elseif ( isset ($this->base_translations[$s] ) ) {
+ $t = $this->base_translations[$s];
+ } else {
+ if ( false !== ( $t = $this->search_translation( $s ) ) ) {
+ $this->translations[$s] = $t;
+ $this->modified = true;
+ }
+ }
+
+ if ( $t !== false ) {
+ if ( false !== ( $i = strpos( $t, 0 ) ) ) {
+ return substr( $t, 0, $i );
+ } else {
+ return $t;
+ }
+ } else {
+ $this->translations[$s] = $singular;
+ $this->modified = true;
+ return $singular;
+ }
+ }
+
+ function translate_plural ($singular, $plural, $count, $context = null) {
+ if ( !isset( $singular{0} ) ) return $singular;
+
+ // Get the "default" return-value
+ $default = ($count == 1 ? $singular : $plural);
+
+ if ( $context == NULL ) {
+ $s = $singular;
+ } else {
+ $s = $context . chr(4) . $singular;
+ }
+
+ if ( $this->translations === NULL ) {
+ $this->import_domain_from_cache();
+ }
+
+ if ( isset( $this->translations[$s] ) ) {
+ $t = $this->translations[$s];
+ } elseif ( isset ($this->base_translations[$s] ) ) {
+ $t = $this->base_translations[$s];
+ } else {
+ if ( false !== ( $t = $this->search_translation( $s ) ) ) {
+ $this->translations[$s] = $t;
+ $this->modified = true;
+ }
+ }
+
+ if ( $t !== false ) {
+ if ( false !== ( $i = strpos( $t, 0 ) ) ) {
+ if ( $count == 1 ) {
+ return substr ( $t, 0, $i );
+ } else {
+ // only one plural form is assumed - needs improvement
+ return substr( $t, $i+1 );
+ }
+ } else {
+ return $default;
+ }
+ } else {
+ $this->translations[$s] = $singular . chr(0) . $plural;
+ $this->modified = true;
+ return $default;
+ }
+ }
+
+ function merge_with( &$other ) {
+ if ( $other instanceof WPPP_MO_dynamic ) {
+ if ( $other->translations !== NULL ) {
+ foreach( $other->translations as $key => $translation ) {
+ $this->translations[$key] = $translation;
+ }
+ }
+ if ( $other->base_translations !== NULL ) {
+ foreach( $other->base_translations as $key => $translation ) {
+ $this->base_translations[$key] = $translation;
+ }
+ }
+
+ foreach ( $other->MOs as $moitem ) {
+ $i = 0;
+ $c = count( $this->MOs );
+ $found = false;
+ while ( !$found && ( $i < $c ) ) {
+ $found = $this->MOs[$i]->mofile == $moitem->mofile;
+ $i++;
+ }
+ if ( !$found )
+ $this->MOs[] = $moitem;
+ }
+ }
+ }
+
+ function MO_file_loaded ( $mofile ) {
+ foreach ($this->MOs as $moitem) {
+ if ($moitem->mofile == $mofile) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
\ No newline at end of file
Index: src/wp-includes/pomo/native.php
===================================================================
--- src/wp-includes/pomo/native.php (nonexistent)
+++ src/wp-includes/pomo/native.php (copia locale)
@@ -0,0 +1,242 @@
+
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * @revision 02
+ * @author Bernd Holzmueller
+ * @url http://oss.tiggerswelt.net/wordpress/3.3.1/
+ **/
+
+ // Check if gettext-support is available
+ if (!extension_loaded ('gettext'))
+ return;
+
+ class Translate_GetText_Native {
+ // Our default domain
+ private $Domain = null;
+
+ // Merged domains
+ private $pOthers = array ();
+ private $sOthers = array ();
+
+ // Some Dummy-Function just to be API-compatible
+ function add_entry ($entry) { return false; }
+ function add_entry_or_merge ($entry) { return false; }
+ function set_header ($header, $value) { return false; }
+ function set_headers (&$headers) { return false; }
+ function get_header ($header) { return false; }
+ function translate_entry (&$entry) { return false; }
+
+ // {{{ select_plural_form
+ /**
+ * Given the number of items, returns the 0-based index of the plural form to use
+ *
+ * Here, in the base Translations class, the common logic for English is implemented:
+ * 0 if there is one element, 1 otherwise
+ *
+ * This function should be overrided by the sub-classes. For example MO/PO can derive the logic
+ * from their headers.
+ *
+ * @param integer $count number of items
+ **/
+ function select_plural_form ($count) {
+ return (1 == $count? 0 : 1);
+ }
+ // }}}
+
+ function get_plural_forms_count () { return 2; }
+
+ // {{{ merge_with
+ /**
+ * Merge this translation with another one, the other one takes precedence
+ *
+ * @param object $other
+ *
+ * @access public
+ * @return void
+ **/
+ function merge_with (&$other) {
+ $this->pOthers [] = $other;
+ }
+ // }}}
+
+ // {{{ merge_originals_with
+ /**
+ * Merge this translation with another one, this one takes precedence
+ *
+ * @param object $other
+ *
+ * @access public
+ * @return void
+ **/
+ function merge_originals_with (&$other) {
+ $this->sOthers [] = $Other;
+ }
+ // }}}
+
+ // {{{ translate
+ /**
+ * Try to translate a given string
+ *
+ * @param string $singular
+ * @param string $context (optional)
+ *
+ * @access public
+ * @return string
+ **/
+ function translate ($singular, $context = null) {
+ // Check for an empty string
+ if (strlen ($singular) == 0)
+ return $singular;
+
+ // Check other domains that take precedence
+ foreach ($this->pOthers as $o)
+ if (($t = $o->translate ($singular, $context)) != $singular)
+ return $t;
+
+ // Make sure we have a domain assigned
+ if ($this->Domain === null)
+ return $singular;
+
+ // Translate without a context
+ if ($context === null) {
+ if (($t = dgettext ($this->Domain, $singular)) != $singular)
+ return $t;
+
+ // Translate with a given context
+ } else {
+ $T = $context . "\x04" . $singular;
+ $t = dgettext ($this->Domain, $T);
+
+ if ($T != $t)
+ return $t;
+ }
+
+ // Check for other domains
+ foreach ($this->sOthers as $o)
+ if (($t = $o->translate ($singular, $context)) != $singular)
+ return $t;
+
+ return $singular;
+ }
+ // }}}
+
+ // {{{ translate_plural
+ /**
+ * Try to translate a plural string
+ *
+ * @param string $singular Singular version
+ * @param string $plural Plural version
+ * @param int $count Number of "items"
+ * @param string $context (optional)
+ *
+ * @access public
+ * @return string
+ **/
+ function translate_plural ($singular, $plural, $count, $context = null) {
+ // Check for an empty string
+ if (strlen ($singular) == 0)
+ return $singular;
+
+ // Get the "default" return-value
+ $default = ($count == 1 ? $singular : $plural);
+
+ // Check other domains that take precedence
+ foreach ($this->pOthers as $o)
+ if (($t = $o->translate_plural ($singular, $plural, $count, $context)) != $default)
+ return $t;
+
+ // Make sure we have a domain assigned
+ if ($this->Domain === null)
+ return $default;
+
+ // Translate without context
+ if ($context === null) {
+ $t = dngettext ($this->Domain, $singular, $plural, $count);
+
+ if (($t != $singular) && ($t != $plural))
+ return $t;
+
+ // Translate using a given context
+ } else {
+ $T = $context . "\x04" . $singular;
+ $t = dngettext ($this->Domain, $T, $plural, $count);
+
+ if (($T != $t) && ($t != $plural))
+ return $t;
+ }
+
+ // Check other domains
+ foreach ($this->sOthers as $o)
+ if (($t = $o->translate_plural ($singular, $plural, $count, $context)) != $default)
+ return $t;
+
+ return $default;
+ }
+ // }}}
+
+ // {{{ import_from_file
+ /**
+ * Fills up with the entries from MO file $filename
+ *
+ * @param string $filename MO file to load
+ **/
+ function import_from_file ($filename) {
+ // Make sure that the locale is set correctly in environment
+ global $locale;
+
+ putenv ('LC_ALL=' . $locale);
+ setlocale (LC_ALL, $locale);
+
+ // Retrive MD5-hash of the file
+ # DIRTY! But there is no other way at the moment to make this work
+ if (!($Domain = md5_file ($filename)))
+ return false;
+
+ // Make sure that the language-directory exists
+ $Path = './wp-lang/' . $locale . '/LC_MESSAGES';
+
+ if (!wp_mkdir_p ($Path))
+ return false;
+
+ // Make sure that the MO-File is existant at the destination
+ $fn = $Path . '/' . $Domain . '.mo';
+
+ if (!is_file ($fn) && !@copy ($filename, $fn))
+ return false;
+
+ // Setup the "domain" for gettext
+ bindtextdomain ($Domain, './wp-lang/');
+ bind_textdomain_codeset ($Domain, 'UTF-8');
+
+ // Do the final stuff and return success
+ $this->Domain = $Domain;
+
+ return true;
+ }
+ // }}}
+ }
+
+ if (function_exists ('class_alias'))
+ class_alias ('Translate_GetText_Native', 'MO');
+ else {
+ class MO extends Translate_GetText_Native { }
+ }
+
Index: src/wp-settings.php
===================================================================
--- src/wp-settings.php (revisione 41249)
+++ src/wp-settings.php (copia locale)
@@ -99,7 +99,9 @@
require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' );
require( ABSPATH . WPINC . '/class-wp.php' );
require( ABSPATH . WPINC . '/class-wp-error.php' );
+require( ABSPATH . WPINC . '/pomo/native.php' );
require( ABSPATH . WPINC . '/pomo/mo.php' );
+require( ABSPATH . WPINC . '/pomo/mo-dynamic-loader.php' );
// Include the wpdb class and, if present, a db.php database drop-in.
global $wpdb;