Merge pull request #2909 from Tamh/dev

Improve DataTables translation functionality
pull/2912/head
Peter Goodhall 2024-01-04 15:06:24 +00:00 zatwierdzone przez GitHub
commit e2d7edcf81
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
20 zmienionych plików z 165 dodań i 14 usunięć

Wyświetl plik

@ -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,10 @@ if (isset($scripts) && is_array($scripts)){
}
}
?>
<script>
<?php
echo "var lang_datatables_language = '" . lang("datatables_language") . "';"
?>
</script>
</body>
</html>

Wyświetl plik

@ -484,8 +484,3 @@ $options = json_decode($options);
</tbody>
</table>
</div>
<script>
<?php
echo 'var lang_datatables_language = "' . lang('datatables_language') . '";';
?>
</script>

Wyświetl plik

@ -171,6 +171,9 @@
"scrollCollapse": true,
"paging": true,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
"order": [ 0, 'desc' ],
dom: 'Bfrtip',
buttons: [
@ -206,6 +209,10 @@
}
</script>
<?php } ?>
<script>
<?php
echo "var lang_datatables_language = '" . lang("datatables_language") . "';"
?>
</script>
</body>
</html>

Wyświetl plik

@ -119,6 +119,9 @@ function accumulatePlot(form) {
"scrollCollapse": true,
"paging": false,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
dom: 'Bfrtip',
buttons: [
'csv'

Wyświetl plik

@ -23,7 +23,10 @@ $(function() {
$(td).attr( "title", "Click to prepare logging" );
}
}
]
],
"language": {
url: getDataTablesLanguageUrl(),
}
});
return table;
}

Wyświetl plik

@ -33,7 +33,10 @@ $('.bandtable').DataTable({
"scrollY": "500px",
"scrollCollapse": true,
"paging": false,
"scrollX": true
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
}
});
function createBandDialog() {

Wyświetl plik

@ -632,3 +632,7 @@ if ($('.table-responsive .dropdown-toggle').length>0) {
showQsoActionsMenu($(this).closest('.dropdown'));
});
}
function getDataTablesLanguageUrl() {
return "../assets/json/datatables_languages/" + lang_datatables_language + ".json";
}

Wyświetl plik

@ -539,6 +539,9 @@ async function refresh_qso_table(data) {
"scrollCollapse": true,
"paging": false,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
order: [0, 'desc'],
"columnDefs": [
{

Wyświetl plik

@ -6,6 +6,9 @@ $('.contesttable').DataTable({
"scrollCollapse": true,
"paging": false,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
dom: 'Bfrtip',
buttons: [
{

Wyświetl plik

@ -159,6 +159,9 @@ function getDistanceQsos(distance) {
"scrollCollapse": true,
"paging": false,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
dom: 'Bfrtip',
buttons: [
'csv'

Wyświetl plik

@ -117,6 +117,9 @@ function spawnGridsquareModal(loc_4char) {
"scrollCollapse": true,
"paging": false,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
dom: 'Bfrtip',
buttons: [
'csv'

Wyświetl plik

@ -159,6 +159,9 @@ function spawnGridsquareModal(loc_4char) {
"scrollCollapse": true,
"paging": false,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
dom: 'Bfrtip',
buttons: [
'csv'

Wyświetl plik

@ -123,6 +123,9 @@ function spawnGridsquareModal(loc_4char) {
"scrollCollapse": true,
"paging": false,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
dom: 'Bfrtip',
buttons: [
'csv'

Wyświetl plik

@ -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]

Wyświetl plik

@ -6,6 +6,9 @@ $('.modetable').DataTable({
"scrollCollapse": true,
"paging": false,
"scrollX": true,
"language": {
url: getDataTablesLanguageUrl(),
},
initComplete: function () {
this.api()
.columns('.select-filter')

Wyświetl plik

@ -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',
});

Wyświetl plik

@ -85,7 +85,10 @@ $(".station_id").change(function(){
$('#qslprint_table').DataTable({
"stateSave": true,
paging: false
paging: false,
"language": {
url: getDataTablesLanguageUrl(),
}
});
function showOqrs(id) {

Wyświetl plik

@ -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();

Wyświetl plik

@ -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(),
}
});
} );

Wyświetl plik

@ -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,