Changeset 35372

Timestamp:

10/23/2015 11:50:37 AM (9 years ago)

Author:

SergeyBiryukov

Message:

In WP_Locale::init(), replace space as a thousands separator with a non-breaking space.

Also replace '  and   HTML entities with the actual character, since PHP < 5.4.0 does not allow multiple bytes to be used for decimal points or thousands separators.

Fixes #10373.

File:

• trunk/src/wp-includes/locale.php (modified) (1 diff)

trunk/src/wp-includes/locale.php

@@ -177 +177 @@
 
         /* 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' );
+        // Replace space with a non-breaking space to avoid wrapping. Also replace entities with actual character.
+        $thousands_sep = str_replace( array( ' ', ' ', ' ' ), "\xA0", $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.