From 489960aa6d9fd71773e8fd301ff7f67d27ce940f Mon Sep 17 00:00:00 2001
From: Takuya Sato <takuya310@gmail.com>
Date: Wed, 18 Mar 2015 11:57:04 +0900
Subject: [PATCH 1/3] Fixed translation function

---
 recline.app.js    | 10 +++++-----
 recline.field.inc | 19 ++++++-------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/recline.app.js b/recline.app.js
index 0e1659b..b4d34b2 100644
--- a/recline.app.js
+++ b/recline.app.js
@@ -67,7 +67,7 @@
                             // Converts line endings in either format to unix format.
                             data = data.replace(/(\r\n|\n|\r)/gm,"\n");
                             dataset = new recline.Model.Dataset({
-                                records: recline.Backend.CSV.parse(data, options)
+                                records: recline.Backend.CSV.parseCSV(data, options)
                             });
                             dataset.fetch();
                             views = createExplorer(dataset, state, dataExplorerSettings);
@@ -132,7 +132,7 @@
             views.push(
                 {
                     id: 'grid',
-                    label: 'Grid',
+                    label: Drupal.t('Grid'),
                     view: new recline.View.SlickGrid({
                         model: dataset
                     })
@@ -152,7 +152,7 @@
             views.push(
                 {
                     id: 'graph',
-                    label: 'Graph',
+                    label: Drupal.t('Graph'),
                     view: new recline.View.Graph({
                         model: dataset,
                         state: state
@@ -164,7 +164,7 @@
             views.push(
                 {
                     id: 'map',
-                    label: 'Map',
+                    label: Drupal.t('Map'),
                     view: new recline.View.Map({
                         model: dataset
                     })
@@ -307,7 +307,7 @@
         if(!$control.length){
             $form = $('.form-stacked');
             $checkboxDiv = $('<div class="checkbox"></div>').appendTo($form);
-            $label = $('<label />', { 'for': 'prevent-label-overlapping', text: 'Resize graph to prevent label overlapping' }).appendTo($checkboxDiv);
+            $label = $('<label />', { 'for': 'prevent-label-overlapping', text: Drupal.t('Resize graph to prevent label overlapping') }).appendTo($checkboxDiv);
             $label.prepend($('<input />', { type: 'checkbox', id: 'prevent-label-overlapping', value: '' }));
             $control = $('#prevent-label-overlapping');
             $control.on('change', function(){
diff --git a/recline.field.inc b/recline.field.inc
index a69c0da..8a8073c 100644
--- a/recline.field.inc
+++ b/recline.field.inc
@@ -205,7 +205,7 @@ function recline_field_widget_form(&$form, &$form_state, $field, $instance, $lan
   $delimiter = isset($elements[$delta]['#default_value']['delimiter']) ? $elements[$delta]['#default_value']['delimiter'] : FALSE;
 
   $elements[$delta]['delimiter'] = array(
-    '#title' => 'Delimiter',
+    '#title' => t('Delimiter'),
     '#description' => t('Select delimiter for file if applicable.'),
     '#type' => 'select',
     '#options' => recline_delimiters(),
@@ -451,19 +451,10 @@ function recline_default_formatter_output($variables) {
   }
   $recline = '';
 
-  libraries_load('lodash');
-  libraries_load('backbone');
   $recline = libraries_load('recline');
-  libraries_load('csv');
-  libraries_load('mustache');
-  libraries_load('moment');
-  libraries_load('slickgrid');
-  libraries_load('leaflet');
-
-  libraries_load('flot');
-  libraries_load('deep_diff');
-  libraries_load('recline_deeplink');
-  libraries_load('leaflet_markercluster');
+  $recline_deeplink = libraries_load('recline_deeplink');
+  $leaflet_markercluster = libraries_load('leaflet_markercluster');
+  $deep_diff = libraries_load('deep_diff');
 
   if (isset($variables['item']['grid']) &&
     isset($variables['item']['graph']) &&
@@ -475,6 +466,7 @@ function recline_default_formatter_output($variables) {
 
       $module_path = drupal_get_path('module', 'recline');
       drupal_add_js($module_path . '/backend.ckan_get.js');
+      drupal_add_js($module_path . '/encoding.js');
       drupal_add_js($module_path . '/recline.app.js');
       drupal_add_css($module_path . '/recline.css');
       $file_path = isset($variables['item']['uri']) ? file_create_url($variables['item']['uri']) : "";
@@ -500,6 +492,7 @@ function recline_default_formatter_output($variables) {
 
     $module_path = drupal_get_path('module', 'recline');
     drupal_add_js($module_path . '/backend.ckan_get.js');
+    drupal_add_js($module_path . '/encoding.js');
     drupal_add_js($module_path . '/recline.app.js');
     drupal_add_css($module_path . '/recline.css');
     $file_path = isset($variables['item']['uri']) ? file_create_url($variables['item']['uri']) : "";

From 6a5c7ca0cfd42ba7622e9a05c5a783827a99b1dd Mon Sep 17 00:00:00 2001
From: Takuya Sato <takuya310@gmail.com>
Date: Wed, 18 Mar 2015 12:01:22 +0900
Subject: [PATCH 2/3] Revert "Fixed translation function"

This reverts commit 489960aa6d9fd71773e8fd301ff7f67d27ce940f.
---
 recline.app.js    | 10 +++++-----
 recline.field.inc | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/recline.app.js b/recline.app.js
index b4d34b2..0e1659b 100644
--- a/recline.app.js
+++ b/recline.app.js
@@ -67,7 +67,7 @@
                             // Converts line endings in either format to unix format.
                             data = data.replace(/(\r\n|\n|\r)/gm,"\n");
                             dataset = new recline.Model.Dataset({
-                                records: recline.Backend.CSV.parseCSV(data, options)
+                                records: recline.Backend.CSV.parse(data, options)
                             });
                             dataset.fetch();
                             views = createExplorer(dataset, state, dataExplorerSettings);
@@ -132,7 +132,7 @@
             views.push(
                 {
                     id: 'grid',
-                    label: Drupal.t('Grid'),
+                    label: 'Grid',
                     view: new recline.View.SlickGrid({
                         model: dataset
                     })
@@ -152,7 +152,7 @@
             views.push(
                 {
                     id: 'graph',
-                    label: Drupal.t('Graph'),
+                    label: 'Graph',
                     view: new recline.View.Graph({
                         model: dataset,
                         state: state
@@ -164,7 +164,7 @@
             views.push(
                 {
                     id: 'map',
-                    label: Drupal.t('Map'),
+                    label: 'Map',
                     view: new recline.View.Map({
                         model: dataset
                     })
@@ -307,7 +307,7 @@
         if(!$control.length){
             $form = $('.form-stacked');
             $checkboxDiv = $('<div class="checkbox"></div>').appendTo($form);
-            $label = $('<label />', { 'for': 'prevent-label-overlapping', text: Drupal.t('Resize graph to prevent label overlapping') }).appendTo($checkboxDiv);
+            $label = $('<label />', { 'for': 'prevent-label-overlapping', text: 'Resize graph to prevent label overlapping' }).appendTo($checkboxDiv);
             $label.prepend($('<input />', { type: 'checkbox', id: 'prevent-label-overlapping', value: '' }));
             $control = $('#prevent-label-overlapping');
             $control.on('change', function(){
diff --git a/recline.field.inc b/recline.field.inc
index 8a8073c..a69c0da 100644
--- a/recline.field.inc
+++ b/recline.field.inc
@@ -205,7 +205,7 @@ function recline_field_widget_form(&$form, &$form_state, $field, $instance, $lan
   $delimiter = isset($elements[$delta]['#default_value']['delimiter']) ? $elements[$delta]['#default_value']['delimiter'] : FALSE;
 
   $elements[$delta]['delimiter'] = array(
-    '#title' => t('Delimiter'),
+    '#title' => 'Delimiter',
     '#description' => t('Select delimiter for file if applicable.'),
     '#type' => 'select',
     '#options' => recline_delimiters(),
@@ -451,10 +451,19 @@ function recline_default_formatter_output($variables) {
   }
   $recline = '';
 
+  libraries_load('lodash');
+  libraries_load('backbone');
   $recline = libraries_load('recline');
-  $recline_deeplink = libraries_load('recline_deeplink');
-  $leaflet_markercluster = libraries_load('leaflet_markercluster');
-  $deep_diff = libraries_load('deep_diff');
+  libraries_load('csv');
+  libraries_load('mustache');
+  libraries_load('moment');
+  libraries_load('slickgrid');
+  libraries_load('leaflet');
+
+  libraries_load('flot');
+  libraries_load('deep_diff');
+  libraries_load('recline_deeplink');
+  libraries_load('leaflet_markercluster');
 
   if (isset($variables['item']['grid']) &&
     isset($variables['item']['graph']) &&
@@ -466,7 +475,6 @@ function recline_default_formatter_output($variables) {
 
       $module_path = drupal_get_path('module', 'recline');
       drupal_add_js($module_path . '/backend.ckan_get.js');
-      drupal_add_js($module_path . '/encoding.js');
       drupal_add_js($module_path . '/recline.app.js');
       drupal_add_css($module_path . '/recline.css');
       $file_path = isset($variables['item']['uri']) ? file_create_url($variables['item']['uri']) : "";
@@ -492,7 +500,6 @@ function recline_default_formatter_output($variables) {
 
     $module_path = drupal_get_path('module', 'recline');
     drupal_add_js($module_path . '/backend.ckan_get.js');
-    drupal_add_js($module_path . '/encoding.js');
     drupal_add_js($module_path . '/recline.app.js');
     drupal_add_css($module_path . '/recline.css');
     $file_path = isset($variables['item']['uri']) ? file_create_url($variables['item']['uri']) : "";

From fc269796cd9df7314c7d2b2ad27d5749ef20a6a1 Mon Sep 17 00:00:00 2001
From: Takuya Sato <takuya310@gmail.com>
Date: Wed, 18 Mar 2015 12:03:56 +0900
Subject: [PATCH 3/3] Fixed translation function

---
 recline.app.js    | 10 +++++-----
 recline.field.inc | 17 ++++-------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/recline.app.js b/recline.app.js
index 0e1659b..b4d34b2 100644
--- a/recline.app.js
+++ b/recline.app.js
@@ -67,7 +67,7 @@
                             // Converts line endings in either format to unix format.
                             data = data.replace(/(\r\n|\n|\r)/gm,"\n");
                             dataset = new recline.Model.Dataset({
-                                records: recline.Backend.CSV.parse(data, options)
+                                records: recline.Backend.CSV.parseCSV(data, options)
                             });
                             dataset.fetch();
                             views = createExplorer(dataset, state, dataExplorerSettings);
@@ -132,7 +132,7 @@
             views.push(
                 {
                     id: 'grid',
-                    label: 'Grid',
+                    label: Drupal.t('Grid'),
                     view: new recline.View.SlickGrid({
                         model: dataset
                     })
@@ -152,7 +152,7 @@
             views.push(
                 {
                     id: 'graph',
-                    label: 'Graph',
+                    label: Drupal.t('Graph'),
                     view: new recline.View.Graph({
                         model: dataset,
                         state: state
@@ -164,7 +164,7 @@
             views.push(
                 {
                     id: 'map',
-                    label: 'Map',
+                    label: Drupal.t('Map'),
                     view: new recline.View.Map({
                         model: dataset
                     })
@@ -307,7 +307,7 @@
         if(!$control.length){
             $form = $('.form-stacked');
             $checkboxDiv = $('<div class="checkbox"></div>').appendTo($form);
-            $label = $('<label />', { 'for': 'prevent-label-overlapping', text: 'Resize graph to prevent label overlapping' }).appendTo($checkboxDiv);
+            $label = $('<label />', { 'for': 'prevent-label-overlapping', text: Drupal.t('Resize graph to prevent label overlapping') }).appendTo($checkboxDiv);
             $label.prepend($('<input />', { type: 'checkbox', id: 'prevent-label-overlapping', value: '' }));
             $control = $('#prevent-label-overlapping');
             $control.on('change', function(){
diff --git a/recline.field.inc b/recline.field.inc
index a69c0da..b543118 100644
--- a/recline.field.inc
+++ b/recline.field.inc
@@ -205,7 +205,7 @@ function recline_field_widget_form(&$form, &$form_state, $field, $instance, $lan
   $delimiter = isset($elements[$delta]['#default_value']['delimiter']) ? $elements[$delta]['#default_value']['delimiter'] : FALSE;
 
   $elements[$delta]['delimiter'] = array(
-    '#title' => 'Delimiter',
+    '#title' => t('Delimiter'),
     '#description' => t('Select delimiter for file if applicable.'),
     '#type' => 'select',
     '#options' => recline_delimiters(),
@@ -451,19 +451,10 @@ function recline_default_formatter_output($variables) {
   }
   $recline = '';
 
-  libraries_load('lodash');
-  libraries_load('backbone');
   $recline = libraries_load('recline');
-  libraries_load('csv');
-  libraries_load('mustache');
-  libraries_load('moment');
-  libraries_load('slickgrid');
-  libraries_load('leaflet');
-
-  libraries_load('flot');
-  libraries_load('deep_diff');
-  libraries_load('recline_deeplink');
-  libraries_load('leaflet_markercluster');
+  $recline_deeplink = libraries_load('recline_deeplink');
+  $leaflet_markercluster = libraries_load('leaflet_markercluster');
+  $deep_diff = libraries_load('deep_diff');
 
   if (isset($variables['item']['grid']) &&
     isset($variables['item']['graph']) &&