From ab689111f994af3161b78c7a74a27ca40da2c054 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 2 Dec 2017 06:37:23 +0100
Subject: [PATCH] In the spirit of #1030, fix other JS strings as well.

---
 resources/views/budgets/index.twig        | 1 -
 resources/views/import/file/status.twig   | 9 ++-------
 resources/views/javascript/variables.twig | 6 +++---
 resources/views/list/journals.twig        | 5 ++---
 resources/views/reports/index.twig        | 6 +++---
 resources/views/search/index.twig         | 5 ++---
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index 6c071bd65a..93529222b5 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -225,7 +225,6 @@
     <script type="text/javascript">
         // actually spent bar data:
         var spent = {{ spent * -1 }}; // must be positive for the calculation to work.
-        var currencySymbol = "{{ getCurrencySymbol()|raw }}";
 
         // budgeted data:
         var budgeted = {{ budgeted }};
diff --git a/resources/views/import/file/status.twig b/resources/views/import/file/status.twig
index 26acb3605e..51858bf20c 100644
--- a/resources/views/import/file/status.twig
+++ b/resources/views/import/file/status.twig
@@ -138,13 +138,8 @@
     <script type="text/javascript">
 
         // some useful translations.
-        var langImportSingleError = '{{ 'import_status_errors_single'|_|escape }}';
-        var langImportMultiError = '{{ 'import_status_errors_multi'|_|escape }}';
-
-        //var langImportFatalError = '{{ 'import_error_fatal'|_|escape }}';
-        //var langImportTimeOutError = '{{ 'import_error_timeout'|_|escape }}';
-        //var langImportFinished = '{{ 'import_finished_all'|_|escape }}';
-
+        var langImportSingleError = '{{ trans('firefly.import_status_errors_single')|escape('js') }}';
+        var langImportMultiError = '{{ trans('firefly.import_status_errors_multi')|escape('js') }}';
 
         var jobKey = '{{ job.key }}';
         var jobImportUrl = '{{ route('import.file.json', [job.key]) }}';
diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig
index 8e476e590b..0da9d3eadf 100644
--- a/resources/views/javascript/variables.twig
+++ b/resources/views/javascript/variables.twig
@@ -33,8 +33,8 @@ var currencySymbol = '{{ currencySymbol|escape('js') }}';
 var mon_decimal_point = "{{ localeconv.mon_decimal_point|escape('js') }}";
 var mon_thousands_sep = "{{ localeconv.mon_thousands_sep|escape('js') }}";
 var frac_digits = {{ localeconv.frac_digits }};
-var noDataForChart = '{{ trans('firefly.no_data_for_chart')|escape }}';
-var showFullList = '{{ trans('firefly.show_full_list') }}';
-var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength}) }}';
+var noDataForChart = '{{ trans('firefly.no_data_for_chart')|escape('js') }}';
+var showFullList = '{{ trans('firefly.show_full_list')|escape('js') }}';
+var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength})|escape('js') }}';
 var accountingConfig = {{ accounting|json_encode|raw }};
 var token = '{{ csrf_token() }}';
diff --git a/resources/views/list/journals.twig b/resources/views/list/journals.twig
index 9ee7fef1de..0e3f4ff036 100644
--- a/resources/views/list/journals.twig
+++ b/resources/views/list/journals.twig
@@ -63,7 +63,6 @@
     </div>
 </div>
 <script type="text/javascript">
-    var edit_selected_txt = "{{ 'edit'|_ }}";
-    var delete_selected_txt = "{{ 'delete'|_ }}";
-    {# var reconcile_selected_txt = "{{ 'reconcile_selected'|_ }}"; #}
+    var edit_selected_txt = "{{ trans('firefly.edit')|escape('js') }}";
+    var delete_selected_txt = "{{ trans('firefly.delete')|escape('js') }}";
 </script>
diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig
index 225fa7ab80..d6247a2324 100644
--- a/resources/views/reports/index.twig
+++ b/resources/views/reports/index.twig
@@ -173,9 +173,9 @@
     <script type="text/javascript">
         var minDate = "{{ start.format('m/d/Y') }}";
         var picker;
-        var nonSelectedText = "{{ 'multi_select_no_selection'|_ }}";
-        var allSelectedText = "{{ 'multi_select_all_selected'|_ }}";
-        var filterPlaceholder = "{{ 'multi_select_filter_placeholder'|_ }}";
+        var nonSelectedText = "{{ trans('firefly.multi_select_no_selection')|escape('js') }}";
+        var allSelectedText = "{{ trans('firefly.multi_select_all_selected')|escape('js') }}";
+        var filterPlaceholder = "{{ trans('firefly.multi_select_filter_placeholder')|escape('js') }}";
     </script>
     <script type="text/javascript" src="js/lib/bootstrap-multiselect.js?v={{ FF_VERSION }}"></script>
     <script type="text/javascript" src="js/ff/reports/index.js?v={{ FF_VERSION }}"></script>
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index d915476cd6..8583f75e74 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -107,9 +107,8 @@
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript">
-        var edit_selected_txt = "{{ 'edit'|_ }}";
-        var delete_selected_txt = "{{ 'delete'|_ }}";
-        {# var reconcile_selected_txt = "{{ 'reconcile_selected'|_ }}"; #}
+        var edit_selected_txt = "{{ trans('firefly.edit')|escape('js') }}";
+        var delete_selected_txt = "{{ trans('firefly.delete')|escape('js') }}";
 
         var searchQuery = "{{ fullQuery|escape('js') }}";
         var searchUri = "{{ route('search.search') }}";