diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 8abd4a15..3a39daab 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -394,6 +394,9 @@ $(function () { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -519,6 +522,9 @@ $(function () { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -837,6 +843,9 @@ function findduplicates(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -860,6 +869,9 @@ function findlotwunconfirmed(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -883,6 +895,9 @@ function findincorrectcqzones() { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -1881,6 +1896,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -1892,6 +1910,9 @@ $(document).ready(function(){ searching: false, ordering: false, "paging": false, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -1915,6 +1936,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -1926,6 +1950,9 @@ $(document).ready(function(){ searching: false, ordering: false, "paging": false, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -1949,6 +1976,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -1973,6 +2003,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -1984,6 +2017,9 @@ $(document).ready(function(){ searching: false, ordering: false, "paging": false, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2008,6 +2044,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2019,6 +2058,9 @@ $(document).ready(function(){ searching: false, ordering: false, "paging": false, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2042,6 +2084,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2053,6 +2098,9 @@ $(document).ready(function(){ searching: false, ordering: false, "paging": false, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2135,6 +2183,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2191,6 +2242,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2314,6 +2368,9 @@ $(document).ready(function(){ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, "order": [ 2, 'desc' ], dom: 'Bfrtip', buttons: [ @@ -2469,6 +2526,9 @@ function viewEqsl(picture, callsign) { "scrollCollapse": true, "paging": true, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2517,6 +2577,9 @@ function viewEqsl(picture, callsign) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2766,6 +2829,9 @@ function viewEqsl(picture, callsign) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2816,6 +2882,9 @@ function viewEqsl(picture, callsign) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' @@ -2910,6 +2979,9 @@ function viewEqsl(picture, callsign) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, "ordering": true, "order": [ 0, 'desc' ], }); @@ -2958,6 +3030,9 @@ function viewEqsl(picture, callsign) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, "order": [ 0, 'asc' ], dom: 'Bfrtip', buttons: [ @@ -2992,6 +3067,9 @@ function viewEqsl(picture, callsign) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, "order": [ 0, 'asc' ], dom: 'Bfrtip', buttons: [ @@ -3025,6 +3103,9 @@ function viewEqsl(picture, callsign) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ { @@ -3091,6 +3172,5 @@ if (isset($scripts) && is_array($scripts)){ } } ?> - diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index c4d72c7d..c2a3bd0b 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -484,8 +484,3 @@ $options = json_decode($options); - diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php index b20d1831..200c3a4c 100644 --- a/application/views/visitor/layout/footer.php +++ b/application/views/visitor/layout/footer.php @@ -171,6 +171,9 @@ "scrollCollapse": true, "paging": true, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, "order": [ 0, 'desc' ], dom: 'Bfrtip', buttons: [ diff --git a/assets/js/sections/accumulatedstatistics.js b/assets/js/sections/accumulatedstatistics.js index bde44b2d..7e1876a9 100644 --- a/assets/js/sections/accumulatedstatistics.js +++ b/assets/js/sections/accumulatedstatistics.js @@ -119,6 +119,9 @@ function accumulatePlot(form) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js index 1fac4c00..7d7cb30a 100644 --- a/assets/js/sections/bandmap_list.js +++ b/assets/js/sections/bandmap_list.js @@ -23,7 +23,10 @@ $(function() { $(td).attr( "title", "Click to prepare logging" ); } } - ] + ], + "language": { + url: getDatatablesLanguageUrl(), + } }); return table; } diff --git a/assets/js/sections/bands.js b/assets/js/sections/bands.js index 7153d576..08b3159b 100644 --- a/assets/js/sections/bands.js +++ b/assets/js/sections/bands.js @@ -33,7 +33,10 @@ $('.bandtable').DataTable({ "scrollY": "500px", "scrollCollapse": true, "paging": false, - "scrollX": true + "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + } }); function createBandDialog() { diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 1f5c93f7..d6ced5e0 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -632,3 +632,7 @@ if ($('.table-responsive .dropdown-toggle').length>0) { showQsoActionsMenu($(this).closest('.dropdown')); }); } + +function getDatatablesLanguageUrl() { + return "../json/datatables_languages/" + lang_datatables_language + ".json"; +} diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js index a06196ec..91cb4020 100644 --- a/assets/js/sections/contesting.js +++ b/assets/js/sections/contesting.js @@ -539,6 +539,9 @@ async function refresh_qso_table(data) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, order: [0, 'desc'], "columnDefs": [ { diff --git a/assets/js/sections/contestingnames.js b/assets/js/sections/contestingnames.js index ffdfa7f9..8bc5dc4b 100644 --- a/assets/js/sections/contestingnames.js +++ b/assets/js/sections/contestingnames.js @@ -6,6 +6,9 @@ $('.contesttable').DataTable({ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ { diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index 32c218c9..3b19defe 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -159,6 +159,9 @@ function getDistanceQsos(distance) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index 27ac8245..e2f4a62e 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -117,6 +117,9 @@ function spawnGridsquareModal(loc_4char) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index b9ea60ec..90b2e223 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -159,6 +159,9 @@ function spawnGridsquareModal(loc_4char) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index 0d4a74b2..bf1e9b59 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -123,6 +123,9 @@ function spawnGridsquareModal(loc_4char) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, dom: 'Bfrtip', buttons: [ 'csv' diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 42492145..e93d3022 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -108,7 +108,7 @@ function loadQSOTable(rows) { "paging": false, "scrollX": true, "language": { - url: "../json/datatables_languages/" + lang_datatables_language + ".json", + url: getDatatablesLanguageUrl(), }, // colReorder: { // order: [0, 2,1,3,4,5,6,7,8,9,10,12,13,14,15,16,17,18] diff --git a/assets/js/sections/mode.js b/assets/js/sections/mode.js index 8caa2055..4290285a 100644 --- a/assets/js/sections/mode.js +++ b/assets/js/sections/mode.js @@ -6,6 +6,9 @@ $('.modetable').DataTable({ "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, initComplete: function () { this.api() .columns('.select-filter') diff --git a/assets/js/sections/oqrs.js b/assets/js/sections/oqrs.js index 23a85d36..bda78731 100644 --- a/assets/js/sections/oqrs.js +++ b/assets/js/sections/oqrs.js @@ -70,6 +70,9 @@ function searchOqrsGrouped() { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + } }); // Get the input field @@ -205,6 +208,9 @@ function requestOqrs() { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + } }); // Get the input field var input = document.getElementById("emailInput"); @@ -385,6 +391,9 @@ function loadOqrsTable(rows) { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, "order": [ 0, 'asc' ], 'white-space': 'nowrap', }); diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js index 26955510..07c517c8 100644 --- a/assets/js/sections/qslprint.js +++ b/assets/js/sections/qslprint.js @@ -85,7 +85,10 @@ $(".station_id").change(function(){ $('#qslprint_table').DataTable({ "stateSave": true, - paging: false + paging: false, + "language": { + url: getDatatablesLanguageUrl(), + } }); function showOqrs(id) { diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index 8504357b..caa2539c 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -3,7 +3,10 @@ $(document).ready( function () { // Use Jquery to hide div ca_state $('#station_locations_table').DataTable({ - "stateSave": true + "stateSave": true, + "language": { + url: getDatatablesLanguageUrl(), + } }); $("#canada_state").hide(); diff --git a/assets/js/sections/station_logbooks.js b/assets/js/sections/station_logbooks.js index 54c7e4a8..21492aab 100644 --- a/assets/js/sections/station_logbooks.js +++ b/assets/js/sections/station_logbooks.js @@ -1,12 +1,18 @@ $(document).ready( function () { $('#station_logbooks_table').DataTable({ - "stateSave": true + "stateSave": true, + "language": { + url: getDatatablesLanguageUrl(), + } }); } ); $(document).ready( function () { $('#station_logbooks_linked_table').DataTable({ "stateSave": true, - "paging": true + "paging": true, + "language": { + url: getDatatablesLanguageUrl(), + } }); } ); diff --git a/assets/js/sections/statistics.js b/assets/js/sections/statistics.js index db45e990..cfac4912 100644 --- a/assets/js/sections/statistics.js +++ b/assets/js/sections/statistics.js @@ -153,6 +153,9 @@ function totalQsosPerYear() { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, bFilter: false, bInfo: false }); @@ -421,6 +424,9 @@ function totalBandQsos() { "scrollCollapse": true, "paging": false, "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, bFilter: false, bInfo: false, }); @@ -557,6 +563,9 @@ function totalSatQsos() { ordering: false, "scrollY": "330px", "scrollX": true, + "language": { + url: getDatatablesLanguageUrl(), + }, "ScrollCollapse": true, "paging": false, bFilter: false,