From 600b303668a8bbf1ecd17d54421c459c943b9d6e Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Wed, 4 Nov 2015 21:39:26 +0000
Subject: [PATCH] Revert [35372] because of possible encoding issues, needs
 more investigation.

See #10373.
Built from https://develop.svn.wordpress.org/trunk@35522


git-svn-id: http://core.svn.wordpress.org/trunk@35486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/locale.php  | 12 ++++--------
 wp-includes/version.php |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/wp-includes/locale.php b/wp-includes/locale.php
index 90d969681c..7ba005c352 100644
--- a/wp-includes/locale.php
+++ b/wp-includes/locale.php
@@ -190,16 +190,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' );
-		// Replace space with a non-breaking space to avoid wrapping. Also replace entities with actual character.
-		$thousands_sep = str_replace( array( ' ', '&nbsp;', '&#160;' ), "\xA0", $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'] ) )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2f1e9cc31e..68c5d81c6f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta2-35521';
+$wp_version = '4.4-beta2-35522';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.