sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

I18N: In `wp_maybe_decline_date()`, bail early if translation functions are not available, e.g. in `SHORTINIT` mode. 

Fixes #34967 for trunk.

git-svn-id: https://develop.svn.wordpress.org/trunk@35878 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2015-12-12 01:34:33 +00:00
parent 7493d90f96
commit 27f35b5675
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wp-includes/locale.php
View File

@ -187,12 +187,23 @@ class WP_Locale {
// See http://php.net/number_format // See http://php.net/number_format
/* translators: $thousands_sep argument for http://php.net/number_format, default is , */ /* translators: $thousands_sep argument for http://php.net/number_format, default is , */
$trans = __('number_format_thousands_sep'); $thousands_sep = __( 'number_format_thousands_sep' );
$this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans;
if ( version_compare( PHP_VERSION, '5.4', '>=' ) ) {
// Replace space with a non-breaking space to avoid wrapping.
$non_breaking_space = html_entity_decode( ' ', ENT_QUOTES, get_option( 'blog_charset' ) );
$thousands_sep = str_replace( ' ', $non_breaking_space, $thousands_sep );
} else {
// PHP < 5.4.0 does not support multiple bytes in thousands separator.
$thousands_sep = str_replace( array( '&nbsp;', '&#160;' ), ' ', $thousands_sep );
}
$this->number_format['thousands_sep'] = ( 'number_format_thousands_sep' === $thousands_sep ) ? ',' : $thousands_sep;
/* translators: $dec_point argument for http://php.net/number_format, default is . */ /* translators: $dec_point argument for http://php.net/number_format, default is . */
$trans = __('number_format_decimal_point'); $decimal_point = __( 'number_format_decimal_point' );
$this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
$this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point;
// Set text direction. // Set text direction.
if ( isset( $GLOBALS['text_direction'] ) ) if ( isset( $GLOBALS['text_direction'] ) )