From fd30730949e6f345fda1584b38818f7c52ff3fa9 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 12 Dec 2015 02:05:37 +0000 Subject: [PATCH] I18N: In `WP_Locale::init()`, replace space as a thousands separator with a non-breaking space. * If PHP version is 5.4.0 or greater, a regular space as a thousands separator is replaced with a non-breaking space, decoded using the `blog_charset` option. * If PHP version is 5.2.x or 5.3.x, ` ` or ` ` as a thousands separator is replaced with a regular space, as multiple bytes are not supported there. Fixes #10373. git-svn-id: https://develop.svn.wordpress.org/trunk@35884 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/locale.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/locale.php b/src/wp-includes/locale.php index 040fa5563a..54a3c93891 100644 --- a/src/wp-includes/locale.php +++ b/src/wp-includes/locale.php @@ -187,12 +187,23 @@ class WP_Locale { // See http://php.net/number_format /* translators: $thousands_sep argument for http://php.net/number_format, default is , */ - $trans = __('number_format_thousands_sep'); - $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans; + $thousands_sep = __( 'number_format_thousands_sep' ); + + 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( ' ', ' ' ), ' ', $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 . */ - $trans = __('number_format_decimal_point'); - $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans; + $decimal_point = __( 'number_format_decimal_point' ); + + $this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point; // Set text direction. if ( isset( $GLOBALS['text_direction'] ) )