Skip to content

Commit b7fbfe0

Browse files
specify locale while loading library
1 parent 950f479 commit b7fbfe0

File tree

5 files changed

+21
-1
lines changed

5 files changed

+21
-1
lines changed

classes/Visualizer/Module.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,20 @@ private function _getHTML( $rows ) {
323323
);
324324
}
325325

326+
/**
327+
* Returns the language of the locale.
328+
*
329+
* @access protected
330+
*/
331+
protected function get_language() {
332+
$locale = get_locale();
333+
if ( empty( $locale ) ) {
334+
return '';
335+
}
336+
$array = explode( '_', $locale );
337+
if ( count( $array ) < 2 ) {
338+
return '';
339+
}
340+
return reset( $array );
341+
}
326342
}

classes/Visualizer/Module/Admin.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,8 @@ public function renderLibraryPage() {
453453
$ajaxurl = admin_url( 'admin-ajax.php' );
454454
wp_localize_script(
455455
'visualizer-library', 'visualizer', array(
456+
'language' => $this->get_language(),
457+
'map_api_key' => get_option( 'visualizer-map-api-key' ),
456458
'charts' => $charts,
457459
'urls' => array(
458460
'base' => add_query_arg( 'vpage', false ),

classes/Visualizer/Module/Chart.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ private function _handleDataAndSettingsPage() {
336336
'charts' => array(
337337
'canvas' => $data,
338338
),
339+
'language' => $this->get_language(),
339340
'map_api_key' => get_option( 'visualizer-map-api-key' ),
340341
'ajax' => array(
341342
'url' => admin_url( 'admin-ajax.php' ),

classes/Visualizer/Module/Frontend.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ public function renderChart( $atts ) {
239239
wp_localize_script(
240240
'visualizer-render', 'visualizer', array(
241241
'charts' => $this->_charts,
242+
'language' => $this->get_language(),
242243
'map_api_key' => get_option( 'visualizer-map-api-key' ),
243244
'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
244245
'i10n' => array(

js/render.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
}
223223
};
224224

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

0 commit comments

Comments
 (0)