In the spirit of #1030, fix other JS strings as well.

This commit is contained in:
James Cole 2017-12-02 06:37:23 +01:00
parent b87ef6252c
commit ab689111f9
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
6 changed files with 12 additions and 20 deletions

View File

@ -225,7 +225,6 @@
<script type="text/javascript"> <script type="text/javascript">
// actually spent bar data: // actually spent bar data:
var spent = {{ spent * -1 }}; // must be positive for the calculation to work. var spent = {{ spent * -1 }}; // must be positive for the calculation to work.
var currencySymbol = "{{ getCurrencySymbol()|raw }}";
// budgeted data: // budgeted data:
var budgeted = {{ budgeted }}; var budgeted = {{ budgeted }};

View File

@ -138,13 +138,8 @@
<script type="text/javascript"> <script type="text/javascript">
// some useful translations. // some useful translations.
var langImportSingleError = '{{ 'import_status_errors_single'|_|escape }}'; var langImportSingleError = '{{ trans('firefly.import_status_errors_single')|escape('js') }}';
var langImportMultiError = '{{ 'import_status_errors_multi'|_|escape }}'; var langImportMultiError = '{{ trans('firefly.import_status_errors_multi')|escape('js') }}';
//var langImportFatalError = '{{ 'import_error_fatal'|_|escape }}';
//var langImportTimeOutError = '{{ 'import_error_timeout'|_|escape }}';
//var langImportFinished = '{{ 'import_finished_all'|_|escape }}';
var jobKey = '{{ job.key }}'; var jobKey = '{{ job.key }}';
var jobImportUrl = '{{ route('import.file.json', [job.key]) }}'; var jobImportUrl = '{{ route('import.file.json', [job.key]) }}';

View File

@ -33,8 +33,8 @@ var currencySymbol = '{{ currencySymbol|escape('js') }}';
var mon_decimal_point = "{{ localeconv.mon_decimal_point|escape('js') }}"; var mon_decimal_point = "{{ localeconv.mon_decimal_point|escape('js') }}";
var mon_thousands_sep = "{{ localeconv.mon_thousands_sep|escape('js') }}"; var mon_thousands_sep = "{{ localeconv.mon_thousands_sep|escape('js') }}";
var frac_digits = {{ localeconv.frac_digits }}; var frac_digits = {{ localeconv.frac_digits }};
var noDataForChart = '{{ trans('firefly.no_data_for_chart')|escape }}'; var noDataForChart = '{{ trans('firefly.no_data_for_chart')|escape('js') }}';
var showFullList = '{{ trans('firefly.show_full_list') }}'; var showFullList = '{{ trans('firefly.show_full_list')|escape('js') }}';
var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength}) }}'; var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength})|escape('js') }}';
var accountingConfig = {{ accounting|json_encode|raw }}; var accountingConfig = {{ accounting|json_encode|raw }};
var token = '{{ csrf_token() }}'; var token = '{{ csrf_token() }}';

View File

@ -63,7 +63,6 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var edit_selected_txt = "{{ 'edit'|_ }}"; var edit_selected_txt = "{{ trans('firefly.edit')|escape('js') }}";
var delete_selected_txt = "{{ 'delete'|_ }}"; var delete_selected_txt = "{{ trans('firefly.delete')|escape('js') }}";
{# var reconcile_selected_txt = "{{ 'reconcile_selected'|_ }}"; #}
</script> </script>

View File

@ -173,9 +173,9 @@
<script type="text/javascript"> <script type="text/javascript">
var minDate = "{{ start.format('m/d/Y') }}"; var minDate = "{{ start.format('m/d/Y') }}";
var picker; var picker;
var nonSelectedText = "{{ 'multi_select_no_selection'|_ }}"; var nonSelectedText = "{{ trans('firefly.multi_select_no_selection')|escape('js') }}";
var allSelectedText = "{{ 'multi_select_all_selected'|_ }}"; var allSelectedText = "{{ trans('firefly.multi_select_all_selected')|escape('js') }}";
var filterPlaceholder = "{{ 'multi_select_filter_placeholder'|_ }}"; var filterPlaceholder = "{{ trans('firefly.multi_select_filter_placeholder')|escape('js') }}";
</script> </script>
<script type="text/javascript" src="js/lib/bootstrap-multiselect.js?v={{ FF_VERSION }}"></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> <script type="text/javascript" src="js/ff/reports/index.js?v={{ FF_VERSION }}"></script>

View File

@ -107,9 +107,8 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var edit_selected_txt = "{{ 'edit'|_ }}"; var edit_selected_txt = "{{ trans('firefly.edit')|escape('js') }}";
var delete_selected_txt = "{{ 'delete'|_ }}"; var delete_selected_txt = "{{ trans('firefly.delete')|escape('js') }}";
{# var reconcile_selected_txt = "{{ 'reconcile_selected'|_ }}"; #}
var searchQuery = "{{ fullQuery|escape('js') }}"; var searchQuery = "{{ fullQuery|escape('js') }}";
var searchUri = "{{ route('search.search') }}"; var searchUri = "{{ route('search.search') }}";