Merge pull request #245 from contactashish13/issue-240

Issue with non-English text

Author: selul

classes/Visualizer/Module.php

@@ -323,4 +323,20 @@ private function _getHTML( $rows ) {
 		);
 	}
 
+	/**
+	 * Returns the language of the locale.
+	 *
+	 * @access protected
+	 */
+	protected function get_language() {
+		$locale = get_locale();
+		if ( empty( $locale ) ) {
+			return '';
+		}
+		$array  = explode( '_', $locale );
+		if ( count( $array ) < 2 ) {
+			return '';
+		}
+		return reset( $array );
+	}
 }

classes/Visualizer/Module/Admin.php

@@ -460,6 +460,8 @@ public function renderLibraryPage() {
 		$ajaxurl = admin_url( 'admin-ajax.php' );
 		wp_localize_script(
 			'visualizer-library', 'visualizer', array(
+				'language'  => $this->get_language(),
+				'map_api_key' => get_option( 'visualizer-map-api-key' ),
 				'charts' => $charts,
 				'urls'   => array(
 					'base'   => add_query_arg( 'vpage', false ),

classes/Visualizer/Module/Chart.php

@@ -336,6 +336,7 @@ private function _handleDataAndSettingsPage() {
 				'charts' => array(
 					'canvas' => $data,
 				),
+				'language'  => $this->get_language(),
 				'map_api_key' => get_option( 'visualizer-map-api-key' ),
 				'ajax'                 => array(
 					'url'     => admin_url( 'admin-ajax.php' ),

classes/Visualizer/Module/Frontend.php

@@ -238,6 +238,7 @@ public function renderChart( $atts ) {
 		wp_localize_script(
 			'visualizer-render', 'visualizer', array(
 				'charts'        => $this->_charts,
+				'language'  => $this->get_language(),
 				'map_api_key'   => get_option( 'visualizer-map-api-key' ),
 				'rest_url'      => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
 				'i10n'          => array(

classes/Visualizer/Source.php

@@ -222,7 +222,10 @@ protected function _normalizeData( $data ) {
 					}
 					break;
 				case 'string':
-					$data[ $i ] = utf8_encode( $data[ $i ] );
+					// 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 ] );
+					}
 					break;
 			}
 		}

js/render.js

@@ -222,7 +222,7 @@
 		}
 	};
 
-	g.charts.load("current", {packages: ["corechart", "geochart", "gauge", "table", "timeline"], mapsApiKey: v.map_api_key});
+	g.charts.load("current", {packages: ["corechart", "geochart", "gauge", "table", "timeline"], mapsApiKey: v.map_api_key, 'language' : v.language});
 	g.charts.setOnLoadCallback(function() {
 		gv = g.visualization;
 		v.render();