Merge pull request #257 from contactashish13/issue-240

Issue with non-English text

Author: rodica-andronache

classes/Visualizer/Source.php

@@ -222,10 +222,7 @@ protected function _normalizeData( $data ) {
 					}
 					break;
 				case 'string':
-					// condition introduced for Issue with non-English text #240 where languages such as Hebrew get messed up.
-					if ( function_exists( 'mb_detect_encoding' ) && mb_detect_encoding( $data[ $i ] ) !== 'UTF-8' ) {
-						$data[ $i ] = utf8_encode( $data[ $i ] );
-					}
+					$data[ $i ] = $this->toUTF8( $data[ $i ] );
 					break;
 			}
 		}
@@ -234,4 +231,21 @@ protected function _normalizeData( $data ) {
 		return $data;
 	}
 
+
+	/**
+	 * Converts values to UTF8, if required.
+	 *
+	 * @access protected
+	 *
+	 * @param string $datum The data to convert.
+	 *
+	 * @return string The converted data.
+	 */
+	protected final function toUTF8( $datum ) {
+		if ( ! function_exists( 'mb_detect_encoding' ) || mb_detect_encoding( $datum ) !== 'ASCII' ) {
+			$datum = \ForceUTF8\Encoding::toUTF8( $datum );
+		}
+		return $datum;
+	}
+
 }

classes/Visualizer/Source/Csv.php

@@ -83,6 +83,9 @@ private function _fetchSeries( &$handle ) {
 
 		for ( $i = 0, $len = count( $labels ); $i < $len; $i++ ) {
 			$default_type = $i == 0 ? 'string' : 'number';
+
+			$labels[ $i ] = $this->toUTF8( $labels[ $i ] );
+
 			$this->_series[] = array(
 				'label' => $labels[ $i ],
 				'type'  => isset( $types[ $i ] ) ? $types[ $i ] : $default_type,

composer.json

@@ -23,7 +23,8 @@
   "require": {
     "codeinwp/themeisle-sdk": "master",
     "xrstf/composer-php52": "^1.0.20",
-    "PHPOffice/PHPExcel": "^1.8.1"
+    "PHPOffice/PHPExcel": "^1.8.1",
+    "neitanod/forceutf8": "~2.0"
   },
   "autoload": {
     "files": [