From d1b6832295b7bb3947452cda867a3c12d67e1b42 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 12 Dec 2015 01:40:06 +0000 Subject: [PATCH] Revert [35878]. See #34967. git-svn-id: https://develop.svn.wordpress.org/trunk@35879 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/locale.php | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/wp-includes/locale.php b/src/wp-includes/locale.php index 54a3c93891..040fa5563a 100644 --- a/src/wp-includes/locale.php +++ b/src/wp-includes/locale.php @@ -187,23 +187,12 @@ class WP_Locale { // See http://php.net/number_format /* translators: $thousands_sep argument for http://php.net/number_format, default is , */ - $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; + $trans = __('number_format_thousands_sep'); + $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans; /* translators: $dec_point argument for http://php.net/number_format, default is . */ - $decimal_point = __( 'number_format_decimal_point' ); - - $this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point; + $trans = __('number_format_decimal_point'); + $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans; // Set text direction. if ( isset( $GLOBALS['text_direction'] ) )