Merge pull request #51 from HB9HIL/datatables_language

Datatables language
2026-03-22 10:24:14 +00:00 · 2024-01-06 13:51:26 +01:00
parent 3ec1fd494b 1585c70647
commit 3c8492e07b
20 changed files with 70 additions and 25 deletions
--- a/application/language/bulgarian/admin_lang.php
+++ b/application/language/bulgarian/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/chinese_simplified/admin_lang.php
+++ b/application/language/chinese_simplified/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = '更新';
 $lang['admin_copy'] = '复制';
 $lang['admin_save'] = '保存';
 $lang['admin_close'] = '关闭';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = '用户账户';
 $lang['admin_danger'] = '危险!';
 $lang['admin_experimental'] = "实验性功能";
--- a/application/language/czech/admin_lang.php
+++ b/application/language/czech/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/dutch/admin_lang.php
+++ b/application/language/dutch/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/english/admin_lang.php
+++ b/application/language/english/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/finnish/admin_lang.php
+++ b/application/language/finnish/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/french/admin_lang.php
+++ b/application/language/french/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = "Mettre à jour";
 $lang['admin_copy'] = "Copier";
 $lang['admin_save'] = "Enregistrer";
 $lang['admin_close'] = "Fermer";
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = "Compte des utilisateurs";
 $lang['admin_danger'] = "DANGER!";
 $lang['admin_experimental'] = "Expérimental";
--- a/application/language/german/admin_lang.php
+++ b/application/language/german/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Aktualisiere';
 $lang['admin_copy'] = 'Kopieren';
 $lang['admin_save'] = 'Speichern';
 $lang['admin_close'] = 'Schliessen';
+$lang['admin_clear'] = "Zurücksetzen";
 $lang['admin_user_accounts'] = 'Benutzerkonten';
 $lang['admin_danger'] = 'ACHTUNG!';
 $lang['admin_experimental'] = "Experimentell";
--- a/application/language/greek/admin_lang.php
+++ b/application/language/greek/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/italian/admin_lang.php
+++ b/application/language/italian/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/polish/admin_lang.php
+++ b/application/language/polish/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/russian/admin_lang.php
+++ b/application/language/russian/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'Аккаунты пользователей';
 $lang['admin_danger'] = 'ОПАСНО!';
 $lang['admin_experimental'] = "Экспериментально";
--- a/application/language/spanish/admin_lang.php
+++ b/application/language/spanish/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_save'] = 'Guardar';
 $lang['admin_close'] = 'Cerrar';
 $lang['admin_user_accounts'] = 'Cuentas de Usuario';
 $lang['admin_danger'] = '¡PELIGRO!';
+$lang['admin_clear'] = "Clear";

 $lang['admin_experimental'] = "Experimental";
 $lang['admin_password_reset'] = "Password Reset";
--- a/application/language/swedish/admin_lang.php
+++ b/application/language/swedish/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/language/turkish/admin_lang.php
+++ b/application/language/turkish/admin_lang.php
@@ -24,6 +24,7 @@ $lang['admin_update'] = 'Update';
 $lang['admin_copy'] = 'Copy';
 $lang['admin_save'] = 'Save';
 $lang['admin_close'] = 'Close';
+$lang['admin_clear'] = "Clear";
 $lang['admin_user_accounts'] = 'User Accounts';
 $lang['admin_danger'] = 'DANGER!';
 $lang['admin_experimental'] = "Experimental";
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -27,6 +27,7 @@
    var lang_general_word_worked_not_confirmed = "<?php echo lang('general_word_worked_not_confirmed'); ?>";
    var lang_general_word_not_worked = "<?php echo lang('general_word_not_worked'); ?>";
    var lang_admin_close = "<?php echo lang('admin_close'); ?>";
+    var lang_admin_clear = "<?php echo lang('admin_clear'); ?>";
 </script>
 <!-- General JS Files used across Cloudlog -->
 <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
@@ -54,7 +55,16 @@
    document.addEventListener('htmx:afterSwap', function(event) {
        $('[data-bs-toggle="tooltip"]').tooltip();
    });
-    </script>
+</script>
+
+<script>
+    function getDataTablesLanguageUrl() {
+        var lang_datatables_language = "<?php echo lang('datatables_language'); ?>";
+        datatables_language_url = "<?php echo base_url() ;?>assets/json/datatables_languages/" + lang_datatables_language + ".json";
+        return datatables_language_url;
+    }
+</script>
+
 <!-- Version Dialog START -->

 <?php
@@ -1914,6 +1924,9 @@ $(document).ready(function(){
            url: getDataTablesLanguageUrl(),
        },
        dom: 'Bfrtip',
+        "language": {
+            url: getDataTablesLanguageUrl(),
+        },
        buttons: [
            'csv'
        ]
@@ -1954,6 +1967,9 @@ $(document).ready(function(){
            url: getDataTablesLanguageUrl(),
        },
        dom: 'Bfrtip',
+        "language": {
+            url: getDataTablesLanguageUrl(),
+        },
        buttons: [
            'csv'
        ]
@@ -2021,6 +2037,9 @@ $(document).ready(function(){
                url: getDataTablesLanguageUrl(),
            },
            dom: 'Bfrtip',
+            "language": {
+                url: getDataTablesLanguageUrl(),
+            },
            buttons: [
                'csv'
            ]
@@ -2062,6 +2081,9 @@ $(document).ready(function(){
                url: getDataTablesLanguageUrl(),
            },
            dom: 'Bfrtip',
+            "language": {
+                url: getDataTablesLanguageUrl(),
+            },
            buttons: [
                'csv'
            ]
@@ -2102,6 +2124,9 @@ $(document).ready(function(){
                url: getDataTablesLanguageUrl(),
            },
            dom: 'Bfrtip',
+            "language": {
+                url: getDataTablesLanguageUrl(),
+            },
            buttons: [
                'csv'
            ]
@@ -2379,7 +2404,7 @@ $(document).ready(function(){
            buttons: [
               {
                  extend: 'clear',
-                  text: 'Clear'
+                  text: lang_admin_clear
               }
            ]
        });
@@ -2885,9 +2910,9 @@ function viewEqsl(picture, callsign) {
 			"scrollCollapse": true,
 			"paging":         false,
 			"scrollX": true,
-            "language": {
-                url: getDataTablesLanguageUrl(),
-            },
+			"language": {
+				url: getDataTablesLanguageUrl(),
+			},
 			dom: 'Bfrtip',
 			buttons: [
 				'csv'
@@ -3044,7 +3069,7 @@ function viewEqsl(picture, callsign) {
                   },
                   {
                      extend: 'clear',
-                      text: 'Clear'
+                      text: lang_admin_clear
                   }
                ]
            });
@@ -3081,7 +3106,7 @@ function viewEqsl(picture, callsign) {
                   },
                   {
                      extend: 'clear',
-                      text: 'Clear'
+                      text: lang_admin_clear
                   }
                ]
            });
@@ -3116,7 +3141,7 @@ function viewEqsl(picture, callsign) {
                   },
                   {
                      extend: 'clear',
-                      text: 'Clear'
+                      text: lang_admin_clear
                   }
                ]
            });
--- a/application/views/visitor/layout/footer.php
+++ b/application/views/visitor/layout/footer.php
@@ -171,10 +171,10 @@
                "scrollCollapse": true,
                "paging":         true,
                "scrollX": true,
-                "language": {
-                    url: getDataTablesLanguageUrl(),
-                },
                "order": [ 0, 'desc' ],
+                // "language": {
+                //     url: "../assets/json/datatables_languages/en-GB.json" // in visitor view always english
+                // },
                dom: 'Bfrtip',
                buttons: [
                   {
@@ -209,10 +209,9 @@
            }
        </script>
    <?php } ?>
-    <script>
-      <?php
-      echo "var lang_datatables_language = '" . lang("datatables_language") . "';"
-      ?>
-    </script>
+    <!-- TODO: We will add Multilanguage Support for the public views later, so wie komment this out for the moment -->
+    <!-- <script>
+        var lang_datatables_language = "<?php echo lang('datatables_language') ?>";
+    </script> -->
  </body>
 </html>
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -9,6 +9,9 @@ $(function() {
 	function get_dtable () {
 		var table = $('.spottable').DataTable({
 			"retrieve":true,
+			"language": {
+				url: getDataTablesLanguageUrl(),
+			},
 			'columnDefs': [
 				{
 					'targets': 1, "type":"num",
--- a/assets/js/sections/bands.js
+++ b/assets/js/sections/bands.js
@@ -28,6 +28,9 @@ function saveBandAward(award, status) {

 $('.bandtable').DataTable({
 	"pageLength": 25,
+	"language": {
+		url: getDataTablesLanguageUrl(),
+	},
 	responsive: false,
 	ordering: false,
 	"scrollY": "500px",
--- a/assets/js/sections/oqrs.js
+++ b/assets/js/sections/oqrs.js
@@ -70,9 +70,9 @@ function searchOqrsGrouped() {
                "scrollCollapse": true,
                "paging": false,
                "scrollX": true,
-                "language": {
-                    url: getDataTablesLanguageUrl(),
-                }
+                // "language": {
+                //     url: "../assets/json/datatables_languages/en-GB.json" // in public view always english
+                // }
            });

            // Get the input field
@@ -208,9 +208,9 @@ function requestOqrs() {
                "scrollCollapse": true,
                "paging": false,
                "scrollX": true,
-                "language": {
-                    url: getDataTablesLanguageUrl(),
-                }
+                // "language": {
+                //     url: "../assets/json/datatables_languages/en-GB.json" // in public view always english
+                // }
            });
            // Get the input field
            var input = document.getElementById("emailInput");
@@ -391,9 +391,9 @@ function loadOqrsTable(rows) {
 			"scrollCollapse": true,
 			"paging":         false,
 			"scrollX": true,
-            "language": {
-				url: getDataTablesLanguageUrl(),
-			},
+			// "language": {
+            //     url: "../assets/json/datatables_languages/en-GB.json" // in public view always english
+            // },
 			"order": [ 0, 'asc' ],
            'white-space': 'nowrap',
 		});