From 8e9520815654b40782c28c7c4a0015d622ff3220 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:08:31 +0200 Subject: [PATCH 001/121] Quicklog Feature --- application/language/bulgarian/qso_lang.php | 3 +++ .../language/chinese_simplified/qso_lang.php | 3 +++ application/language/czech/qso_lang.php | 3 +++ application/language/dutch/qso_lang.php | 3 +++ application/language/english/qso_lang.php | 3 +++ application/language/finnish/qso_lang.php | 3 +++ application/language/french/qso_lang.php | 3 +++ application/language/german/qso_lang.php | 3 +++ application/language/greek/qso_lang.php | 3 +++ application/language/italian/qso_lang.php | 3 +++ application/language/polish/qso_lang.php | 3 +++ application/language/russian/qso_lang.php | 3 +++ application/language/spanish/qso_lang.php | 3 +++ application/language/swedish/qso_lang.php | 3 +++ application/language/turkish/qso_lang.php | 3 +++ application/views/dashboard/index.php | 13 +++++++++++++ application/views/qso/index.php | 2 +- 17 files changed, 59 insertions(+), 1 deletion(-) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 34aab0356..a840821c7 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Предишни контакти'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Посочете стойността на мощността във ватове. Въведете само цифри.'; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 37399d7af..020096984 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = '先前通联'; $lang['qso_title_image'] = '操作员照片'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = '以瓦特为单位设置功率值。在输入中仅填写数值。'; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 68d29fe99..9d62916ed 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Předchozí spojení'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Zadej výkon ve Wattech. Jsou povolen pouz čísla'; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 9c4655c58..8592720e9 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Eerdere verbindingen'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Geef vermogen in Watt. Vermeld alleen cijfers.'; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index f8bf82033..1fe5f9eac 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Previous Contacts'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Give power value in Watts. Include only numbers in the input.'; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 9207145fb..71fcc003c 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Edelliset yhteydet'; $lang['qso_title_image'] = 'Profiilikuva'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Anna teholukema Watteina käyttäen vain numeroita.'; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index b64ac41de..79bb86789 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Contacts précédents'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Saisissez la ouissance en Watts en utilisant uniquement des chiffres.'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 229d2bc28..998c57e62 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Vorherige Kontakte'; $lang['qso_title_image'] = 'Profilbild'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gib die Ausgangsleistung in Watt an. Erfasse nur Zahlen bei der Eingabe.'; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 1a398b3fe..2ae3ff19d 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Προηγούμενες Επαφές'; $lang['qso_title_image'] = 'Εικόνα προφίλ'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Δώστε τιμή ισχύος σε Watts. Συμπεριλάβετε μόνο αριθμούς στην εισαγωγή.'; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 9f7618ecf..f64db6125 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Contatti Precedenti'; $lang['qso_title_image'] = 'Immagine Profilo'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Dare valore di potenza in Watt. Includere solo numeri nell input.'; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 42804a262..c471e8321 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Poprzednie łączności'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Wpisz wartość mocy w watach. W polu podaj same cyfry.'; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index c6d1f084b..8b28d263c 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Предыдущие контакты'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Укажите мощность в Ваттах (только цифры).'; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index fdd4967c5..002686c2b 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Contactos previos'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Especifique el valor de potencia en Watios (W). Incluya solo números.'; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 673be8bd5..78b45b843 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Föregående QSOn'; $lang['qso_title_image'] = 'Profilbild'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Ange effekt i watt, enbart med siffror.'; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 9b9f82533..e3561d5dc 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_previous_contacts'] = 'Önceki Görüşmeler'; $lang['qso_title_image'] = 'Profil Resmi'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gücü Watt olarak veriniz. Sadece rakamları giriniz.'; diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 38ad16c90..8e43dbd88 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -165,6 +165,19 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
+
+

+
+ +
+ + + +
+ + diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 3f9a6850f..14ac7b42d 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -74,7 +74,7 @@
optionslib->get_option('dxcache_url') != '') { ?>  - +
From dc66ebbb87ad91bb8d78a6d635a42c29c105f286 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:12:46 +0200 Subject: [PATCH 002/121] German Translation --- application/language/german/qso_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 998c57e62..52fec3eb4 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -9,7 +9,7 @@ $lang['qso_title_image'] = 'Profilbild'; // Quicklog on Dashboard -$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Rufzeichen'; // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gib die Ausgangsleistung in Watt an. Erfasse nur Zahlen bei der Eingabe.'; From 0f75d83fb6c880fe8bfe01523435c328dd2cbf0c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:33:16 +0200 Subject: [PATCH 003/121] Corrected PHP Error callsign value --- application/views/qso/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 14ac7b42d..30ea8085e 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -74,7 +74,7 @@
optionslib->get_option('dxcache_url') != '') { ?>  - +
From 8dcf30e257f3d661d99d75ffc326b43c70c4ba29 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 22:17:19 +0200 Subject: [PATCH 004/121] correction of not needed element --- application/views/dashboard/index.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 8e43dbd88..3986aa304 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -165,10 +165,6 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
-
-

-
-
From 827dfdb1528854b1573b11c0595459f2bba3b274 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 20:58:40 +0100 Subject: [PATCH 005/121] web manifest and meta tag --- application/views/interface_assets/header.php | 6 +++++- manifest.json | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 manifest.json diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index c4b35237a..cc95493e0 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -5,7 +5,11 @@ - + + + + + optionslib->get_theme()) { ?> diff --git a/manifest.json b/manifest.json new file mode 100644 index 000000000..08f92f69f --- /dev/null +++ b/manifest.json @@ -0,0 +1,17 @@ +{ + "name": "Cloudlog", + "short_name": "Cloudlog", + "theme_color": "#2571fb", + "background_color": "#ffffff", + "display": "standalone", + "orientation": "portrait", + "scope": ".", + "start_url": "/", + "icons": [ + { + "src": "CloudLog_logo.png", + "type": "image/png", + "sizes": "144x144" + } + ] + } \ No newline at end of file From 01341b107f1eec761bcb13d1d3bd505ed6db9ecc Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 3 Nov 2023 21:54:49 +0100 Subject: [PATCH 006/121] Add German translation for warnings --- application/language/german/general_words_lang.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 099119849..a5d64700b 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -194,3 +194,8 @@ $lang['gen_band_selection'] = 'Bandauswahl'; $lang['general_word_today'] = 'Heute'; + +$lang['dashboard_php_version_warning'] = 'Die PHP Version is zu alt. Benötigt wird mindestens die Version 7.4. Die installierte Version ist'; +$lang['dashboard_country_files_warning'] = 'Die Länderlisten müssen aktualisiert werden! Klicke hier, um das zu tun!'; +$lang['dashboard_locations_warning'] = 'Ea wurde kein Stationsstandort angelegt! Klicke hier, um das zu tun!'; +$lang['dashboard_logbooks_warning'] = 'Es wurde kein Stationslogbuch angelegt. Klicke hier, um das zu tun!'; From 2fdcdaa201172872f559e7983f92ba84bdb40d11 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:07 +0100 Subject: [PATCH 007/121] added time function to js --- assets/js/sections/simplefle.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 565b9c09a..a29284ba3 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -85,6 +85,13 @@ ssb }); }); +function updateUTCTime() { + const utcTimeElement = document.getElementById("utc-time"); + const now = new Date(); + const utcTimeString = now.toISOString().split("T")[1].split(".")[0]; + utcTimeElement.textContent = utcTimeString; +} + function handleInput() { var qsodate = ""; if ($("#qsodate").val()) { @@ -550,6 +557,8 @@ function isWWFF(value) { $(document).ready(function () { + setInterval(updateUTCTime, 1000); + updateUTCTime(); var tabledata = localStorage.getItem(`user_${user_id}_tabledata`); var mycall = localStorage.getItem(`user_${user_id}_my-call`); var operator = localStorage.getItem(`user_${user_id}_operator`); From c357e0f90c4cbb9959f46fa4d0c48edcff7a6aab Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:23 +0100 Subject: [PATCH 008/121] added utc time to view --- application/views/simplefle/index.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 5753ac249..db176ddef 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -70,12 +70,9 @@
-
-
- - - -
+
+ +

@@ -98,6 +95,13 @@
+
+
+ + + +
+
From 5984f3799c05b4aff8d1de2dce3a4750326a5475 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:44 +0100 Subject: [PATCH 009/121] added utc time translations --- application/language/bulgarian/qso_lang.php | 1 + application/language/chinese_simplified/qso_lang.php | 1 + application/language/czech/qso_lang.php | 1 + application/language/dutch/qso_lang.php | 1 + application/language/english/qso_lang.php | 1 + application/language/finnish/qso_lang.php | 1 + application/language/french/qso_lang.php | 1 + application/language/german/qso_lang.php | 1 + application/language/greek/qso_lang.php | 1 + application/language/italian/qso_lang.php | 1 + application/language/polish/qso_lang.php | 1 + application/language/russian/qso_lang.php | 1 + application/language/spanish/qso_lang.php | 1 + application/language/swedish/qso_lang.php | 1 + application/language/turkish/qso_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index fb3614f1b..a5e47ff4d 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index a850aab3c..ac9fac2e5 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 7449fe052..38114fce5 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 769f42b3f..c038a3cfb 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 307429aa9..e47d17cb8 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index b4d43a9b8..bd501e2ed 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index e104cfc47..568a58369 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 04e8c77f1..9f9eb053c 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "z.B. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Stationsstandort"; $lang['qso_simplefle_station_call_location_hint'] = "Falls du von einem neuen Standort oder mit einem neuen Rufzeichen gefunkt hast, erstelle erst einen neuen Stationsstandort"; +$lang['qso_simplefle_utc_time'] = "Aktuelle UTC Zeit"; $lang['qso_simplefle_enter_the_data'] = "Gibt hier die Daten ein"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Schliesse und Lade Beispiel Daten"; $lang['qso_simplefle_reload'] = "Aktualisiere QSO Liste"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index ab4653102..0484b4d4a 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index cfa31cd20..bcc442dcd 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 3033ccb6a..93863baa6 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 3042576e4..87525f7a2 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 9e6640d33..a36a55533 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 16f10ecab..83a0804b9 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 6f6c44ec3..228ee601e 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; From a071a4b8d95c88bb5a6eaa123ce339122b3be35d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:55:33 +0100 Subject: [PATCH 010/121] added QSO Date hint --- application/views/simplefle/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index db176ddef..8975a3f4e 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -68,6 +68,7 @@
+
From 70fbafb8441708fb1c3dbca78f9e45c4f073ab03 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:55:47 +0100 Subject: [PATCH 011/121] added Translations for QSO Date hint --- application/language/bulgarian/qso_lang.php | 1 + application/language/chinese_simplified/qso_lang.php | 1 + application/language/czech/qso_lang.php | 1 + application/language/dutch/qso_lang.php | 1 + application/language/english/qso_lang.php | 1 + application/language/finnish/qso_lang.php | 1 + application/language/french/qso_lang.php | 1 + application/language/german/qso_lang.php | 1 + application/language/greek/qso_lang.php | 1 + application/language/italian/qso_lang.php | 1 + application/language/polish/qso_lang.php | 1 + application/language/russian/qso_lang.php | 1 + application/language/spanish/qso_lang.php | 1 + application/language/swedish/qso_lang.php | 1 + application/language/turkish/qso_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index a5e47ff4d..2b407ba0e 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index ac9fac2e5..a5efba4dd 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 38114fce5..107785507 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index c038a3cfb..0eb9e3d57 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index e47d17cb8..ccec36be4 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index bd501e2ed..b84dcf8b9 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 568a58369..1519c7d28 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 9f9eb053c..9e86c42be 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE wurde ursprünglich von DF3CB geschrieben. Auf seiner Website bietet er ein Programm für Windows an. Simple FLE wurde von OK2CQR auf Basis des FLE von DF3CB geschrieben und bietet eine Webapplikation zum Erfassen von QSOs."; $lang['qso_simplefle_info_ln4'] = "Ein üblicher Anwendungsfall ist, wenn Sie Ihre Papier-Logbücher von einer Outdoor-Aktion erfassen müssen und SimpleFLE nun auch in Cloudlog verfügbar. Informationen über die allgemeine Syntax und Handhabung gibt es hier."; $lang['qso_simplefle_qso_data'] = "QSO Daten"; +$lang['qso_simplefle_qso_date_hint'] = "Wenn du kein Datum auswählst, wird das heutige Datum verwendet."; $lang['qso_simplefle_qso_list'] = "QSO Liste"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Datum"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 0484b4d4a..31d113501 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index bcc442dcd..4d28e9eef 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 93863baa6..f56812d68 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 87525f7a2..0d5acd81e 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index a36a55533..091150cd8 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 83a0804b9..a8ba6b0dc 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 228ee601e..b0d8bdd8a 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; From b6668227a896c48e36e648a45d27d957f36457d3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:56:03 +0100 Subject: [PATCH 012/121] made table a bit higher to match with the new hint --- assets/css/general.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/general.css b/assets/css/general.css index 672c0d6a6..2d75a9d58 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -557,7 +557,7 @@ input:invalid { } .sfletable{ - height: 440px; + height: 470px; } .sfletable.table { @@ -574,6 +574,6 @@ input:invalid { .sfletable.table tbody { width: 95%; overflow-y: scroll; - max-height: 410px; + max-height: 440px; position: absolute; } From be7632ef58e842e84af85501d9417f187f5ab58b Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 4 Nov 2023 14:19:56 +0100 Subject: [PATCH 013/121] Add reset buttons for times to reset on click --- application/views/interface_assets/footer.php | 13 +++++++++++++ application/views/qso/index.php | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index c71433447..8b12884a3 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1005,6 +1005,19 @@ function(dxspot) { var utc = localTime + (now.getTimezoneOffset() * 60000); $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); }); + $('#reset_start_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + }); + $('#reset_end_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + }); }); diff --git a/application/views/qso/index.php b/application/views/qso/index.php index cc97f357a..679cab724 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -59,12 +59,20 @@
- + + + + + + required pattern="[0-2][0-9]:[0-5][0-9]">
+ + + required pattern="[0-2][0-9]:[0-5][0-9]">
From 26a1f8531f16adc3e9a23ac19da447621c008ad8 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 4 Nov 2023 15:31:44 +0100 Subject: [PATCH 014/121] Also handle logging of start time only --- application/views/qso/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 679cab724..3222af4bd 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -92,6 +92,9 @@
+ + + required pattern="[0-2][0-9]:[0-5][0-9]">
From 139668fcc81468b0755f23dd5e1fe822d59792fa Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:07 +0100 Subject: [PATCH 015/121] created migration for quicklog user option --- application/migrations/151_user_quicklog.php | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 application/migrations/151_user_quicklog.php diff --git a/application/migrations/151_user_quicklog.php b/application/migrations/151_user_quicklog.php new file mode 100644 index 000000000..f55fb23c2 --- /dev/null +++ b/application/migrations/151_user_quicklog.php @@ -0,0 +1,29 @@ +db->field_exists('user_quicklog', 'users')) { + $fields = array( + 'user_quicklog integer DEFAULT 0 AFTER user_default_confirmation', + ); + + $this->dbforge->add_column('users', $fields); + } + } + + public function down() + { + if ($this->db->field_exists('user_quicklog', 'users')) { + $this->dbforge->drop_column('users', 'user_quicklog'); + } + } +} \ No newline at end of file From a160663009d0b1b1c0b3851ac8c3834803ba7c99 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:23 +0100 Subject: [PATCH 016/121] updated migration config --- application/config/migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/migration.php b/application/config/migration.php index 7756a3244..f855e92fb 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ | */ -$config['migration_version'] = 150; +$config['migration_version'] = 151; /* |-------------------------------------------------------------------------- From 39bb190fd255af7dfa4148f95ce634d30a1dc6bd Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sat, 4 Nov 2023 18:31:39 +0100 Subject: [PATCH 017/121] Fix county format in ADIF export --- application/libraries/AdifHelper.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php index a639896c3..d167077a6 100644 --- a/application/libraries/AdifHelper.php +++ b/application/libraries/AdifHelper.php @@ -198,7 +198,13 @@ public function getAdifLine($qso) { $line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu); - $line .= $this->getAdifFieldLine("MY_CNTY", $qso->station_cnty); + if($qso->state) { + $county = trim($qso->state) . "," . trim($qso->station_cnty); + } else { + $county = trim($qso->station_cnty); + } + + $line .= $this->getAdifFieldLine("MY_CNTY", $county); $line .= $this->getAdifFieldLine("MY_SIG", $qso->station_sig); From 6be6309d0f515c0819b3cc66799c857c991a8990 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:46 +0100 Subject: [PATCH 018/121] added quicklog to User Controller --- application/controllers/User.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/application/controllers/User.php b/application/controllers/User.php index 7bb77a03c..4ce09fc72 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -91,6 +91,7 @@ function add() { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); } else { @@ -127,6 +128,7 @@ function add() { $this->input->post('user_default_band'), ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''), $this->input->post('user_qso_end_times'), + $this->input->post('user_quicklog'), $this->input->post('language'), )) { // Check for errors @@ -175,6 +177,7 @@ function add() { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); $this->load->view('interface_assets/footer'); @@ -398,6 +401,12 @@ function edit() { $data['user_qso_end_times'] = $q->user_qso_end_times; } + if($this->input->post('user_quicklog')) { + $data['user_quicklog'] = $this->input->post('user_quicklog', true); + } else { + $data['user_quicklog'] = $q->user_quicklog; + } + if($this->input->post('user_show_profile_image')) { $data['user_show_profile_image'] = $this->input->post('user_show_profile_image', false); } else { @@ -539,6 +548,7 @@ function edit() { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $data['user_winkey'] = $this->input->post('user_winkey'); $this->load->view('user/edit'); From 802c4ab2e6c971bd3566a9cb0de12fe91a94b38b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:59 +0100 Subject: [PATCH 019/121] added quicklog to User Model --- application/models/User_model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index 46eb03da2..b43e25db1 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -124,7 +124,7 @@ function add($username, $password, $email, $type, $firstname, $lastname, $callsi $measurement, $user_date_format, $user_stylesheet, $user_qth_lookup, $user_sota_lookup, $user_wwff_lookup, $user_pota_lookup, $user_show_notes, $user_column1, $user_column2, $user_column3, $user_column4, $user_column5, $user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url, - $user_default_band, $user_default_confirmation, $user_qso_end_times, $language) { + $user_default_band, $user_default_confirmation, $user_qso_end_times, $user_quicklog, $language) { // Check that the user isn't already used if(!$this->exists($username)) { $data = array( @@ -157,6 +157,7 @@ function add($username, $password, $email, $type, $firstname, $lastname, $callsi 'user_default_band' => xss_clean($user_default_band), 'user_default_confirmation' => xss_clean($user_default_confirmation), 'user_qso_end_times' => xss_clean($user_qso_end_times), + 'user_quicklog' => xss_clean($user_quicklog), 'language' => xss_clean($language), ); @@ -219,6 +220,7 @@ function edit($fields) { 'user_default_band' => xss_clean($fields['user_default_band']), 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''), 'user_qso_end_times' => xss_clean($fields['user_qso_end_times']), + 'user_quicklog' => xss_clean($field['user_quicklog']), 'language' => xss_clean($fields['language']), 'winkey' => xss_clean($fields['user_winkey']), ); @@ -346,6 +348,7 @@ function update_session($id) { 'user_default_band' => $u->row()->user_default_band, 'user_default_confirmation' => $u->row()->user_default_confirmation, 'user_qso_end_times' => isset($u->row()->user_qso_end_times) ? $u->row()->user_qso_end_times : 1, + 'user_quicklog' => isset($u->row()->user_quicklog) ? $u->row()->user_quicklog : 1, 'active_station_logbook' => $u->row()->active_station_logbook, 'language' => isset($u->row()->language) ? $u->row()->language: 'english', 'isWinkeyEnabled' => $u->row()->winkey, From 08fd2bc992db7d249502a15af304fd38945fc707 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:32:16 +0100 Subject: [PATCH 020/121] added Quicklog User Option --- application/views/user/add.php | 9 +++++++++ application/views/user/edit.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/application/views/user/add.php b/application/views/user/add.php index 58f0fb970..86c26097e 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -165,6 +165,15 @@ +
+ + + Quicklog Feature Description +
+
+ + + + Quicklog Feature Description +
+
+ + + +
From e6238dbf66352de91bf9666cda1365fe2650a3f8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:36:08 +0100 Subject: [PATCH 022/121] fixed typo --- application/models/User_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index b43e25db1..776eb3b0a 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -220,7 +220,7 @@ function edit($fields) { 'user_default_band' => xss_clean($fields['user_default_band']), 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''), 'user_qso_end_times' => xss_clean($fields['user_qso_end_times']), - 'user_quicklog' => xss_clean($field['user_quicklog']), + 'user_quicklog' => xss_clean($fields['user_quicklog']), 'language' => xss_clean($fields['language']), 'winkey' => xss_clean($fields['user_winkey']), ); From 9fd7c5c8b4971a89a5d7ebcc9d42b646e091e9ad Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:43:38 +0100 Subject: [PATCH 023/121] corrected migration --- application/migrations/151_user_quicklog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/migrations/151_user_quicklog.php b/application/migrations/151_user_quicklog.php index f55fb23c2..3d47d853c 100644 --- a/application/migrations/151_user_quicklog.php +++ b/application/migrations/151_user_quicklog.php @@ -7,7 +7,7 @@ * QUICKLOG Feature */ -class Migration_quicklog extends CI_Migration { +class Migration_user_quicklog extends CI_Migration { public function up() { From 6503787f26bd2830500d6e15d8efb26578f63785 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:57:09 +0100 Subject: [PATCH 024/121] added Translations --- application/language/bulgarian/account_lang.php | 2 ++ .../language/chinese_simplified/account_lang.php | 2 ++ application/language/czech/account_lang.php | 2 ++ application/language/dutch/account_lang.php | 2 ++ application/language/english/account_lang.php | 2 ++ application/language/finnish/account_lang.php | 2 ++ application/language/french/account_lang.php | 2 ++ application/language/german/account_lang.php | 2 ++ application/language/greek/account_lang.php | 2 ++ application/language/italian/account_lang.php | 2 ++ application/language/polish/account_lang.php | 2 ++ application/language/russian/account_lang.php | 2 ++ application/language/spanish/account_lang.php | 2 ++ application/language/swedish/account_lang.php | 6 ++++-- application/language/turkish/account_lang.php | 2 ++ application/views/user/add.php | 10 +++++----- application/views/user/edit.php | 4 ++-- 17 files changed, 39 insertions(+), 9 deletions(-) diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 71f8718b4..c0f3bbe68 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 069c0a14c..a6a1bf466 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = '日期格式'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = '距离单位偏好'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '选择您登录账户时要显示的日期格式'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '选择距离单位'; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index c295f5d18..5c84ec435 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Formát data'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Nastavení měření'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Vyberte, jak chcete, aby byla data zobrazena při přihlášení do vašeho účtu.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Vyberte, v jakých jednotkách se budou zobrazovat vzdálenosti.'; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 32280eb63..eb7cebd5c 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 753a31654..439277aa6 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index c680f524b..baafb9be5 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Päivämäärämuoto'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Mittayksikkömuoto'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Valitse, miten haluat päivämäärät näkyvän, kun olet kirjautunut tilillesi.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Valitse, mitä mittayksikkömuotoa käytetään'; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index db4d2c02a..149f92556 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Format de la date'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Unité de mesure'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '(Sélectionnez le format de date à afficher)'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '(Choisiez l\'unité de mesure à afficher)'; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index 10e65ccf1..4339ce5ad 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Datumsformat'; $lang['account_log_end_time'] = 'Logge Endzeiten für QSOs separat'; $lang['account_log_end_time_hint'] = 'Wenn aktiviert, werden QSO Endzeiten separat erfasst. Falls nicht, ist die QSO Endzeit gleich der Startzeit.'; +$lang['account_quicklog_feature'] = "Quicklog Feld"; +$lang['account_quicklog_feature_hint'] = "Mit dieser Option kannst du Rufzeichen auch direkt aus dem Suchfeld in der Menüleiste heraus loggen."; $lang['account_measurement_preferences'] = 'Entfernungsformat'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Wähle, wie Datumsfelder angezeigt werden sollen, wenn du eingeloggt bist.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Wähle, in welcher Einheit Entfernungen angezeigt werden sollen.'; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index a4f5d22b9..f4d6c6141 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 65cad6b64..70cdffd02 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index 873da71ed..4be7683a9 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 514972412..23aee7c44 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Формат даты'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Единицы измерения'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Выберите представление даты для отображения в вашем аккаунте.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Выберите единицы измерения расстояния'; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index f5d04adf5..f08f063e2 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index b9e403950..8546e8cf7 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -13,8 +13,8 @@ $lang['account_edit_account'] = 'Redigera användarkonto'; $lang['account_account_information'] = 'Användarkontoinformation'; -$lang['account_user'] = "User"; -$lang['account_word_edited'] = "edited"; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Användarnamn'; $lang['account_email_address'] = 'E-postadress'; $lang['account_password'] = 'Lösenord'; @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Datumformat'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Välj hur du vill att datum ska visas när du är inloggad på ditt konto.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Välj i vilken enhetsavstånd som ska visas'; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 8dbffce28..ca11e7153 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/views/user/add.php b/application/views/user/add.php index 86c26097e..843ad5dd6 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -166,13 +166,13 @@
- + - Quicklog Feature Description -
+ +
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 45bbf73f0..b036c46d5 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -175,12 +175,12 @@
- + - Quicklog Feature Description +
From 605119f92fb79c1af07255cd630e2d0d22c52847 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 19:06:35 +0100 Subject: [PATCH 025/121] added translations --- application/language/bulgarian/menu_lang.php | 8 +++++--- application/language/chinese_simplified/menu_lang.php | 2 ++ application/language/czech/menu_lang.php | 2 ++ application/language/dutch/menu_lang.php | 2 ++ application/language/english/menu_lang.php | 2 ++ application/language/finnish/menu_lang.php | 2 ++ application/language/french/menu_lang.php | 2 ++ application/language/german/menu_lang.php | 2 ++ application/language/greek/menu_lang.php | 2 ++ application/language/italian/menu_lang.php | 2 ++ application/language/polish/menu_lang.php | 2 ++ application/language/russian/menu_lang.php | 2 ++ application/language/spanish/menu_lang.php | 2 ++ application/language/swedish/menu_lang.php | 2 ++ application/language/turkish/menu_lang.php | 2 ++ application/views/interface_assets/header.php | 4 ++-- 16 files changed, 35 insertions(+), 5 deletions(-) diff --git a/application/language/bulgarian/menu_lang.php b/application/language/bulgarian/menu_lang.php index e7c8a4686..805cdfb24 100644 --- a/application/language/bulgarian/menu_lang.php +++ b/application/language/bulgarian/menu_lang.php @@ -11,7 +11,7 @@ $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; -$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; @@ -86,6 +88,6 @@ $lang['menu_forum'] = 'Forum'; $lang['menu_logout'] = 'Logout'; -$lang['menu_ffma'] = "Fred Fish Memorial Award"; -$lang['menu_ja_gridmaster'] = 'JA Gridmaster'; +$lang['menu_ffma'] = "Fred Fish Memorial Award"; +$lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 24c7b816b..e2816873d 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = '调试信息'; $lang['menu_search_text'] = '搜索呼号'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = '搜索'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = '登录'; $lang['menu_account'] = '账户'; diff --git a/application/language/czech/menu_lang.php b/application/language/czech/menu_lang.php index 0281ab9d4..3c2a00566 100644 --- a/application/language/czech/menu_lang.php +++ b/application/language/czech/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Informace pro ladění'; $lang['menu_search_text'] = 'Hledat značku'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Hledat'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Přihlásit se'; $lang['menu_account'] = 'Účet'; diff --git a/application/language/dutch/menu_lang.php b/application/language/dutch/menu_lang.php index b2abb3543..e863dfe30 100644 --- a/application/language/dutch/menu_lang.php +++ b/application/language/dutch/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/english/menu_lang.php b/application/language/english/menu_lang.php index 56561034d..46a399376 100644 --- a/application/language/english/menu_lang.php +++ b/application/language/english/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_search_button'] = 'Search'; $lang['menu_login_button'] = 'Login'; diff --git a/application/language/finnish/menu_lang.php b/application/language/finnish/menu_lang.php index 2cf11dcc4..17041bb70 100644 --- a/application/language/finnish/menu_lang.php +++ b/application/language/finnish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Etsi kutsulla'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Etsi'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Kirjaudu'; $lang['menu_account'] = 'Käyttäjätili'; diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php index 56561034d..46a399376 100644 --- a/application/language/french/menu_lang.php +++ b/application/language/french/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_search_button'] = 'Search'; $lang['menu_login_button'] = 'Login'; diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 8a0c244e3..7bf9d0e1b 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Informationen'; $lang['menu_search_text'] = 'Rufzeichensuche'; +$lang['menu_search_text_quicklog'] = "Logge/Suche Call"; //"Rufzeichen" wäre zu lang, daher nur "Call". Das wird verstanden. $lang['menu_search_button'] = 'Suche'; +$lang['menu_search_button_qicksearch_log'] = "Logge"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Konto'; diff --git a/application/language/greek/menu_lang.php b/application/language/greek/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/greek/menu_lang.php +++ b/application/language/greek/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/polish/menu_lang.php b/application/language/polish/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/polish/menu_lang.php +++ b/application/language/polish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index f812cc5e4..e773f528a 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Отладочная информация'; $lang['menu_search_text'] = 'Поиск позывного'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Поиск'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Вход'; $lang['menu_account'] = 'Аккаунт'; diff --git a/application/language/spanish/menu_lang.php b/application/language/spanish/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/spanish/menu_lang.php +++ b/application/language/spanish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/swedish/menu_lang.php b/application/language/swedish/menu_lang.php index 786d8e1a6..95e2a6d6d 100644 --- a/application/language/swedish/menu_lang.php +++ b/application/language/swedish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Info'; $lang['menu_search_text'] = 'Sök Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Sök'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Logga in'; $lang['menu_account'] = 'Konto'; diff --git a/application/language/turkish/menu_lang.php b/application/language/turkish/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/turkish/menu_lang.php +++ b/application/language/turkish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 4866a32d5..2e4620324 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -224,8 +224,8 @@ session->userdata('user_quicklog') == 1) { ?> - - + + From 04ff8d7434330e98e06704f8e37582de407cf1c8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:15:36 +0100 Subject: [PATCH 026/121] implemented search and qso redirect --- application/views/interface_assets/header.php | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 2e4620324..542736699 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -171,7 +171,7 @@
-
+
SAT Timers
@@ -221,17 +221,42 @@ - + + session->userdata('user_quicklog') == 1) { ?> -
+ - - + + + + + - +
- + @@ -366,4 +391,4 @@ - + \ No newline at end of file From 171dabec1810095083a31344f0d4f802973099c3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:34:08 +0100 Subject: [PATCH 027/121] replaced js to save ressources if ql. is disabled --- application/views/interface_assets/header.php | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 542736699..7680a1eb2 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -164,7 +164,9 @@
  • - +
    Hams.at optionslib->get_option('dxcache_url') != '') { ?> @@ -178,7 +180,9 @@ config->item('use_auth')) && ($this->session->userdata('user_type') == 99)) { ?>
  • - +
    @@ -221,24 +225,23 @@ - - session->userdata('user_quicklog') == 1) { ?> +
    From 1902bf1fb2ede7cf0fb39044c994fd8ab6a75616 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:36:54 +0100 Subject: [PATCH 028/121] removed 1st quicklog draft from dashboard --- application/views/dashboard/index.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 52e41a824..2e66e543d 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -188,15 +188,6 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
    - - - - - - -
    • From c9a9ebe7edd410a70149823ee688fe4687061682 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:39:48 +0100 Subject: [PATCH 029/121] set quicklog to live qso mode --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 7680a1eb2..d070f5436 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -237,7 +237,7 @@ function submitForm(action) { form.action = ""; form.method = "get"; input.name = "manual"; - input.value = "1"; + input.value = "0"; // Set to 1 if go to "Post-QSO" logging } form.submit(); } From 3c1d08f4cbfb3e0049a21e3854f4584fce232317 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 23:05:24 +0100 Subject: [PATCH 030/121] added handlekeyPress --- application/views/interface_assets/header.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index d070f5436..c95c364f8 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -241,9 +241,14 @@ function submitForm(action) { } form.submit(); } + function handleKeyPress(event) { + if (event.key === 'Enter') { + submitForm('qso'); // Treat Enter key press as clicking the 'quicksearch-log' button + } + }
    - +
    ' + '' + '' + - '' + - '' + + '' + + '' + '' + '' + '
    #Year# of QSO\'s worked ' + lang_statistics_year +'' + lang_statistics_number_of_qso_worked + '
    '); @@ -114,7 +114,7 @@ function totalQsosPerYear() { data: { labels: labels, datasets: [{ - label: 'Number of QSO\'s worked each year', + label: lang_statistics_number_of_qso_worked_each_year, data: dataQso, backgroundColor: 'rgba(54, 162, 235, 0.2)', borderColor: 'rgba(54, 162, 235, 1)', @@ -187,14 +187,14 @@ function totalModeQsos() { if (dataQso[0] === null && dataQso[1] === null && dataQso[2] === null && dataQso[3] === null) return; - $(".mode").append('

    Modes


    '); + $(".mode").append('

    ' + lang_statistics_modes + '


    '); // appending table to hold the data $("#modeTable").append('' + '' + '' + - '' + - '' + + '' + + '' + '' + '' + '
    #Mode# of QSO\'s worked ' + lang_gen_hamradio_mode + ' ' + lang_statistics_number_of_qso_worked + '
    '); @@ -307,14 +307,14 @@ function totalBandQsos() { success: function (data) { if (data.length > 0) { - $(".band").append('

    Bands


    '); + $(".band").append('

    ' + lang_statistics_bands + '


    '); // appending table to hold the data $("#bandTable").append('' + '' + '' + - '' + - '' + + '' + + '' + '' + '' + '
    #Band# of QSO\'s worked ' + lang_gen_hamradio_band + '' + lang_statistics_number_of_qso_worked + '
    '); From cd685aaa7112c89c01c7842b81f00ee8a07bb76d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 17:44:58 +0100 Subject: [PATCH 048/121] added general word 'Count' --- application/language/bulgarian/general_words_lang.php | 1 + application/language/chinese_simplified/general_words_lang.php | 1 + application/language/czech/general_words_lang.php | 1 + application/language/dutch/general_words_lang.php | 1 + application/language/english/general_words_lang.php | 1 + application/language/finnish/general_words_lang.php | 1 + application/language/french/general_words_lang.php | 1 + application/language/german/general_words_lang.php | 1 + application/language/greek/general_words_lang.php | 1 + application/language/italian/general_words_lang.php | 1 + application/language/polish/general_words_lang.php | 1 + application/language/russian/general_words_lang.php | 1 + application/language/spanish/general_words_lang.php | 1 + application/language/swedish/general_words_lang.php | 1 + application/language/turkish/general_words_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 4e619f9a3..d66e6ee6f 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Час'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index c3080bb91..56b918925 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = '日期'; $lang['general_word_time'] = '时间'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index c42a6ddea..e16b6ecfb 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Čas'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 06219892e..27348132c 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Tijd'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index c35c8ea72..8c6a14a29 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Time'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 0e63aba00..ebede7898 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Päivä'; $lang['general_word_time'] = 'Aika'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 604907f8f..b0a215b13 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Heure'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 88d2a13c5..43e192d94 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Ausgeschaltet"; $lang['general_word_export'] = "Exportieren"; $lang['general_word_import'] = "Importieren"; +$lang['general_word_count'] = "Zähler"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Zeit'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 14575f4d8..fcf5e411f 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Ημερομηνία'; $lang['general_word_time'] = 'Ωρα'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index ea373ad88..94ded311a 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Orario'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index b1e767a68..a4db13ad1 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Godzina'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index b3afddc3b..da8992ab0 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Время'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 77ac3a56f..bf3543cbe 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Fecha'; $lang['general_word_time'] = 'Hora'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index e411f5df1..7c16b4bfc 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; +$lang['general_word_count'] = "Count"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index cc81e2717..fd83aa73b 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Tarih'; $lang['general_word_time'] = 'Saat'; From 9d02cb13c0b162554794b2fb2a7792dca936e89c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 17:45:53 +0100 Subject: [PATCH 049/121] created lang file for bulgarian --- .../language/bulgarian/gridsquares_lang.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 application/language/bulgarian/gridsquares_lang.php diff --git a/application/language/bulgarian/gridsquares_lang.php b/application/language/bulgarian/gridsquares_lang.php new file mode 100644 index 000000000..07bc32c96 --- /dev/null +++ b/application/language/bulgarian/gridsquares_lang.php @@ -0,0 +1,36 @@ + Date: Sun, 5 Nov 2023 17:46:13 +0100 Subject: [PATCH 050/121] added various translations --- .../language/chinese_simplified/gridsquares_lang.php | 6 ++++++ application/language/czech/gridsquares_lang.php | 6 ++++++ application/language/dutch/gridsquares_lang.php | 8 +++++++- application/language/english/gridsquares_lang.php | 8 +++++++- application/language/finnish/gridsquares_lang.php | 6 ++++++ application/language/french/gridsquares_lang.php | 6 ++++++ application/language/german/gridsquares_lang.php | 7 +++++++ application/language/greek/gridsquares_lang.php | 8 +++++++- application/language/italian/gridsquares_lang.php | 8 +++++++- application/language/polish/gridsquares_lang.php | 8 +++++++- application/language/russian/gridsquares_lang.php | 6 ++++++ application/language/spanish/gridsquares_lang.php | 8 +++++++- application/language/swedish/gridsquares_lang.php | 6 ++++++ application/language/turkish/gridsquares_lang.php | 8 +++++++- 14 files changed, 92 insertions(+), 7 deletions(-) diff --git a/application/language/chinese_simplified/gridsquares_lang.php b/application/language/chinese_simplified/gridsquares_lang.php index a2d127dd4..02bac7ec9 100644 --- a/application/language/chinese_simplified/gridsquares_lang.php +++ b/application/language/chinese_simplified/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = '网格地图'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = '已确认的网格是绿色'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = '已工作但未确认的网格是红色'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = '网格'; $lang['gridsquares_total_count'] = '总数'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = '频率'; $lang['gridsquares_mode'] = '模式'; $lang['gridsquares_sat'] = '卫星'; $lang['gridsquares_confirmation'] = '确认'; $lang['gridsquares_button_plot'] = '绘制'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = '网格'; $lang['gridsquares_gridsquares_confirmed'] = '已确认的网格'; diff --git a/application/language/czech/gridsquares_lang.php b/application/language/czech/gridsquares_lang.php index 13ffd30d8..ccb193971 100644 --- a/application/language/czech/gridsquares_lang.php +++ b/application/language/czech/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Mapa lokátorů'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Potvrzené lokátory jsou zeleně'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Odpracované, ale nepotvrzené lokátory jsou červeně'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'lokátor'; $lang['gridsquares_total_count'] = 'Celkový počet'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Pásmo'; $lang['gridsquares_mode'] = 'Režim'; $lang['gridsquares_sat'] = 'Satelit'; $lang['gridsquares_confirmation'] = 'Potvrzení'; $lang['gridsquares_button_plot'] = 'Zobrazit'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Lokátory'; $lang['gridsquares_gridsquares_confirmed'] = 'Potvrzené lokátory'; diff --git a/application/language/dutch/gridsquares_lang.php b/application/language/dutch/gridsquares_lang.php index d8d4a1b74..38f2447fd 100644 --- a/application/language/dutch/gridsquares_lang.php +++ b/application/language/dutch/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/english/gridsquares_lang.php b/application/language/english/gridsquares_lang.php index 0b18933e2..07bc32c96 100644 --- a/application/language/english/gridsquares_lang.php +++ b/application/language/english/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_worked'] = 'Gridsquares worked'; diff --git a/application/language/finnish/gridsquares_lang.php b/application/language/finnish/gridsquares_lang.php index af17febc7..84a0dfb9e 100644 --- a/application/language/finnish/gridsquares_lang.php +++ b/application/language/finnish/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Gridsquare-kartta'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Vahvistetut ovat vihreitä'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Workitut, mutta ei vahvistetut ovat punaisena'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Bandi'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satelliitti'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Merkitse'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/french/gridsquares_lang.php b/application/language/french/gridsquares_lang.php index d1611bf69..b3e3151b5 100644 --- a/application/language/french/gridsquares_lang.php +++ b/application/language/french/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Carte des Locators'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmé en Vert'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Contacté, mais non confirmé en Rouge'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'Grilles des Locators'; $lang['gridsquares_total_count'] = 'Total'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Bande'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmé'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Locators'; $lang['gridsquares_gridsquares_confirmed'] = 'Locators confirmés'; diff --git a/application/language/german/gridsquares_lang.php b/application/language/german/gridsquares_lang.php index 9d9fb621f..40eba1c21 100644 --- a/application/language/german/gridsquares_lang.php +++ b/application/language/german/gridsquares_lang.php @@ -3,6 +3,9 @@ defined('BASEPATH') OR exit('Direkter Zugriff auf Skripte ist nicht erlaubt'); $lang['gridsquares_gridsquare_map'] = 'Planquadratkarte'; +$lang['gridsquares_activated_gridsquare_map'] = "Aktivierte Planquadrate Karte"; +$lang['gridsquares_gridsquare_activators'] = "Planquadrat-Aktivierer"; + $lang['gridsquares_confirmed_is_green'] = 'Bestätigt ist grün'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Gearbeitet aber nicht bestätigt ist rot'; @@ -12,6 +15,9 @@ $lang['gridsquares_grid_squares'] = 'Planquadrate'; $lang['gridsquares_total_count'] = 'Summe'; +$lang['gridsquares_minimum_count'] = "Minimale Anzahl"; +$lang['gridsquares_show_qsos'] = "Zeige QSO's"; +$lang['gridsquares_show_map'] = "Zeige Karte"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; @@ -19,6 +25,7 @@ $lang['gridsquares_confirmation'] = 'Bestätigung'; $lang['gridsquares_button_plot'] = 'Kartieren'; +$lang['gridsquares_button_clear_markers'] = "Lösche Markierungen"; $lang['gridsquares_gridsquares'] = 'Planquadrate'; $lang['gridsquares_gridsquares_worked'] = 'Gearbeitete Planquadrate'; diff --git a/application/language/greek/gridsquares_lang.php b/application/language/greek/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/greek/gridsquares_lang.php +++ b/application/language/greek/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/italian/gridsquares_lang.php b/application/language/italian/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/italian/gridsquares_lang.php +++ b/application/language/italian/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/polish/gridsquares_lang.php b/application/language/polish/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/polish/gridsquares_lang.php +++ b/application/language/polish/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/russian/gridsquares_lang.php b/application/language/russian/gridsquares_lang.php index 3f7ccdd29..6c5e2a5c7 100644 --- a/application/language/russian/gridsquares_lang.php +++ b/application/language/russian/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Карта квадратов'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Подтверждённые окрашены зелёным'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Сработанные, но не подтверждённые окрвшены красным'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'квадрат(/-а/-ов)'; $lang['gridsquares_total_count'] = 'Всего'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Диапазон'; $lang['gridsquares_mode'] = 'Вид излучения'; $lang['gridsquares_sat'] = 'Спутник'; $lang['gridsquares_confirmation'] = 'Подтверждение'; $lang['gridsquares_button_plot'] = 'Отобразить'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Квадраты'; $lang['gridsquares_gridsquares_confirmed'] = 'Подтверждёно квадратов'; diff --git a/application/language/spanish/gridsquares_lang.php b/application/language/spanish/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/spanish/gridsquares_lang.php +++ b/application/language/spanish/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/swedish/gridsquares_lang.php b/application/language/swedish/gridsquares_lang.php index 32b06bd02..67a9856a4 100644 --- a/application/language/swedish/gridsquares_lang.php +++ b/application/language/swedish/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Gridsquare karta'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Bekräftat är grönt'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Fungerade men inte bekräftat är röd'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Totalt antal'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Bekräftelse'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares bekräftad'; diff --git a/application/language/turkish/gridsquares_lang.php b/application/language/turkish/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/turkish/gridsquares_lang.php +++ b/application/language/turkish/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; From 7c0b4486a5363fb2aee5f3e4e60e1b0245832bb8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 17:46:30 +0100 Subject: [PATCH 051/121] Multilanguage Support --- application/views/activated_gridmap/index.php | 10 +++++----- application/views/activators/index.php | 20 +++++++++---------- application/views/gridmap/index.php | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 2e8c43a28..7c8e055f9 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -44,12 +44,12 @@
    -

    +

    disabled> - + ' . $sat . ''."\n"; } ?> @@ -71,7 +71,7 @@ - + input->post('band') == $band) echo ' selected'; @@ -27,7 +27,7 @@
    - +
    - + - + submode ?? '' == '') { @@ -109,7 +109,7 @@
    - + session->flashdata('message')) { ?> From 83ca8f84b35c2fc00bc5b45594548c667ca5fb60 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:29:44 +0100 Subject: [PATCH 052/121] translation for filter view --- application/controllers/Distances.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Distances.php b/application/controllers/Distances.php index 3d57c9817..1854fb5b8 100644 --- a/application/controllers/Distances.php +++ b/application/controllers/Distances.php @@ -77,7 +77,7 @@ public function getDistanceQsos(){ // Render Page $data['page_title'] = "Log View - " . $distance; - $data['filter'] = "Filtering on QSOs with " . $distance . " and band ".$band; + $data['filter'] = lang('statistics_distances_qsos_with') . " " . $distance . " " . lang('statistics_distances_and_band'). " " . $band; $this->load->view('awards/details', $data); } } From a49def505489341a133cd548c1df4a242b188012 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:30:10 +0100 Subject: [PATCH 053/121] added general word for filtering in --- application/language/bulgarian/general_words_lang.php | 1 + application/language/chinese_simplified/general_words_lang.php | 1 + application/language/czech/general_words_lang.php | 1 + application/language/dutch/general_words_lang.php | 1 + application/language/english/general_words_lang.php | 1 + application/language/finnish/general_words_lang.php | 1 + application/language/french/general_words_lang.php | 1 + application/language/german/general_words_lang.php | 1 + application/language/greek/general_words_lang.php | 1 + application/language/italian/general_words_lang.php | 1 + application/language/polish/general_words_lang.php | 1 + application/language/russian/general_words_lang.php | 1 + application/language/spanish/general_words_lang.php | 1 + application/language/swedish/general_words_lang.php | 1 + application/language/turkish/general_words_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index d66e6ee6f..eea1e3186 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Час'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 56b918925..557865471 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = '日期'; $lang['general_word_time'] = '时间'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index e16b6ecfb..9bbf698cb 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Čas'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 27348132c..1d6841e2d 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Tijd'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 8c6a14a29..465f64104 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Time'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index ebede7898..7933ad476 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Päivä'; $lang['general_word_time'] = 'Aika'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index b0a215b13..ed63f9e69 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Heure'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 43e192d94..8db313183 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Exportieren"; $lang['general_word_import'] = "Importieren"; $lang['general_word_count'] = "Zähler"; +$lang['general_word_filtering_on'] = "Filtern auf"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Zeit'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index fcf5e411f..49926502a 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Ημερομηνία'; $lang['general_word_time'] = 'Ωρα'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 94ded311a..fb82644a2 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Orario'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index a4db13ad1..e69c6a2b5 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Godzina'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index da8992ab0..74443b1b9 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Время'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index bf3543cbe..f21e4fc84 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Fecha'; $lang['general_word_time'] = 'Hora'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index 7c16b4bfc..06cba4c23 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index fd83aa73b..7abc0e081 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Tarih'; $lang['general_word_time'] = 'Saat'; From 61e331335529cceefdcb12d06ba46f98b9cb6e8d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:30:35 +0100 Subject: [PATCH 054/121] added various translations --- application/language/bulgarian/statistics_lang.php | 10 +++++++++- .../language/chinese_simplified/statistics_lang.php | 10 +++++++++- application/language/czech/statistics_lang.php | 10 +++++++++- application/language/dutch/statistics_lang.php | 10 +++++++++- application/language/english/statistics_lang.php | 10 +++++++++- application/language/finnish/statistics_lang.php | 10 +++++++++- application/language/french/statistics_lang.php | 10 +++++++++- application/language/german/statistics_lang.php | 8 ++++++++ application/language/greek/statistics_lang.php | 10 +++++++++- application/language/italian/statistics_lang.php | 10 +++++++++- application/language/polish/statistics_lang.php | 10 +++++++++- application/language/russian/statistics_lang.php | 10 +++++++++- application/language/spanish/statistics_lang.php | 10 +++++++++- application/language/swedish/statistics_lang.php | 10 +++++++++- application/language/turkish/statistics_lang.php | 10 +++++++++- 15 files changed, 134 insertions(+), 14 deletions(-) diff --git a/application/language/bulgarian/statistics_lang.php b/application/language/bulgarian/statistics_lang.php index 185043983..d4fac83f2 100644 --- a/application/language/bulgarian/statistics_lang.php +++ b/application/language/bulgarian/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/chinese_simplified/statistics_lang.php b/application/language/chinese_simplified/statistics_lang.php index 49b8ad3d4..140597870 100644 --- a/application/language/chinese_simplified/statistics_lang.php +++ b/application/language/chinese_simplified/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = '年'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/czech/statistics_lang.php b/application/language/czech/statistics_lang.php index 3fddb6651..f735256a7 100644 --- a/application/language/czech/statistics_lang.php +++ b/application/language/czech/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Rok'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/dutch/statistics_lang.php b/application/language/dutch/statistics_lang.php index 608a7c0b6..dafcb122c 100644 --- a/application/language/dutch/statistics_lang.php +++ b/application/language/dutch/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/english/statistics_lang.php b/application/language/english/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/english/statistics_lang.php +++ b/application/language/english/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/finnish/statistics_lang.php b/application/language/finnish/statistics_lang.php index 06728d65f..db3ef6a82 100644 --- a/application/language/finnish/statistics_lang.php +++ b/application/language/finnish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Vuosi'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/french/statistics_lang.php b/application/language/french/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/french/statistics_lang.php +++ b/application/language/french/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/german/statistics_lang.php b/application/language/german/statistics_lang.php index 2228bd0ab..282d12ea6 100644 --- a/application/language/german/statistics_lang.php +++ b/application/language/german/statistics_lang.php @@ -19,4 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Anzahl der QSOs gearbeitet pro Jahr"; $lang['statistics_number_of_qso_worked'] = "# gearbeitete QSOs"; +$lang['statistics_distances_worked'] = "Gearbeitete Entfernungen"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "Kontakte wurden dargestellt.
    Der weiteste Kontakt war"; // make sure'
    ' stays there +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "im Planquadrat"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "Die Distanz betrug"; +$lang['statistics_distances_number_of_qsos'] = "Anzahl der QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Gearbeitete(s) Rufzeichen (max 5 werden gezeigt)"; +$lang['statistics_distances_qsos_with'] = "QSOs mit"; +$lang['statistics_distances_and_band'] = "und Band"; diff --git a/application/language/greek/statistics_lang.php b/application/language/greek/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/greek/statistics_lang.php +++ b/application/language/greek/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/italian/statistics_lang.php b/application/language/italian/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/italian/statistics_lang.php +++ b/application/language/italian/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/polish/statistics_lang.php b/application/language/polish/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/polish/statistics_lang.php +++ b/application/language/polish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/russian/statistics_lang.php b/application/language/russian/statistics_lang.php index 4a8242bfa..2109e4289 100644 --- a/application/language/russian/statistics_lang.php +++ b/application/language/russian/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Год'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/spanish/statistics_lang.php b/application/language/spanish/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/spanish/statistics_lang.php +++ b/application/language/spanish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/swedish/statistics_lang.php b/application/language/swedish/statistics_lang.php index 6117243e0..aed05485c 100644 --- a/application/language/swedish/statistics_lang.php +++ b/application/language/swedish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'År'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/turkish/statistics_lang.php b/application/language/turkish/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/turkish/statistics_lang.php +++ b/application/language/turkish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; From f98ee999edd17d18db1f6910073bfe1ec8eedcb4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:31:07 +0100 Subject: [PATCH 055/121] added Translation for Filtering On --- application/views/activators/details.php | 2 +- application/views/awards/counties/details.php | 2 +- application/views/awards/details.php | 2 +- application/views/awards/vucc/band.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/activators/details.php b/application/views/activators/details.php index ca67ad2c8..52b59c929 100644 --- a/application/views/activators/details.php +++ b/application/views/activators/details.php @@ -1,4 +1,4 @@
    -
    Filtering on
    +
    load->view('view_log/partial/log_ajax') ?> diff --git a/application/views/awards/counties/details.php b/application/views/awards/counties/details.php index 48fe99fef..94852d23d 100644 --- a/application/views/awards/counties/details.php +++ b/application/views/awards/counties/details.php @@ -1,7 +1,7 @@

    -

    Filtering on

    +

    Filtering on +
    load->view('view_log/partial/log_ajax') ?> \ No newline at end of file diff --git a/application/views/awards/vucc/band.php b/application/views/awards/vucc/band.php index 98234b1f8..eab72d012 100644 --- a/application/views/awards/vucc/band.php +++ b/application/views/awards/vucc/band.php @@ -1,7 +1,7 @@

    -

    Filtering on

    +

    Date: Sun, 5 Nov 2023 19:31:23 +0100 Subject: [PATCH 056/121] translations --- application/views/distances/index.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/application/views/distances/index.php b/application/views/distances/index.php index 91bc1638e..2860cbb07 100644 --- a/application/views/distances/index.php +++ b/application/views/distances/index.php @@ -2,9 +2,17 @@
    -

    +

    @@ -18,9 +26,9 @@ } ?> - + - +
    From 79750c17de7749940f3e6be2ac17a8aae456d474 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:31:43 +0100 Subject: [PATCH 057/121] added general language --- application/views/interface_assets/footer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 8b12884a3..543724faf 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -26,6 +26,7 @@ var lang_general_word_confirmed = ""; var lang_general_word_worked_not_confirmed = ""; var lang_general_word_not_worked = ""; + var lang_admin_close = ""; From bce2c633b3317d086ef06b68be4936d925aff7c0 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:32:03 +0100 Subject: [PATCH 058/121] added Translation for Filtering On --- application/views/timeline/details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/timeline/details.php b/application/views/timeline/details.php index ca67ad2c8..52b59c929 100644 --- a/application/views/timeline/details.php +++ b/application/views/timeline/details.php @@ -1,4 +1,4 @@
    -
    Filtering on
    +
    load->view('view_log/partial/log_ajax') ?> From 27aad9c3744c09aff7bfd74931e2483e5a7e2d47 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:32:15 +0100 Subject: [PATCH 059/121] various translations --- assets/js/sections/distances.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index a15f1635a..9b7cbe57e 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -28,7 +28,7 @@ function distPlot(form) { backgroundColor: getBodyBackground() }, title: { - text: 'Distance Distribution', + text: lang_statistics_distances_worked, style: { color: color } @@ -47,7 +47,7 @@ function distPlot(form) { }, yAxis: { title: { - text: '# QSOs', + text: lang_statistics_distances_number_of_qsos, style: { color: color } @@ -77,9 +77,9 @@ function distPlot(form) { tooltip: { formatter: function () { if(this.point) { - return "Distance: " + options.xAxis.categories[this.point.x] + - "
    Callsign(s) worked (max 5 shown): " + myComments[this.point.x] + - "
    Number of QSOs: " + series.data[this.point.x] + ""; + return lang_gen_hamradio_distance + ": " + options.xAxis.categories[this.point.x] + + "
    " + lang_statistics_distances_callsigns_worked + ": " + myComments[this.point.x] + + "
    " + lang_statistics_distances_number_of_qsos + ": " + series.data[this.point.x] + ""; } } }, @@ -108,16 +108,16 @@ function distPlot(form) { $.each(tmp.qsodata, function(){ myComments.push(this.calls); options.xAxis.categories.push(this.dist); - series.name = 'Number of QSOs'; + series.name = lang_statistics_distances_number_of_qsos; series.data.push(this.count); }); options.series.push(series); - $('#information').html(tmp.qrb.Qsos + " contacts were plotted.
    Your furthest contact was with " + tmp.qrb.Callsign - + " in gridsquare "+ tmp.qrb.Grid - +"; the distance was " - +tmp.qrb.Distance + tmp.unit +"."); + $('#information').html(tmp.qrb.Qsos + " " + lang_statistics_distances_part1_contacts_were_plotted_furthest + " " + tmp.qrb.Callsign + + " " + lang_statistics_distances_part2_contacts_were_plotted_furthest + " " + tmp.qrb.Grid + +". " + lang_statistics_distances_part3_contacts_were_plotted_furthest + " " + + tmp.qrb.Distance + tmp.unit + "."); var chart = new Highcharts.Chart(options); } @@ -166,7 +166,7 @@ function getDistanceQsos(distance) { }); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } From ff1a65d831435f3e7c44d082f9e3f095598ed7b4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:38:34 +0100 Subject: [PATCH 060/121] Added Translation for 'Close' Button --- application/views/interface_assets/footer.php | 24 +++++++++---------- assets/js/sections/common.js | 8 +++---- assets/js/sections/ffma.js | 2 +- assets/js/sections/gridmap.js | 2 +- assets/js/sections/gridmaster.js | 2 +- assets/js/sections/ja_gridmaster.js | 2 +- assets/js/sections/labels.js | 2 +- assets/js/sections/logbookadvanced.js | 6 ++--- assets/js/sections/mode.js | 2 +- assets/js/sections/oqrs.js | 4 ++-- assets/js/sections/qslprint.js | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 543724faf..6f8d91ed0 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -336,7 +336,7 @@ function export_stored_query(id) { nl2br: false, message: 'You need to make a query before you search!', buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } @@ -457,7 +457,7 @@ function edit_stored_query_dialog() { nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } @@ -516,7 +516,7 @@ function edit_stored_query_dialog() { nl2br: false, message: 'You need to make a query before you search!', buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } @@ -2165,7 +2165,7 @@ function displayTimelineContacts(querystring, band, mode, type) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2231,7 +2231,7 @@ function displayActivatorsContacts(call, band, leogeo) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2363,7 +2363,7 @@ function viewQsl(picture, callsign) { size: BootstrapDialog.SIZE_WIDE, message: $textAndPic, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogRef){ dialogRef.close(); } @@ -2425,7 +2425,7 @@ function viewEqsl(picture, callsign) { size: BootstrapDialog.SIZE_WIDE, message: $textAndPic, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogRef){ dialogRef.close(); } @@ -2490,7 +2490,7 @@ function displayContacts(searchphrase, band, mode, type, qsl) { }); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2535,7 +2535,7 @@ function displayContactsOnMap(target, searchphrase, band, mode, type, qsl) { }); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2657,7 +2657,7 @@ function addQsosToQsl(filename) { nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2802,7 +2802,7 @@ function displayCountyContacts(state, county) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2879,7 +2879,7 @@ function addThemeDialog() { nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 1fa33e57e..c1935f9f8 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -321,7 +321,7 @@ function spawnQrbCalculator(locator1, locator2) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -346,7 +346,7 @@ function spawnActivatorsMap(call, count, grids) { showActivatorsMap(call, count, grids); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -430,7 +430,7 @@ function spawnLookupModal(searchphrase, searchtype) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -534,7 +534,7 @@ function displayQsl(id) { }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index a3163156d..5055da811 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -127,7 +127,7 @@ function spawnGridsquareModal(loc_4char) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index 2abd226c8..f832ad1f9 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -150,7 +150,7 @@ function spawnGridsquareModal(loc_4char) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index f197ec509..9d150d8ec 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -127,7 +127,7 @@ function spawnGridsquareModal(loc_4char) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/ja_gridmaster.js b/assets/js/sections/ja_gridmaster.js index f19e380cf..6859cdd57 100644 --- a/assets/js/sections/ja_gridmaster.js +++ b/assets/js/sections/ja_gridmaster.js @@ -128,7 +128,7 @@ function spawnGridsquareModal(loc_4char) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/labels.js b/assets/js/sections/labels.js index c6aececac..01154689a 100644 --- a/assets/js/sections/labels.js +++ b/assets/js/sections/labels.js @@ -30,7 +30,7 @@ function printat(stationid) { onshown: function(dialog) { }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index dd9f9f070..b13664893 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -534,7 +534,7 @@ $(document).ready(function () { } }, { - label: 'Close', + label: lang_admin_close, cssClass: 'btn-sm', id: 'closeButton', action: function (dialogItself) { @@ -579,7 +579,7 @@ $(document).ready(function () { }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { $('#qslSlideshow').prop("disabled", false); dialogItself.close(); @@ -661,7 +661,7 @@ $(document).ready(function () { onshown: function(dialog) { }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { $('#printLabel').prop("disabled", false); dialogItself.close(); diff --git a/assets/js/sections/mode.js b/assets/js/sections/mode.js index 5a496f753..8caa2055d 100644 --- a/assets/js/sections/mode.js +++ b/assets/js/sections/mode.js @@ -43,7 +43,7 @@ function createModeDialog() { nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/oqrs.js b/assets/js/sections/oqrs.js index 4c7abae25..72e266204 100644 --- a/assets/js/sections/oqrs.js +++ b/assets/js/sections/oqrs.js @@ -331,7 +331,7 @@ function searchLog(callsign) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -361,7 +361,7 @@ function searchLogTimeDate(id) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js index f55caa57d..fe4eff25f 100644 --- a/assets/js/sections/qslprint.js +++ b/assets/js/sections/qslprint.js @@ -35,7 +35,7 @@ function openQsoList(callsign) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -99,7 +99,7 @@ function showOqrs(id) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } From 6d8804b1891a9e7dfe4b701761a94ff5e07dac60 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 12:29:33 +0100 Subject: [PATCH 061/121] changed quicklog form to text --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index eaf61e65c..abb948b32 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -264,7 +264,7 @@ function handleKeyPress(event) {
    - + From 5d9d77c6ab80c4f314c831b41804e7aa29b11dfc Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:17:01 +0100 Subject: [PATCH 072/121] changed quicklog to localstorage --- application/views/interface_assets/header.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 8c5e8afeb..9a8bf8c4f 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -237,12 +237,16 @@ function submitForm(action) { if (action === 'search') { form.action = ""; form.method = "post"; - } else if (action === 'qso') { - form.action = ""; // Set ?manual=0 to 1 if go to "Post-QSO" logging - form.method = "post"; } form.submit(); } + function logQuicklog() { + if (localStorage.getItem("quicklogCallsign") !== "") { + localStorage.removeItem("quicklogCallsign"); + } + localStorage.setItem("quicklogCallsign", $("input[name='searchBar']").val()); + window.open("", "_self"); + } session->userdata('user_quicklog_enter') == 1) { ?> - + - - From f270ddc1fcd160491568f0008a7a31894c07708b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:17:24 +0100 Subject: [PATCH 073/121] removed post value in callsign --- application/views/qso/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index bb98b60fc..3222af4bd 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -109,7 +109,7 @@
    optionslib->get_option('dxcache_url') != '') { ?>  - +
    From 2c7b588fa26d928f1c9f5233445e6ccc38bbf2f5 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:17:49 +0100 Subject: [PATCH 074/121] lookup logic if localstorage is not empty --- assets/js/sections/qso.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 197657f35..809bb88b3 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -1,10 +1,12 @@ $( document ).ready(function() { setTimeout(function() { - var callsignValue = $("#callsign").val(); - if (callsignValue != "") { - $("#mode").focus(); + var callsignValue = localStorage.getItem("quicklogCallsign"); + if (callsignValue !== "") { + console.log("wir sind in der Funktion"); + $("#callsign").val(callsignValue); + $("#mode").focus(); } - }, 100); + }, 100); var favs={}; get_fav(); From 56ff6fd8e5bbc8b3a4ded5d17f48490566d41343 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:19:47 +0100 Subject: [PATCH 075/121] empty localstorage after lookup --- assets/js/sections/qso.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 809bb88b3..a11467722 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -2,9 +2,9 @@ $( document ).ready(function() { setTimeout(function() { var callsignValue = localStorage.getItem("quicklogCallsign"); if (callsignValue !== "") { - console.log("wir sind in der Funktion"); $("#callsign").val(callsignValue); $("#mode").focus(); + localStorage.removeItem("quicklogCallsign"); } }, 100); var favs={}; From 0088d123998580c455aa2c0822a43d3c1950831d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:20:18 +0100 Subject: [PATCH 076/121] fixed enter action --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 9a8bf8c4f..41dfb5b09 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -260,7 +260,7 @@ function handleKeyPress(event) { From 14b2d8c4bc75efeae4baff0522ce5c3effc015c8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 23:00:53 +0100 Subject: [PATCH 077/121] fixed enter problem --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 41dfb5b09..a89ce6b27 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -265,7 +265,7 @@ function handleKeyPress(event) { } - + +
    @@ -113,11 +113,11 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, # '.$ci->lang->line('general_word_date').' - Prefix + '.$ci->lang->line('gen_hamradio_prefix').' '.$ci->lang->line('general_word_country').' - Status - End Date - Show QSOs + '.$ci->lang->line('station_logbooks_status').' + '.$ci->lang->line('general_word_enddate').' + '.$ci->lang->line('gridsquares_show_qsos').' '; @@ -148,7 +148,7 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $ # '.$ci->lang->line('general_word_date').' '.$ci->lang->line('gen_hamradio_state').' - Show QSOs + '.$ci->lang->line('gridsquares_show_qsos').' '; @@ -159,7 +159,7 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $ ' . $i-- . ' ' . date($custom_date_format, $date_as_timestamp) . ' ' . $line->col_state . ' - col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show + col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').' '; } echo '
    '; @@ -173,10 +173,10 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, # '.$ci->lang->line('general_word_date').' - IOTA - Name - Prefix - Show QSOs + '.$ci->lang->line('gen_hamradio_iota').' + '.$ci->lang->line('general_word_name').' + '.$ci->lang->line('gen_hamradio_prefix').' + '.$ci->lang->line('gridsquares_show_qsos').' '; @@ -203,8 +203,8 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $ # '.$ci->lang->line('general_word_date').' - CQ Zone - Show QSOs + '.$ci->lang->line('gen_hamradio_cqzone').' + '.$ci->lang->line('gridsquares_show_qsos').' '; @@ -230,7 +230,7 @@ function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, # '.$ci->lang->line('general_word_date').' '.$ci->lang->line('gen_hamradio_gridsquare').' - Show QSOs + '.$ci->lang->line('gridsquares_show_qsos').' '; From 4e7ed84ae6c23dce25ba58e5e236f2470a6de524 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 7 Nov 2023 22:11:58 +0100 Subject: [PATCH 080/121] added comments and timeline translation --- application/language/bulgarian/statistics_lang.php | 14 ++++++++++++++ .../chinese_simplified/statistics_lang.php | 14 ++++++++++++++ application/language/czech/statistics_lang.php | 14 ++++++++++++++ application/language/dutch/statistics_lang.php | 14 ++++++++++++++ application/language/english/statistics_lang.php | 14 ++++++++++++++ application/language/finnish/statistics_lang.php | 14 ++++++++++++++ application/language/french/statistics_lang.php | 14 ++++++++++++++ application/language/german/statistics_lang.php | 14 ++++++++++++++ application/language/greek/statistics_lang.php | 14 ++++++++++++++ application/language/italian/statistics_lang.php | 14 ++++++++++++++ application/language/polish/statistics_lang.php | 14 ++++++++++++++ application/language/russian/statistics_lang.php | 14 ++++++++++++++ application/language/spanish/statistics_lang.php | 14 ++++++++++++++ application/language/swedish/statistics_lang.php | 14 ++++++++++++++ application/language/turkish/statistics_lang.php | 14 ++++++++++++++ 15 files changed, 210 insertions(+) diff --git a/application/language/bulgarian/statistics_lang.php b/application/language/bulgarian/statistics_lang.php index d4fac83f2..a92ce98c5 100644 --- a/application/language/bulgarian/statistics_lang.php +++ b/application/language/bulgarian/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/chinese_simplified/statistics_lang.php b/application/language/chinese_simplified/statistics_lang.php index 140597870..d1b3e0ec1 100644 --- a/application/language/chinese_simplified/statistics_lang.php +++ b/application/language/chinese_simplified/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/czech/statistics_lang.php b/application/language/czech/statistics_lang.php index f735256a7..dabf58d4f 100644 --- a/application/language/czech/statistics_lang.php +++ b/application/language/czech/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/dutch/statistics_lang.php b/application/language/dutch/statistics_lang.php index dafcb122c..4709463cf 100644 --- a/application/language/dutch/statistics_lang.php +++ b/application/language/dutch/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/english/statistics_lang.php b/application/language/english/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/english/statistics_lang.php +++ b/application/language/english/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/finnish/statistics_lang.php b/application/language/finnish/statistics_lang.php index db3ef6a82..eb8feb45c 100644 --- a/application/language/finnish/statistics_lang.php +++ b/application/language/finnish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/french/statistics_lang.php b/application/language/french/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/french/statistics_lang.php +++ b/application/language/french/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/german/statistics_lang.php b/application/language/german/statistics_lang.php index 282d12ea6..376dfc3b2 100644 --- a/application/language/german/statistics_lang.php +++ b/application/language/german/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Anzahl der QSOs gearbeitet pro Jahr"; $lang['statistics_number_of_qso_worked'] = "# gearbeitete QSOs"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Gearbeitete Entfernungen"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "Kontakte wurden dargestellt.
    Der weiteste Kontakt war"; // make sure'
    ' stays there $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "im Planquadrat"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs mit"; $lang['statistics_distances_and_band'] = "und Band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Zeitleiste"; + diff --git a/application/language/greek/statistics_lang.php b/application/language/greek/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/greek/statistics_lang.php +++ b/application/language/greek/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/italian/statistics_lang.php b/application/language/italian/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/italian/statistics_lang.php +++ b/application/language/italian/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/polish/statistics_lang.php b/application/language/polish/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/polish/statistics_lang.php +++ b/application/language/polish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/russian/statistics_lang.php b/application/language/russian/statistics_lang.php index 2109e4289..27a442deb 100644 --- a/application/language/russian/statistics_lang.php +++ b/application/language/russian/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/spanish/statistics_lang.php b/application/language/spanish/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/spanish/statistics_lang.php +++ b/application/language/spanish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/swedish/statistics_lang.php b/application/language/swedish/statistics_lang.php index aed05485c..cbc119219 100644 --- a/application/language/swedish/statistics_lang.php +++ b/application/language/swedish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/turkish/statistics_lang.php b/application/language/turkish/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/turkish/statistics_lang.php +++ b/application/language/turkish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + From 95fe268ca8c747a0c6e4fb9eb8a615b3fcc47759 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 7 Nov 2023 22:16:26 +0100 Subject: [PATCH 081/121] added confirmation translations --- application/views/timeline/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 6a38efe67..6ec79109b 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -52,15 +52,15 @@
    input->post('qsl')) echo ' checked="checked"'; ?> > - +
    input->post('lotw')) echo ' checked="checked"'; ?> > - +
    input->post('eqsl')) echo ' checked="checked"'; ?> > - +
    From 075a9a945950666fb454b504b8a2b711a57adba9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 7 Nov 2023 22:24:27 +0100 Subject: [PATCH 082/121] added translation for 'Show' --- application/views/timeline/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 6ec79109b..0caa46c2a 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -133,7 +133,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, if (!empty($line->end)) echo ''.$ci->lang->line('gen_hamradio_deleted_dxcc').''; echo ' ' . $line->end . ' - adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show + adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').' '; } echo '
    '; @@ -189,7 +189,7 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, ' . $line->col_iota . ' ' . $line->name . ' ' . $line->prefix . ' - col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show + col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').' '; } echo '
    '; @@ -215,7 +215,7 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $ ' . $i-- . ' ' . date($custom_date_format, $date_as_timestamp) . ' ' . $line->col_cqz . ' - col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show + col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').' '; } echo '
    '; @@ -241,7 +241,7 @@ function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, ' . $i-- . ' ' . date($custom_date_format, $date_as_timestamp) . ' ' . $line['gridsquare'] . ' - Show + '.$ci->lang->line('filter_options_show').' '; } echo ''; From 9ca4600f3ce91d164ae53bfc6c0a4a608bcab5b8 Mon Sep 17 00:00:00 2001 From: littlebear0729 Date: Wed, 8 Nov 2023 14:39:46 +0800 Subject: [PATCH 083/121] Update Chinese translation --- .../chinese_simplified/account_lang.php | 28 +++---- .../language/chinese_simplified/adif_lang.php | 74 ++++++++--------- .../chinese_simplified/admin_lang.php | 64 +++++++------- .../chinese_simplified/contesting_lang.php | 22 ++--- .../chinese_simplified/export_lang.php | 8 +- .../chinese_simplified/general_words_lang.php | 83 +++++++++---------- .../chinese_simplified/gridsquares_lang.php | 6 +- .../language/chinese_simplified/menu_lang.php | 4 +- .../chinese_simplified/options_lang.php | 38 ++++----- .../chinese_simplified/qslcard_lang.php | 2 +- .../language/chinese_simplified/qso_lang.php | 6 +- 11 files changed, 167 insertions(+), 168 deletions(-) diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 069c0a14c..00f5116a8 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -9,19 +9,19 @@ $lang['account_column4_text'] = '选择第4列'; $lang['account_column5_text'] = '选择第5列（仅日志簿）'; -$lang['account_create_user_account'] = '创建用户账户i'; +$lang['account_create_user_account'] = '创建用户账户'; $lang['account_edit_account'] = '编辑账户'; $lang['account_account_information'] = '账户信息'; -$lang['account_user'] = "User"; -$lang['account_word_edited'] = "edited"; +$lang['account_user'] = "用户"; +$lang['account_word_edited'] = "已编辑"; $lang['account_username'] = '用户名'; $lang['account_email_address'] = '电子邮件'; $lang['account_password'] = '密码'; $lang['account_roles'] = '角色'; $lang['account_user_role'] = '用户角色'; -$lang['account_word_admin'] = 'Admin'; +$lang['account_word_admin'] = '管理员'; $lang['account_theme'] = '主题'; $lang['account_stylesheet'] = '样式表'; @@ -35,13 +35,13 @@ $lang['account_cloudlog_preferences'] = '偏好选项'; $lang['account_timezone'] = '时区'; $lang['account_date_format'] = '日期格式'; -$lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; -$lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_log_end_time'] = '单独记录QSO结束时间'; +$lang['account_log_end_time_hint'] = '如果想分别记录QSO的开始和结束时间，选择\'是\'，若选择\'否\'则QSO开始与结束时间相同。'; $lang['account_measurement_preferences'] = '距离单位偏好'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '选择您登录账户时要显示的日期格式'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '选择距离单位'; -$lang['account_cloudlog_language'] = 'Cloudlog Language'; -$lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; +$lang['account_cloudlog_language'] = 'Cloudlog语言'; +$lang['account_choose_cloudlog_language'] = '选择Cloudlog语言。'; $lang['account_main_menu'] = '主菜单'; $lang['account_show_notes_in_the_main_menu'] = '在主菜单显示便签栏'; @@ -64,7 +64,7 @@ $lang['account_amsat_status_upload'] = '上传到AMSAT'; $lang['account_upload_status_of_sat_qsos_to'] = '上传卫星QSO到'; -$lang['account_logbook_of_the_world'] = 'Logbook of the World'; +$lang['account_logbook_of_the_world'] = 'Logbook of the World（LoTW）'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) 用户名'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) 密码'; $lang['account_leave_blank_to_keep_existing_password'] = '留空以保留现有密码'; @@ -99,13 +99,13 @@ $lang['account_mastodon'] = 'Mastodon服务器'; $lang['account_user_mastodon'] = 'Mastodon 地址'; -$lang['account_user_mastodon_hint'] = "Main URL of your Mastodon server, e.g. https://radiosocial.de"; +$lang['account_user_mastodon_hint'] = "Mastodon服务器的主URL地址，例如 https://radiosocial.de"; -$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; +$lang['account_default_band_settings'] = '默认波段和QSL确认方式设置'; $lang['account_gridmap_default_band'] = '默认波段'; -$lang['account_qsl_settings'] = 'Default QSL-Methods'; +$lang['account_qsl_settings'] = '默认QSL方式'; $lang['account_winkeyer'] = 'Winkeyer'; -$lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; -$lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; +$lang['account_winkeyer_hint'] = "Cloudlog 中对 Winkeyer 的支持是实验性的，请在开启前先阅读 https://github.com/magicbug/Cloudlog/wiki/Winkey。"; +$lang['account_winkeyer_enabled'] = "启用Winkeyer功能"; diff --git a/application/language/chinese_simplified/adif_lang.php b/application/language/chinese_simplified/adif_lang.php index 45e5196a9..9b04979d9 100644 --- a/application/language/chinese_simplified/adif_lang.php +++ b/application/language/chinese_simplified/adif_lang.php @@ -9,8 +9,8 @@ ___________________________________________________________________________________________ */ -$lang['adif_import'] = "ADIF Import"; -$lang['adif_export'] = "ADIF Export"; +$lang['adif_import'] = "ADIF 导入"; +$lang['adif_export'] = "ADIF 导出"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php $lang['darc_dcl'] = "DARC DCL"; @@ -22,33 +22,33 @@ */ // $lang['general_word_important'] --> application/language/english/general_words_lang.php -$lang['adif_alert_log_files_type'] = "Log Files must have the file type *.adi"; +$lang['adif_alert_log_files_type'] = "Log文件的拓展名必须是.adi"; // $lang['general_word_warning'] --> application/language/english/general_words_lang.php "PHP Upload Warning" // $lang['gen_max_file_upload_size'] --> application/language/english/general_words_lang.php "PHP Upload Warning" -$lang['adif_select_stationlocation'] = "Select Station Location"; +$lang['adif_select_stationlocation'] = "选择站点位置"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['adif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF 文件"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] ="如果导入的ADIF文件不包含此信息，选择此项。"; -$lang['adif_import_dup'] = "Import duplicate QSOs"; -$lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; -$lang['adif_mark_imported_hrdlog'] = "Mark imported QSOs as uploaded to HRDLog.net Logbook"; -$lang['adif_mark_imported_qrz'] = "Mark imported QSOs as uploaded to QRZ Logbook"; -$lang['adif_mark_imported_clublog'] = "Mark imported QSOs as uploaded to Clublog Logbook"; +$lang['adif_import_dup'] = "导入重复的QSO"; +$lang['adif_mark_imported_lotw'] = "标记导入的QSO为已上传至 LoTW"; +$lang['adif_mark_imported_hrdlog'] = "标记导入的QSO为已上传至 HRDLog.net Logbook"; +$lang['adif_mark_imported_qrz'] = "标记导入的QSO为已上传至 QRZ Logbook"; +$lang['adif_mark_imported_clublog'] = "标记导入的QSO为已上传至 Clublog Logbook"; -$lang['adif_dxcc_from_adif'] = "Use DXCC information from ADIF"; -$lang['adif_dxcc_from_adif_hint'] = "If not selected, Cloudlog will attempt to determine DXCC information automatically."; +$lang['adif_dxcc_from_adif'] = "使用ADIF文件中的DXCC信息"; +$lang['adif_dxcc_from_adif_hint'] = "如果不选择，Cloudlog会尝试自动确定DXCC信息。"; -$lang['adif_always_use_login_call_as_op'] = "Always use login-callsign as operator-name on import"; +$lang['adif_always_use_login_call_as_op'] = "总是在导入时使用登录的呼号作为操作者名称"; -$lang['adif_ignore_station_call'] = "Ignore Stationcallsign on import"; -$lang['adif_ignore_station_call_hint'] = "If selected, Cloudlog will try to import all QSO's of the ADIF, regardless if they match to the chosen station-location."; +$lang['adif_ignore_station_call'] = "导入时忽略台站的呼号"; +$lang['adif_ignore_station_call_hint'] = "如果选择，Cloudlog会尝试导入ADIF文件中的 所有 QSO，无论他们是否与所选台站位置匹配。"; -$lang['adif_upload'] = "Upload"; +$lang['adif_upload'] = "上传"; /* ___________________________________________________________________________________________ @@ -56,18 +56,18 @@ ___________________________________________________________________________________________ */ -$lang['adif_export_take_it_anywhere'] = "Take your logbook file anywhere!"; -$lang['adif_export_take_it_anywhere_hint'] = "Exporting ADIFs allows you to import contacts into third party applications like LoTW, Awards or just for keeping a backup."; +$lang['adif_export_take_it_anywhere'] = "导出你的日志！"; +$lang['adif_export_take_it_anywhere_hint'] = "导出 ADIF 允许您将日志导入到 LoTW 等第三方应用程序或只是为了保留备份。"; -$lang['adif_mark_exported_lotw'] = "Mark exported QSOs as uploaded to LoTW"; -$lang['adif_mark_exported_no_lotw'] = "Export QSOs not uploaded to LoTW"; +$lang['adif_mark_exported_lotw'] = "将导出的 QSO 标记为已上传到 LoTW"; +$lang['adif_mark_exported_no_lotw'] = "导出没有上传到 LoTw 的 QSO"; -$lang['adif_export_qso'] = "Export QSO's"; +$lang['adif_export_qso'] = "导出 QSO"; -$lang['adif_export_sat_only_qso'] = "Export Satellite-Only QSOs"; -$lang['adif_export_sat_only_qso_all'] = "Export All Satellite QSOs"; -$lang['adif_export_sat_only_qso_lotw'] = "Export All Satellite QSOs Confirmed on LoTW"; +$lang['adif_export_sat_only_qso'] = "只导出卫星 QSO"; +$lang['adif_export_sat_only_qso_all'] = "导出所有卫星 QSO"; +$lang['adif_export_sat_only_qso_lotw'] = "导出 LoTW 上确认的所有卫星 QSO"; /* ___________________________________________________________________________________________ @@ -75,12 +75,12 @@ ___________________________________________________________________________________________ */ -$lang['adif_lotw_export_if_selected'] = "If a date range is not selected then all QSOs will be marked!"; -$lang['adif_mark_qso_as_exported_to_lotw'] = "Mark QSOs as exported to LoTW"; +$lang['adif_lotw_export_if_selected'] = "如果未选择日期范围，则所有 QSO 都将被标记！"; +$lang['adif_mark_qso_as_exported_to_lotw'] = "将 QSO 标记为导出到 LoTW"; -$lang['adif_qso_marked'] = "QSOs marked"; -$lang['adif_yay_its_done'] = "Yay, its done!"; -$lang['adif_qso_lotw_marked_confirm'] = "The QSOs are marked as exported to LoTW."; +$lang['adif_qso_marked'] = "QSO 已标记"; +$lang['adif_yay_its_done'] = "耶, 完事儿了！"; +$lang['adif_qso_lotw_marked_confirm'] = "这些 QSO 已经被标记为已导出到 LoTW。"; /* ___________________________________________________________________________________________ @@ -105,15 +105,15 @@ ___________________________________________________________________________________________ */ -$lang['adif_imported'] = "ADIF Imported"; -$lang['adif_yay_its_imported'] = "Yay, its imported!"; -$lang['adif_import_confirm'] = "The ADIF File has been imported."; +$lang['adif_imported'] = "ADIF 已导入"; +$lang['adif_yay_its_imported'] = "耶，导入成功！"; +$lang['adif_import_confirm'] = "ADIF 文件已成功导入"; -$lang['adif_import_dupes_inserted'] = " Dupes were inserted!"; -$lang['adif_import_dupes_skipped'] = " Dupes were skipped."; +$lang['adif_import_dupes_inserted'] = " 重复条目已导入！"; +$lang['adif_import_dupes_skipped'] = " 重复条目已跳过。"; -$lang['adif_import_errors'] = "ADIF Errors"; -$lang['adif_import_errors_hint'] = "You have ADIF errors, the QSOs have still been added but these fields have not been populated."; +$lang['adif_import_errors'] = "ADIF 错误"; +$lang['adif_import_errors_hint'] = "ADIF 错误，QSO 虽然已添加，但这些字段尚未填充。"; /* ___________________________________________________________________________________________ diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index 86034e4f7..4de0b9021 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -3,7 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['admin_user_line1'] = 'Cloudlog至少需要配置一个用户才能运行。'; -$lang['admin_user_line2'] = '用户可以被分配不同的角色，这些角色赋予他们不同的权限，例如向日志簿添加Qso和访问Cloudlog api。'; +$lang['admin_user_line2'] = '用户可以被分配不同的角色，这些角色赋予他们不同的权限，例如向日志簿添加 QSO 和访问Cloudlog API。'; $lang['admin_user_line3'] = '页面右上方显示当前登录的用户。'; $lang['admin_user_list'] = '用户列表'; @@ -15,41 +15,41 @@ $lang['admin_create_user'] = '创建用户'; $lang['admin_delete'] = '删除用户'; -$lang['admin_remove'] = "Remove"; +$lang['admin_remove'] = "删除"; $lang['admin_edit'] = '编辑用户'; -$lang['admin_create'] = 'Create'; -$lang['admin_update'] = 'Update'; -$lang['admin_copy'] = 'Copy'; -$lang['admin_save'] = 'Save'; -$lang['admin_close'] = 'Close'; -$lang['admin_user_accounts'] = 'User Accounts'; -$lang['admin_danger'] = 'DANGER!'; -$lang['admin_experimental'] = "Experimental"; +$lang['admin_create'] = '创建'; +$lang['admin_update'] = '更新'; +$lang['admin_copy'] = '复制'; +$lang['admin_save'] = '保存'; +$lang['admin_close'] = '关闭'; +$lang['admin_user_accounts'] = '用户账户'; +$lang['admin_danger'] = '危险!'; +$lang['admin_experimental'] = "实验性功能"; // Contest Menu -$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; -$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; -$lang['admin_contest_menu_name'] = 'Name'; -$lang['admin_contest_menu_adif'] = 'ADIF Name'; -$lang['admin_contest_menu_active'] = 'Active'; -$lang['admin_contest_menu_n_active'] = 'Not Active'; -$lang['admin_contest_menu_activate'] = 'Activate'; -$lang['admin_contest_menu_deactivate'] = 'Deactivate'; - -$lang['admin_contest_add_contest'] = 'Add a Contest'; -$lang["admin_contest_create"] = "Create"; -$lang['admin_contest_all_active'] = 'Activate All'; -$lang['admin_contest_all_deactive'] = 'Deactivate All'; - -$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; -$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; -$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; -$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; -$lang['admin_contest_edit_update_contest'] = 'Update Contest'; -$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; -$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; -$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; +$lang['admin_contest_menu_line_1'] = '使用 Contest 列表，您可以控制在比赛中记录 QSO 时显示哪些 Contest。'; +$lang['admin_contest_menu_line_2'] = '启用的 Contest 将显示在竞赛名称下拉列表中，而停用的 Contest 将被隐藏且无法选择。'; +$lang['admin_contest_menu_name'] = '名称'; +$lang['admin_contest_menu_adif'] = 'ADIF 名称'; +$lang['admin_contest_menu_active'] = '启用'; +$lang['admin_contest_menu_n_active'] = '停用'; +$lang['admin_contest_menu_activate'] = '启用'; +$lang['admin_contest_menu_deactivate'] = '停用'; + +$lang['admin_contest_add_contest'] = '添加 Contest'; +$lang["admin_contest_create"] = "创建"; +$lang['admin_contest_all_active'] = '启用所有'; +$lang['admin_contest_all_deactive'] = '停用所有'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF 名称'; +$lang['admin_contest_name_of_contest'] = 'Contest 名称'; +$lang['admin_contest_name_of_adif'] = 'Contest 在 ADIF 中的名称'; +$lang['admin_contest_edit_active_hint'] = '如果要列在 Contest 列表中，则设置为启用'; +$lang['admin_contest_edit_update_contest'] = '更新 Contest'; +$lang['admin_contest_deletion_warning'] = '注意！您确定要删除以下 Contest 吗：'; +$lang['admin_contest_active_all_warning'] = '注意！您确定要启用所有竞赛吗？'; +$lang['admin_contest_deactive_all_warning'] = '注意！您确定要停用所有竞赛吗？'; diff --git a/application/language/chinese_simplified/contesting_lang.php b/application/language/chinese_simplified/contesting_lang.php index a65ffa3f4..c33599983 100644 --- a/application/language/chinese_simplified/contesting_lang.php +++ b/application/language/chinese_simplified/contesting_lang.php @@ -4,20 +4,20 @@ $lang['contesting_page_title'] = '竞赛日志'; $lang['contesting_button_reset_contest_session'] = '重置竞赛会话'; -$lang['contesting_operator_callsign'] = 'Operator Callsign'; +$lang['contesting_operator_callsign'] = '操作员呼号'; $lang['contesting_exchange_type'] = '信号交换类型'; $lang['contesting_exchange_type_serial'] = '序列编号'; -$lang['contesting_exchange_type_none'] = 'None'; -$lang['contesting_exchange_type_exchange'] = 'Exchange'; -$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; +$lang['contesting_exchange_type_none'] = '无'; +$lang['contesting_exchange_type_exchange'] = '交换信息'; +$lang['contesting_exchange_type_gridsquare'] = '网格座标'; $lang['contesting_exchange_type_other'] = '其他'; -$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; -$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; -$lang['contesting_exchange_serial_s'] = 'Serial (S)'; -$lang['contesting_exchange_serial_r'] = 'Serial (R)'; -$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; -$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; +$lang['contesting_exchange_type_serial_exchange'] = '序列编号 + 交换信息'; +$lang['contesting_exchange_type_serial_gridsquare'] = '序列编号 + 网格座标'; +$lang['contesting_exchange_serial_s'] = '序列编号 (S)'; +$lang['contesting_exchange_serial_r'] = '序列编号 (R)'; +$lang['contesting_exchange_gridsquare_s'] = '网格座标 (S)'; +$lang['contesting_exchange_gridsquare_r'] = '网格座标 (R)'; $lang['contesting_contest_name'] = '竞赛名称'; @@ -27,6 +27,6 @@ $lang['contesting_title_callsign_suggestions'] = '呼号建议'; $lang['contesting_title_contest_logbook'] = '竞赛日志簿'; -$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; +$lang['contesting_copy_exch_to_dok'] = '将收到的交换信息复制到数据库中的 DOK 字段！'; diff --git a/application/language/chinese_simplified/export_lang.php b/application/language/chinese_simplified/export_lang.php index dd3d81f86..51735e93c 100644 --- a/application/language/chinese_simplified/export_lang.php +++ b/application/language/chinese_simplified/export_lang.php @@ -8,7 +8,7 @@ ___________________________________________________________________________________________ */ -$lang['export_kml_header'] = "KML Export"; +$lang['export_kml_header'] = "KML 导出"; $lang['export_kml_description'] = "Export your logbook to a KML file for use in Google Earth."; $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!"; @@ -19,7 +19,7 @@ ___________________________________________________________________________________________ */ -$lang['export_dxatlas_header'] = "DX Atlas Export"; +$lang['export_dxatlas_header'] = "DX Atlas 导出"; $lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares."; $lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!"; @@ -30,7 +30,7 @@ ___________________________________________________________________________________________ */ -$lang['export_sota_header'] = "SOTA CSV Export"; +$lang['export_sota_header'] = "SOTA CSV 导出"; $lang['export_sota_description'] = "Export your logbook for SOTA uploads."; $lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!"; @@ -40,7 +40,7 @@ ___________________________________________________________________________________________ */ -$lang['export_cabrillo_header'] = "Cabrillo Export"; +$lang['export_cabrillo_header'] = "Cabrillo 导出"; $lang['export_cabrillo_description'] = "Export a contest to a Cabrillo log"; $lang['export_cabrillo_select_station'] = "Select Station Location:"; $lang['export_cabrillo_proceed'] = "Proceed"; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 76a808da3..eb26c0f96 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -7,20 +7,20 @@ $lang['notice_turn_the_radio_on'] = '你今天还没有 QSO，是时候打开你的电台了！'; $lang['general_word_important'] = '重要'; -$lang['general_word_warning'] = 'Warning'; -$lang['general_word_danger'] = 'DANGER'; -$lang['general_word_maintenance'] = 'Maintenance'; +$lang['general_word_warning'] = '注意'; +$lang['general_word_danger'] = '警告'; +$lang['general_word_maintenance'] = '维护'; $lang['general_word_info'] = '消息'; $lang['general_word_choose_file'] = '选择文件'; -$lang['general_word_next'] = 'Next'; -$lang['general_word_previous'] = 'Previous'; -$lang['general_word_cancel'] = "Cancel"; -$lang['general_word_ok'] = "OK"; -$lang['general_word_attention'] = "Attention"; -$lang['general_word_enabled'] = "Enabled"; -$lang['general_word_disabled'] = "Disabled"; -$lang['general_word_export'] = "Export"; -$lang['general_word_import'] = "Import"; +$lang['general_word_next'] = '后一项'; +$lang['general_word_previous'] = '前一项'; +$lang['general_word_cancel'] = "取消"; +$lang['general_word_ok'] = "确认"; +$lang['general_word_attention'] = "注意"; +$lang['general_word_enabled'] = "已启用"; +$lang['general_word_disabled'] = "已禁用"; +$lang['general_word_export'] = "导出"; +$lang['general_word_import'] = "导入"; $lang['general_word_date'] = '日期'; $lang['general_word_time'] = '时间'; @@ -36,21 +36,21 @@ $lang['general_word_satellite_short'] = '卫星'; $lang['general_word_notes'] = '笔记'; $lang['general_word_country'] = 'DXCC 实体'; -$lang['general_word_city'] = 'City'; +$lang['general_word_city'] = '城市'; $lang['general_word_total'] = '总计'; $lang['general_word_year'] = '年'; $lang['general_word_month'] = '月'; -$lang['general_word_colors'] = "Colors"; -$lang['general_word_light'] = "Light/Laser"; +$lang['general_word_colors'] = "颜色"; +$lang['general_word_light'] = "浅色/激光"; $lang['general_word_worked'] = '已通联'; -$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; -$lang['general_word_not_worked'] = "Not worked"; +$lang['general_word_worked_not_confirmed'] = "已通联未确认"; +$lang['general_word_not_worked'] = "未通联"; $lang['general_word_confirmed'] = '已确认'; $lang['general_word_needed'] = '待通联'; -$lang['general_word_all'] = 'All'; +$lang['general_word_all'] = '所有'; $lang['general_word_no'] = '否'; $lang['general_word_yes'] = '是'; $lang['general_word_method'] = '方法'; @@ -71,11 +71,11 @@ $lang['general_word_qslcard_via'] = '通过'; $lang['general_word_eqslcard'] = '电子 QSL 卡片'; $lang['general_word_eqslcards'] = 'eQSL 卡片'; -$lang['general_word_lotw'] = 'Logbook of the World'; +$lang['general_word_lotw'] = 'Logbook of the World（LoTW）'; $lang['general_word_lotw_short'] = 'LoTW'; -$lang['general_word_details'] = 'Details'; -$lang['general_word_qso_data'] = 'QSO Data'; +$lang['general_word_details'] = '详细'; +$lang['general_word_qso_data'] = 'QSO 数据'; $lang['general_edit_qso'] = '编辑 QSO'; $lang['general_mark_qsl_rx_bureau'] = '标记 已收到的QSL (卡片局)'; @@ -83,21 +83,21 @@ $lang['general_mark_qsl_rx_electronic'] = '标记 已收到的QSL (电子)'; $lang['general_mark_qsl_tx_bureau'] = '标记 已发送的QSL (卡片局)'; $lang['general_mark_qsl_tx_direct'] = '标记 已发送的QSL (直邮)'; -$lang['general_mark_qsl_requested'] = 'Mark QSL Card Requested'; -$lang['general_mark_qsl_requested_bureau'] = 'Mark QSL Card Requested (Bureau)'; -$lang['general_mark_qsl_requested_direct'] = 'Mark QSL Card Requested (Direct)'; -$lang['general_mark_qsl_not_required'] = 'Mark QSL Card Not Required'; +$lang['general_mark_qsl_requested'] = '标记 已请求 QSL Card'; +$lang['general_mark_qsl_requested_bureau'] = '标记 已请求 QSL Card (卡片局)'; +$lang['general_mark_qsl_requested_direct'] = '标记 已请求 QSL Card (直邮)'; +$lang['general_mark_qsl_not_required'] = '标记 不需要 QSL Card'; $lang['general_delete_qso'] = '删除 QSO'; -$lang['general_more_qso'] = 'More QSOs'; +$lang['general_more_qso'] = '更多 QSO'; -$lang['general_lookup_qrz'] = 'Lookup on QRZ.com'; -$lang['general_lookup_hamqth'] = 'Lookup on HamQTH'; +$lang['general_lookup_qrz'] = '在 QRZ.com 上查询'; +$lang['general_lookup_hamqth'] = '在 HamQTH 上查询'; $lang['general_total_distance'] = '总计距离'; // PHP Upload Warning -$lang['gen_max_file_upload_size'] = 'Maximum file upload size is '; +$lang['gen_max_file_upload_size'] = '最大上传文件大小是'; // Cloudlog Terms $lang['cloudlog_station_profile'] = '台站地址'; @@ -110,8 +110,7 @@ $lang['gen_hamradio_call'] = '呼号'; $lang['gen_hamradio_callsign'] = '呼号'; $lang['gen_hamradio_mode'] = '模式'; -$lang['gen_hamradio_dx'] = 'Dx'; -$lang['gen_hamradio_mode'] = 'Mode'; +$lang['gen_hamradio_dx'] = 'DX'; $lang['gen_hamradio_rst_sent'] = '发'; $lang['gen_hamradio_rst_rcvd'] = '收'; $lang['gen_hamradio_band'] = '频段'; @@ -127,9 +126,9 @@ $lang['gen_hamradio_exchange_sent_short'] = '信号交换 (发)'; $lang['gen_hamradio_exchange_rcvd_short'] = '信号交换 (收)'; $lang['gen_hamradio_qsl'] = 'QSL'; -$lang['gen_hamradio_qsltype'] = "QSL Type"; +$lang['gen_hamradio_qsltype'] = "QSL 类型"; $lang['gen_hamradio_qslvia'] = 'QSL via'; -$lang['gen_hamradio_qslmsg'] = 'QSL Msg'; +$lang['gen_hamradio_qslmsg'] = 'QSL 信息'; $lang['gen_hamradio_locator'] = '定位器'; $lang['gen_hamradio_transmit_power'] = '发射功率 (W)'; $lang['gen_hamradio_propagation_mode'] = '传播模式'; @@ -139,11 +138,11 @@ $lang['gen_hamradio_logbook'] = '日志簿'; -$lang['gen_hamradio_zones'] = 'Zones'; +$lang['gen_hamradio_zones'] = '分区'; $lang['gen_hamradio_cq_zone'] = 'CQ 分区'; -$lang['gen_hamradio_itu_zone'] = 'ITU Zone'; +$lang['gen_hamradio_itu_zone'] = 'ITU 分区'; $lang['gen_hamradio_dxcc'] = 'DXCC实体'; -$lang['gen_hamradio_deleted_dxcc'] = '删除 DXCC实体'; +$lang['gen_hamradio_deleted_dxcc'] = '删除 DXCC 实体'; $lang['gen_hamradio_continent'] = '大陆'; $lang['gen_hamradio_usa_state'] = '州（美国）'; $lang['gen_hamradio_county_reference'] = '县（美国）'; @@ -158,7 +157,7 @@ $lang['gen_hamradio_wwff'] = 'WWFF'; $lang['gen_hamradio_pota'] = 'POTA'; $lang['gen_hamradio_gridsquare'] = '网格'; -$lang['gen_hamradio_get_gridsquare'] = 'Get Gridsquare'; +$lang['gen_hamradio_get_gridsquare'] = '获取网格座标'; $lang['gen_hamradio_distance'] = '距离'; $lang['gen_hamradio_operator'] = '操作员'; @@ -166,10 +165,10 @@ $lang['gen_hamradio_sig_info'] = 'Sig 属性'; // Find your CQ/ITU Zone -$lang['gen_find_zone_cq_part1'] = "If you don't know your CQ Zone then "; -$lang['gen_find_zone_itu_part1'] = "If you don't know your ITU Zone then "; -$lang['gen_find_zone_part2'] = 'click here'; -$lang['gen_find_zone_part3'] = ' to find it!'; +$lang['gen_find_zone_cq_part1'] = "如果您不知道自己的 CQ 分区"; +$lang['gen_find_zone_itu_part1'] = "如果您不知道自己的 ITU 分区"; +$lang['gen_find_zone_part2'] = '点击此处'; +$lang['gen_find_zone_part3'] = '来查询！'; // Dashboard Words $lang['dashboard_you_have_had'] = '今天你有'; @@ -195,7 +194,7 @@ $lang['southamerica'] = '南美洲'; $lang['gen_band_selection'] = '波段选择'; -$lang['general_word_today'] = 'Today'; +$lang['general_word_today'] = '今天'; $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is'; $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; diff --git a/application/language/chinese_simplified/gridsquares_lang.php b/application/language/chinese_simplified/gridsquares_lang.php index a2d127dd4..e3dad8928 100644 --- a/application/language/chinese_simplified/gridsquares_lang.php +++ b/application/language/chinese_simplified/gridsquares_lang.php @@ -23,7 +23,7 @@ $lang['gridsquares_gridsquares'] = '网格'; $lang['gridsquares_gridsquares_confirmed'] = '已确认的网格'; $lang['gridsquares_gridsquares_not_confirmed'] = '未确认的网格'; -$lang['gridsquares_gridsquares_lotw'] = 'Gridsquares confirmed on LoTW'; -$lang['gridsquares_gridsquares_paper'] = 'Gridsquares confirmed by paper QSL'; +$lang['gridsquares_gridsquares_lotw'] = '在 LoTW 上确认的网格'; +$lang['gridsquares_gridsquares_paper'] = '通过纸质 QSL 确认的网格'; $lang['gridsquares_gridsquares_total_worked'] = '总共工作过的网格'; -$lang['gridsquares_gridsquares_total_activated'] = 'Total gridsquares activated'; +$lang['gridsquares_gridsquares_total_activated'] = '总激活的网格'; diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 24c7b816b..3eddffe8a 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -11,7 +11,7 @@ $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = '添加QSO（从电台获取信息）'; $lang['menu_post_qso'] = '添加QSO（手动输入信息）'; -$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; +$lang['menu_fast_log_entry'] = "简单快速记录Log"; $lang['menu_live_contest_logging'] = '比赛日志（从电台获取信息）'; $lang['menu_post_contest_logging'] = '比赛日志（手动输入信息）'; $lang['menu_bandmap'] = 'Bandmap'; @@ -88,4 +88,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; -$lang['menu_maintenance']='Maintenance'; +$lang['menu_maintenance']='维护'; diff --git a/application/language/chinese_simplified/options_lang.php b/application/language/chinese_simplified/options_lang.php index bce4b0d28..9b17e6098 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -71,27 +71,27 @@ $lang['options_dxcluster_decont_changed_to']='de continent changed to '; $lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; -$lang['options_save'] = 'Save'; +$lang['options_save'] = '保存'; // Bands -$lang['options_bands'] = "Bands"; -$lang['options_bands_text_ln1'] = "Using the band list you can control which bands are shown when creating a new QSO."; -$lang['options_bands_text_ln2'] = "Active bands will be shown in the QSO 'Band' drop-down, while inactive bands will be hidden and cannot be selected."; -$lang['options_bands_create'] = "Create a band"; -$lang['options_bands_edit'] = "Edit Band"; -$lang['options_bands_activate_all'] = "Activate All"; -$lang['options_bands_activateall_warning'] = "Warning! Are you sure you want to activate all bands?"; -$lang['options_bands_deactivate_all'] = "Deactivate All"; -$lang['options_bands_deactivateall_warning'] = "Warning! Are you sure you want to deactivate all bands?"; -$lang['options_bands_ssb_qrg'] = "SSB QRG"; -$lang['options_bands_ssb_qrg_hint'] = "Frequency for SSB QRG in band (must be in Hz)"; -$lang['options_bands_data_qrg'] = "DATA QRG"; -$lang['options_bands_data_qrg_hint'] = "Frequency for DATA QRG in band (must be in Hz)"; -$lang['options_bands_cw_qrg'] = "CW QRG"; -$lang['options_bands_cw_qrg_hint'] = "Frequency for CW QRG in band (must be in Hz)"; +$lang['options_bands'] = "波段"; +$lang['options_bands_text_ln1'] = "使用波段列表，您可以控制创建新 QSO 时显示哪些波段。"; +$lang['options_bands_text_ln2'] = "启用的波段将显示在 QSO“波段”下拉列表中，而停用的频段将被隐藏且无法选择。"; +$lang['options_bands_create'] = "创建波段"; +$lang['options_bands_edit'] = "编辑波段"; +$lang['options_bands_activate_all'] = "启用所有"; +$lang['options_bands_activateall_warning'] = "警告！你要启用所有波段吗？"; +$lang['options_bands_deactivate_all'] = "停用所有"; +$lang['options_bands_deactivateall_warning'] = "警告！你要停用所有波段吗？"; +$lang['options_bands_ssb_qrg'] = "SSB 频率"; +$lang['options_bands_ssb_qrg_hint'] = "波段中 SSB 的频率（以Hz为单位）"; +$lang['options_bands_data_qrg'] = "DATA 频率"; +$lang['options_bands_data_qrg_hint'] = "波段中 DATA 的频率（以Hz为单位）"; +$lang['options_bands_cw_qrg'] = "CW 频率"; +$lang['options_bands_cw_qrg_hint'] = "波段中 CW 的频率（以Hz为单位）"; -$lang['options_bands_name_band'] = "Name of Band (E.g. 20m)"; -$lang['options_bands_name_bandgroup'] = "Name of bandgroup (E.g. hf, vhf, uhf, shf)"; -$lang['options_bands_delete_warning'] = "Warning! Are you sure you want to delete the following band: "; +$lang['options_bands_name_band'] = "波段名称（例如：20m）"; +$lang['options_bands_name_bandgroup'] = "频段名称（例如：HF、VHF、UHF、SHF）"; +$lang['options_bands_delete_warning'] = "警告！ 您确定要删除以下波段："; diff --git a/application/language/chinese_simplified/qslcard_lang.php b/application/language/chinese_simplified/qslcard_lang.php index 8b4d2a03c..02be724bb 100644 --- a/application/language/chinese_simplified/qslcard_lang.php +++ b/application/language/chinese_simplified/qslcard_lang.php @@ -12,7 +12,7 @@ $lang['qslcard_sent_direct'] = 'QSL 卡片已直邮发出'; $lang['qslcard_sent_electronic'] = 'QSL 卡片已经发送电子版'; $lang['qslcard_sent_manager'] = 'QSL 卡片已经由卡片管理员发出'; -$lang['qslcard_rcvd'] = 'QSL Card has been received'; +$lang['qslcard_rcvd'] = 'QSL Card 已被接收'; $lang['qslcard_rcvd_bureau'] = 'QSL 卡片已由卡片局接收'; $lang['qslcard_rcvd_direct'] = 'QSL 卡片已直邮接收'; $lang['qslcard_rcvd_electronic'] = 'QSL 卡片已经接收电子版'; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index a850aab3c..a22c5aa9b 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -28,14 +28,14 @@ $lang['qso_btn_reset_qso'] = '重置'; $lang['qso_btn_save_qso'] = '保存 QSO'; $lang['qso_btn_edit_qso'] = '编辑 QSO'; -$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; +$lang['qso_delete_warning'] = "警告！您确定要删除 QSO 与 "; // QSO Details $lang['qso_details'] = 'QSO 详情'; -$lang['fav_add'] = 'Add Band/Mode to Favs'; -$lang['qso_operator_callsign'] = 'Operator Callsign'; +$lang['fav_add'] = '添加 模式/频段 到收藏'; +$lang['qso_operator_callsign'] = '操作员呼号'; // Simple FLE (FastLogEntry) From b3589cef835c916caebe6fdfd99c1c3707aad6db Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 8 Nov 2023 09:55:26 +0000 Subject: [PATCH 084/121] Keep Sorting when changing Bands --- assets/js/sections/bandmap_list.js | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js index a69a250ba..1e7e8fba4 100644 --- a/assets/js/sections/bandmap_list.js +++ b/assets/js/sections/bandmap_list.js @@ -113,7 +113,6 @@ $(function() { }); $("#band").on("change",function() { - table.order([1, 'asc']); table.clear(); fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage); }); From 4c17d8477fae199c02ef5267890a4d786abd371c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 8 Nov 2023 16:58:13 +0100 Subject: [PATCH 085/121] support for USB and LSB --- assets/js/sections/simplefle.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 711f7647b..f0f35301e 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -139,7 +139,7 @@ function handleInput() { item.match(/^[0-2][0-9][0-5][0-9]$/) ) { qsotime = item; - } else if (item.match(/^CW$|^SSB$|^FM$|^AM$|^PSK$|^FT8$/i)) { + } else if (item.match(/^CW$|^SSB$|^LSB$|^USB$|^FM$|^AM$|^PSK$|^FT8$/i)) { mode = item.toUpperCase(); } else if ( item.match(/^[0-9]{1,4}(?:m|cm|mm)$/) || @@ -424,7 +424,7 @@ function getFreqFromBand(band, mode) { } function getSettingsMode(mode) { - if (mode === "AM" || mode === "FM" || mode === "SSB") { + if (mode === "AM" || mode === "FM" || mode === "SSB" || mode === "LSB" || mode === "USB") { return "SSB"; } From 2f46dc578bb2d85350b4286a7746218269a7ccfd Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 8 Nov 2023 17:49:57 +0100 Subject: [PATCH 086/121] Warning Message Time --- application/language/bulgarian/qso_lang.php | 1 + application/language/chinese_simplified/qso_lang.php | 1 + application/language/czech/qso_lang.php | 1 + application/language/dutch/qso_lang.php | 1 + application/language/english/qso_lang.php | 1 + application/language/finnish/qso_lang.php | 1 + application/language/french/qso_lang.php | 1 + application/language/german/qso_lang.php | 1 + application/language/greek/qso_lang.php | 1 + application/language/italian/qso_lang.php | 1 + application/language/polish/qso_lang.php | 1 + application/language/russian/qso_lang.php | 1 + application/language/spanish/qso_lang.php | 1 + application/language/swedish/qso_lang.php | 1 + application/language/turkish/qso_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 80f151e42..fd9c51987 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index c1d2f18fc..4bff4e2e5 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index edac1748f..37a69017f 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index d66fea750..a01117d84 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 8b1e38ece..337b7f205 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 82bd9aa01..7a657f9a2 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index fe660b5ea..6a49e46f6 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 7fb52be66..df257a0dc 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Feld ist leer"; $lang['qso_simplefle_warning_reset'] = "Warnung! Willst du wirklich alles zurücksetzen?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO das Band und/oder der Mode fehlt!"; +$lang['qso_simplefle_warning_missing_time'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO die Zeit fehlt!"; $lang['qso_simplefle_warning_example_data'] = "Achtung! Das Daten Feld enthält Beispiel Daten. Lösche zuerst die QSO Daten!"; $lang['qso_simplefle_confirm_save_to_log'] = "Bist du dir sicher, dass du diese QSO loggen und die Eingabe zurücksetzen willst?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO geloggt!"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index ac2c98712..f038d30b4 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 76c754533..3ae7c3bb6 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index b988de265..11b6da4f8 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 881937b1b..f42e40751 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 6ba52aa90..d40874611 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 8eddd4be2..80b0dd0b1 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index e3e8b6d17..3e9516d72 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; From 8633aa1f4c7e4fc19ae8a1adb95ac8c295dee919 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 8 Nov 2023 17:51:13 +0100 Subject: [PATCH 087/121] added var lang for warning time --- application/views/simplefle/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 8975a3f4e..7fc368e6c 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -26,6 +26,7 @@ var lang_qso_simplefle_error_operator = ""; var lang_qso_simplefle_warning_reset = ""; var lang_qso_simplefle_warning_missing_band_mode = ""; + var lang_qso_simplefle_warning_missing_time = ""; var lang_qso_simplefle_warning_example_data = ""; var lang_qso_simplefle_confirm_save_to_log = ""; var lang_qso_simplefle_success_save_to_log_header = ""; From 8a3ec11e546f13e1bd1899724bc533a281edb5cd Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 8 Nov 2023 17:51:26 +0100 Subject: [PATCH 088/121] new timeWarning function --- assets/js/sections/simplefle.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index f0f35301e..c132b30c8 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -484,6 +484,17 @@ function isBandModeEntered() { return isBandModeOK; } +function isTimeEntered() { + let isTimeOK = true; + qsoList.forEach((item) => { + if (item[1] === "") { + isTimeOK = false; + } + }); + + return isTimeOK; +} + function isExampleDataEntered() { let isExampleData = false; if (textarea.value.startsWith("*example-data*")) { @@ -623,6 +634,17 @@ $(".js-save-to-log").click(function () { }); return false; } + if (false === isTimeEntered()) { + BootstrapDialog.alert({ + title: lang_general_word_warning, + message: lang_qso_simplefle_warning_missing_time, + type: BootstrapDialog.TYPE_DANGER, + btnCancelLabel: lang_general_word_cancel, + btnOKLabel: lang_general_word_ok, + btnOKClass: "btn-warning", + }); + return false; + } if (true === isExampleDataEntered()) { BootstrapDialog.alert({ title: lang_general_word_warning, @@ -660,7 +682,7 @@ $(".js-save-to-log").click(function () { var rst_rcvd = item[7]; var rst_sent = item[6]; var start_date = item[0]; - var start_time = item[1][0] +item[1][1] + ":" + item[1][2] + item[1][3]; + var start_time = item[1][0] + item[1][1] + ":" + item[1][2] + item[1][3]; var band = item[4]; var mode = item[5]; var freq_display = item[3] * 1000000; From 4d997c1e70a43d7e3c0c9be619e8db6b7f7d81e9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 Nov 2023 00:54:26 +0100 Subject: [PATCH 089/121] removed console.log message --- assets/js/sections/simplefle.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index c132b30c8..7d112b6e9 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -129,8 +129,7 @@ function handleInput() { } if (item.trim().match(/^day (\+)+$/)) { var plusCount = item.match(/\+/g).length; - var originalDate = new Date(extraQsoDate);; - console.log(plusCount) + var originalDate = new Date(extraQsoDate); originalDate.setDate(originalDate.getDate() + plusCount); extraQsoDate = originalDate.toISOString().split("T")[0]; } else if (item.match(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/)) { From ed023f6afe009106ed1e3738a4f843df2b8d6f95 Mon Sep 17 00:00:00 2001 From: littlebear0729 Date: Thu, 9 Nov 2023 12:50:17 +0800 Subject: [PATCH 090/121] Update Chinese translation --- .../chinese_simplified/account_lang.php | 16 +-- .../language/chinese_simplified/adif_lang.php | 50 ++++---- .../chinese_simplified/export_lang.php | 68 +++++------ .../chinese_simplified/filter_lang.php | 112 +++++++++--------- .../chinese_simplified/general_words_lang.php | 5 +- .../chinese_simplified/gridsquares_lang.php | 14 +-- .../language/chinese_simplified/lotw_lang.php | 4 +- .../language/chinese_simplified/menu_lang.php | 4 +- .../language/chinese_simplified/qso_lang.php | 6 +- .../chinese_simplified/statistics_lang.php | 22 ++-- 10 files changed, 151 insertions(+), 150 deletions(-) diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index ccaaf6598..47a523583 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -37,10 +37,10 @@ $lang['account_date_format'] = '日期格式'; $lang['account_log_end_time'] = '单独记录QSO结束时间'; $lang['account_log_end_time_hint'] = '如果想分别记录QSO的开始和结束时间，选择\'是\'，若选择\'否\'则QSO开始与结束时间相同。'; -$lang['account_quicklog_feature'] = "Quicklog Field"; -$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; -$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; -$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_feature'] = "快速日志功能"; +$lang['account_quicklog_feature_hint'] = "快速日志功能可以使用标题栏中的搜索字段来记录呼号。"; +$lang['account_quicklog_enter'] = "快速日志 - 回车键行为"; +$lang['account_quicklog_enter_hint'] = "在快速日志字段中按 回车键 后应执行什么操作？"; $lang['account_quicklog_enter_log'] = "记录呼号"; $lang['account_quicklog_enter_search'] = "查询呼号"; $lang['account_measurement_preferences'] = '距离单位偏好'; @@ -55,9 +55,9 @@ $lang['account_gridsquare_and_location_autocomplete'] = '自动填写梅登海德网格和位置'; $lang['account_location_auto_lookup'] = '自动查找位置'; $lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = '如果开启本选项，将根据位置名称获取梅登海德网格。'; -$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = '根据SOTA编号自动查找梅登海德网格和峰名。'; -$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = '根据WWFF编号自动查找梅登海德网格和名称。'; -$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = '根据POTA编号自动查找梅登海德网格和名称。'; +$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = '根据 SOTA 编号自动查找梅登海德网格和峰名。'; +$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = '根据 WWFF 编号自动查找梅登海德网格和名称。'; +$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = '根据 POTA 编号自动查找梅登海德网格和名称。'; $lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = '如果开启此项设置，将从API获取名称和梅登海德网格，并填写位置和定位器。'; $lang['account_previous_qsl_type'] = '上一个QSL类型'; @@ -113,5 +113,5 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Cloudlog 中对 Winkeyer 的支持是实验性的，请在开启前先阅读 https://github.com/magicbug/Cloudlog/wiki/Winkey。"; -$lang['account_winkeyer_enabled'] = "启用Winkeyer功能"; +$lang['account_winkeyer_enabled'] = "启用 Winkeyer 功能"; diff --git a/application/language/chinese_simplified/adif_lang.php b/application/language/chinese_simplified/adif_lang.php index 9b04979d9..6c78545f9 100644 --- a/application/language/chinese_simplified/adif_lang.php +++ b/application/language/chinese_simplified/adif_lang.php @@ -87,17 +87,17 @@ DARC DCL ___________________________________________________________________________________________ */ -$lang['adif_dcl_text_pre'] = "Go to"; -$lang['adif_dcl_text_post'] = "and export your logbook with confirmed DOKs. To speed up the process you can select only DL QSOs to download (i.e. put \"DL\" into Prefix List). The downloaded ADIF file can be uploaded here in order to update QSOs with DOK info."; +$lang['adif_dcl_text_pre'] = "前往"; +$lang['adif_dcl_text_post'] = "并导出包含已确认 DOK 的日志。为了加快该过程，您可以仅选择 DL QSO 进行下载（即将“DL”放入前缀列表中）。可以在此处上传下载的 ADIF 文件，以便使用 DOK 信息更新 QSO。"; -$lang['only_confirmed_qsos'] = "Only import DOK data from QSOs confirmed on DCL."; -$lang['only_confirmed_qsos_hint'] = "Uncheck if you also want to update DOK with data from unconfirmed QSOs in DCL."; +$lang['only_confirmed_qsos'] = "仅导入在 DCL 上确认的 QSO 的 DOK 数据。"; +$lang['only_confirmed_qsos_hint'] = "如果您还想使用 DCL 中未经确认的 QSO 的数据更新 DOK，请取消选中。"; -$lang['overwrite_by_dcl'] = "Overwrite exisiting DOK in log by DCL (if different)"; -$lang['overwrite_by_dcl_hint'] = "If checked Cloudlog will forcibly overwrite existing DOK with DOK from DCL log."; +$lang['overwrite_by_dcl'] = "用 DCL 覆盖日志中现有的 DOC（如果不同）"; +$lang['overwrite_by_dcl_hint'] = "如果选中，Cloudlog 将使用 DCL 日志中的 DOK 强制覆盖现有的 DOK 信息。"; -$lang['ignore_ambiguous'] = "Ignore QSOs that cannot be matched"; -$lang['ignore_ambiguous_hint'] = "If unchecked information about QSO which could not be found in Cloudlog will be displayed."; +$lang['ignore_ambiguous'] = "忽略无法匹配的 QSO"; +$lang['ignore_ambiguous_hint'] = "如果不勾选，会显示 Cloudlog 中找不到的 QSO 信息。"; /* ___________________________________________________________________________________________ @@ -113,7 +113,7 @@ $lang['adif_import_dupes_skipped'] = " 重复条目已跳过。"; $lang['adif_import_errors'] = "ADIF 错误"; -$lang['adif_import_errors_hint'] = "ADIF 错误，QSO 虽然已添加，但这些字段尚未填充。"; +$lang['adif_import_errors_hint'] = "ADIF 错误，QSO 虽然已添加，但以下字段尚未填充。"; /* ___________________________________________________________________________________________ @@ -121,19 +121,19 @@ ___________________________________________________________________________________________ */ -$lang['dcl_results'] = "Results of DCL DOK Update"; -$lang['dcl_info_updated'] = "DCL information for DOKs has been updated."; -$lang['dcl_qsos_updated'] = "QSOs updated"; -$lang['dcl_qsos_ignored'] = "QSOs ignored"; -$lang['dcl_qsos_unmatched'] = "QSOs unmatched"; -$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated."; -$lang['dcl_dok_errors'] = "DOK Errors"; -$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL"; -$lang['dcl_qsl_status'] = "DCL QSL Status"; -$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest"; -$lang['dcl_qsl_status_mno'] = "confirmed by award manager"; -$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data"; -$lang['dcl_qsl_status_w'] = "confirmation pending"; -$lang['dcl_qsl_status_x'] = "unconfirmed"; -$lang['dcl_qsl_status_unknown'] = "unknown"; -$lang['dcl_no_match'] = "QSO could not be matched"; +$lang['dcl_results'] = "DCL DOK 更新结果"; +$lang['dcl_info_updated'] = "DOK 的 DCL 信息已更新。"; +$lang['dcl_qsos_updated'] = "已更新的QSO"; +$lang['dcl_qsos_ignored'] = "已忽略的QSO"; +$lang['dcl_qsos_unmatched'] = "不匹配的QSO"; +$lang['dcl_no_qsos_updated'] = "未找到可以更新的 QSO。"; +$lang['dcl_dok_errors'] = "DOK 错误"; +$lang['dcl_dok_errors_details'] = "与 DCL 相比，您的日志中 DOK 的数据不同"; +$lang['dcl_qsl_status'] = "DCL QSL 状态"; +$lang['dcl_qsl_status_c'] = "已经通过 LoTW/Clublog/eQSL/Contest 确认"; +$lang['dcl_qsl_status_mno'] = "已经通过 award manager 确认"; +$lang['dcl_qsl_status_i'] = "已经通过 DCL 数据交叉检查确认"; +$lang['dcl_qsl_status_w'] = "等待确认"; +$lang['dcl_qsl_status_x'] = "未确认"; +$lang['dcl_qsl_status_unknown'] = "未知"; +$lang['dcl_no_match'] = "QSO 无法匹配"; diff --git a/application/language/chinese_simplified/export_lang.php b/application/language/chinese_simplified/export_lang.php index 51735e93c..66ba25210 100644 --- a/application/language/chinese_simplified/export_lang.php +++ b/application/language/chinese_simplified/export_lang.php @@ -9,8 +9,8 @@ */ $lang['export_kml_header'] = "KML 导出"; -$lang['export_kml_description'] = "Export your logbook to a KML file for use in Google Earth."; -$lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!"; +$lang['export_kml_description'] = "将日志导出为 KML 文件以在 Google 地球中使用。"; +$lang['export_kml_grisquare_warning'] = "只有定义了 网格座标 的 QSO 才会被导出！"; /* @@ -20,8 +20,8 @@ */ $lang['export_dxatlas_header'] = "DX Atlas 导出"; -$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares."; -$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!"; +$lang['export_dxatlas_description'] = "导出您的日志以在 DX Atlas 中使用以显示已工作/已确认的网格座标。"; +$lang['export_dxatlas_gridsquare_warning'] = "只有定义了 网格座标 的 QSO 才会被导出！"; /* @@ -31,8 +31,8 @@ */ $lang['export_sota_header'] = "SOTA CSV 导出"; -$lang['export_sota_description'] = "Export your logbook for SOTA uploads."; -$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!"; +$lang['export_sota_description'] = "导出您的日志以进行 SOTA 上传。"; +$lang['export_sota_info_warning'] = "只有具有 SOTA 信息的 QSO 才会被导出！"; /* ___________________________________________________________________________________________ @@ -41,35 +41,35 @@ */ $lang['export_cabrillo_header'] = "Cabrillo 导出"; -$lang['export_cabrillo_description'] = "Export a contest to a Cabrillo log"; -$lang['export_cabrillo_select_station'] = "Select Station Location:"; -$lang['export_cabrillo_proceed'] = "Proceed"; -$lang['export_cabrillo_select_year'] = "Select Year"; -$lang['export_cabrillo_select_contest'] = "Select Contest"; -$lang['export_cabrillo_select_date_range'] = "Select Date Range"; -$lang['export_cabrillo_club'] = "Club"; -$lang['export_cabrillo_cat_operator'] = "Category Operator"; -$lang['export_cabrillo_cat_operator_single_op'] = "Single Operator"; -$lang['export_cabrillo_cat_operator_multi_op'] = "Multi Operator"; -$lang['export_cabrillo_cat_operator_checklog'] = "Checklog"; -$lang['export_cabrillo_cat_assisted'] = "Category Assisted"; -$lang['export_cabrillo_cat_assisted_not_ass'] = "Not Assisted"; -$lang['export_cabrillo_cat_assisted_ass'] = "Assisted"; -$lang['export_cabrillo_cat_band'] = "Category Band"; +$lang['export_cabrillo_description'] = "将比赛导出到 Cabrillo 日志"; +$lang['export_cabrillo_select_station'] = "选择台站位置"; +$lang['export_cabrillo_proceed'] = "继续"; +$lang['export_cabrillo_select_year'] = "选择年份"; +$lang['export_cabrillo_select_contest'] = "选择比赛"; +$lang['export_cabrillo_select_date_range'] = "选择日期区间"; +$lang['export_cabrillo_club'] = "俱乐部"; +$lang['export_cabrillo_cat_operator'] = "操作员类型（Operator）"; +$lang['export_cabrillo_cat_operator_single_op'] = "单操作员（Single Operator）"; +$lang['export_cabrillo_cat_operator_multi_op'] = "多操作员（Multi Operator）"; +$lang['export_cabrillo_cat_operator_checklog'] = "检查日志（Checklog）"; +$lang['export_cabrillo_cat_assisted'] = "辅助类型（Assisted）"; +$lang['export_cabrillo_cat_assisted_not_ass'] = "无辅助（Not Assisted）"; +$lang['export_cabrillo_cat_assisted_ass'] = "有辅助（Assisted）"; +$lang['export_cabrillo_cat_band'] = "波段类型（Band）"; $lang['export_cabrillo_cat_band_arrl_vhf'] = "VHF-3-BAND and VHF-FM-ONLY (ARRL VHF Contests only)"; -$lang['export_cabrillo_cat_mode'] = "Category Mode"; -$lang['export_cabrillo_cat_power'] = "Category Power"; -$lang['export_cabrillo_cat_station'] = "Category Station"; -$lang['export_cabrillo_cat_transmitter'] = "Category Transmitter"; -$lang['export_cabrillo_cat_overlay'] = "Category Overlay"; -$lang['export_cabrillo_operators'] = "Operators"; +$lang['export_cabrillo_cat_mode'] = "模式类型（Mode）"; +$lang['export_cabrillo_cat_power'] = "功率类型（Power）"; +$lang['export_cabrillo_cat_station'] = "台站类型（Station）"; +$lang['export_cabrillo_cat_transmitter'] = "发射机类型（Transmitter）"; +$lang['export_cabrillo_cat_overlay'] = "Overlay类型"; +$lang['export_cabrillo_operators'] = "操作员"; $lang['export_cabrillo_soapbox'] = "Soapbox"; -$lang['export_cabrillo_address'] = "Address"; -$lang['export_cabrillo_address_city'] = "Address City"; -$lang['export_cabrillo_address_state_province'] = "Address State/Province"; -$lang['export_cabrillo_address_postalcode'] = "Address Postalcode"; -$lang['export_cabrillo_address_country'] = "Address Country"; -$lang['export_cabrillo_no_contests_in_log'] = "No contests were found in your log."; -$lang['export_cabrillo_no_contests_for_stationlocation'] = "No contests were found for this station location!"; +$lang['export_cabrillo_address'] = "地址"; +$lang['export_cabrillo_address_city'] = "城市"; +$lang['export_cabrillo_address_state_province'] = "州/省"; +$lang['export_cabrillo_address_postalcode'] = "邮政编码"; +$lang['export_cabrillo_address_country'] = "国家"; +$lang['export_cabrillo_no_contests_in_log'] = "在您的日志中未发现任何竞赛。"; +$lang['export_cabrillo_no_contests_for_stationlocation'] = "没有找到该台站位置的竞赛！"; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index b34f9a4f5..e462ed737 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -9,16 +9,16 @@ ___________________________________________________________________________________________ */ -$lang['filter_quickfilters'] = 'Quickfilters'; -$lang['filter_qsl_filters'] = 'QSL Filters'; -$lang['filter_filters'] = 'Filters'; -$lang['filter_actions'] = 'Actions'; -$lang['filter_results'] = '# Results'; -$lang['filter_search'] = 'Search'; -$lang['filter_dupes'] = "Dupes"; -$lang['filter_map'] = 'Map'; -$lang['filter_options'] = 'Options'; -$lang['filter_reset'] = 'Reset'; +$lang['filter_quickfilters'] = '快速过滤'; +$lang['filter_qsl_filters'] = 'QSL 过滤'; +$lang['filter_filters'] = '过滤器'; +$lang['filter_actions'] = '操作'; +$lang['filter_results'] = '每页结果数'; +$lang['filter_search'] = '搜索'; +$lang['filter_dupes'] = "重复QSO"; +$lang['filter_map'] = '地图'; +$lang['filter_options'] = '显示列'; +$lang['filter_reset'] = '重置筛选条件'; /* ___________________________________________________________________________________________ @@ -26,18 +26,18 @@ ___________________________________________________________________________________________ */ -$lang['filter_quicksearch_w_sel'] = 'Quicksearch with selected: '; -$lang['filter_search_callsign'] = 'Search Callsign'; -$lang['filter_search_dxcc'] = 'Search DXCC'; -$lang['filter_search_state'] = 'Search State'; -$lang['filter_search_gridsquare'] = 'Search Gridsquare'; -$lang['filter_search_cq_zone'] = 'Search CQ Zone'; -$lang['filter_search_mode'] = 'Search Mode'; -$lang['filter_search_band'] = 'Search Band'; -$lang['filter_search_iota'] = 'Search IOTA'; -$lang['filter_search_sota'] = 'Search SOTA'; -$lang['filter_search_wwff'] = 'Search WWFF'; -$lang['filter_search_pota'] = 'Search POTA'; +$lang['filter_quicksearch_w_sel'] = '用选中行的条件进行快速搜索：'; +$lang['filter_search_callsign'] = '搜索 呼号'; +$lang['filter_search_dxcc'] = '搜索 DXCC'; +$lang['filter_search_state'] = '搜索 州/省'; +$lang['filter_search_gridsquare'] = '搜索 网格'; +$lang['filter_search_cq_zone'] = '搜索 CQ 分区'; +$lang['filter_search_mode'] = '搜索 模式'; +$lang['filter_search_band'] = '搜索 频段'; +$lang['filter_search_iota'] = '搜索 IOTA'; +$lang['filter_search_sota'] = '搜索 SOTA'; +$lang['filter_search_wwff'] = '搜索 WWFF'; +$lang['filter_search_pota'] = '搜索 POTA'; /* ___________________________________________________________________________________________ @@ -45,16 +45,16 @@ ___________________________________________________________________________________________ */ -$lang['filter_qsl_sent'] = 'QSL sent'; -$lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; -$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; -$lang['filter_lotw_sent'] = 'LoTW sent'; -$lang['filter_lotw_recv'] = 'LoTW received'; -$lang['filter_eqsl_sent'] = 'eQSL sent'; -$lang['filter_eqsl_recv'] = 'eQSL received'; -$lang['filter_qsl_via'] = 'QSL via'; -$lang['filter_qsl_images'] = 'QSL Images'; +$lang['filter_qsl_sent'] = 'QSL 发送'; +$lang['filter_qsl_recv'] = 'QSL 接收'; +$lang['filter_qsl_sent_method'] = 'QSL 发送方式'; +$lang['filter_qsl_recv_method'] = 'QSL 接收方式'; +$lang['filter_lotw_sent'] = 'LoTW 发送'; +$lang['filter_lotw_recv'] = 'LoTW 接收'; +$lang['filter_eqsl_sent'] = 'eQSL 发送'; +$lang['filter_eqsl_recv'] = 'eQSL 接收'; +$lang['filter_qsl_via'] = 'QSL 通过'; +$lang['filter_qsl_images'] = 'QSL 图片'; // $lang['general_word_all'] --> application/language/english/general_words_lang.php // $lang['general_word_yes'] --> application/language/english/general_words_lang.php @@ -62,7 +62,7 @@ // $lang['general_word_requested'] --> application/language/english/general_words_lang.php // $lang['general_word_queued'] --> application/language/english/general_words_lang.php // $lang['general_word_invalid_ignore'] --> application/language/english/general_words_lang.php -$lang['filter_qsl_verified'] = 'Verified'; +$lang['filter_qsl_verified'] = '已验证'; // $lang['general_word_qslcard_bureau'] --> application/language/english/general_words_lang.php // $lang['general_word_qslcard_direct'] --> application/language/english/general_words_lang.php @@ -75,18 +75,18 @@ ___________________________________________________________________________________________ */ -$lang['filter_general_from'] = 'From'; -$lang['filter_general_to'] = 'to'; +$lang['filter_general_from'] = '开始日期'; +$lang['filter_general_to'] = '截止日期'; // $lang['gen_hamradio_de'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_dx'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_dxcc'] --> application/language/english/general_words_lang.php -$lang['filter_general_none'] = '- NONE - (e.g. /MM, /AM)'; +$lang['filter_general_none'] = '- 无 - (例如 /MM, /AM)'; // $lang['gen_hamradio_state'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_gridsquare'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_mode'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_band'] --> application/language/english/general_words_lang.php -$lang['filter_general_propagation'] = 'Propagation'; +$lang['filter_general_propagation'] = '传播方式'; // $lang['gen_hamradio_cq_zone'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_iota'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_sota'] --> application/language/english/general_words_lang.php @@ -99,29 +99,29 @@ ___________________________________________________________________________________________ */ -$lang['filter_actions_w_selected'] = 'With selected: '; +$lang['filter_actions_w_selected'] = '用选中行进行：'; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; -$lang['filter_actions_not_sent'] = 'Not Sent'; -$lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; -$lang['filter_actions_create_adif'] = 'Create ADIF'; -$lang['filter_actions_print_label'] = 'Print Label'; -$lang['filter_actions_start_print_title'] = 'Print Labels'; -$lang['filter_actions_print_include_via'] = "Include Via"; -$lang['filter_actions_print_include_grid'] = 'Include Grid?'; -$lang['filter_actions_start_print'] = 'Start printing at?'; -$lang['filter_actions_print'] = 'Print'; -$lang['filter_actions_qsl_slideshow'] = 'QSL Slideshow'; -$lang['filter_actions_delete'] = 'Delete'; -$lang['filter_actions_delete_warning'] = "Warning! Are you sure you want to delete the marked QSO(s)?"; +$lang['filter_actions_sent_bureau'] = '已发送 (卡片局)'; +$lang['filter_actions_sent_direct'] = '已发送 (直邮)'; +$lang['filter_actions_sent_electronic'] = '已发送 (电子)'; +$lang['filter_actions_not_sent'] = '未发送'; +$lang['filter_actions_qsl_n_required'] = '未获取 QSL'; +$lang['filter_actions_recv_bureau'] = '已接收 (卡片局)'; +$lang['filter_actions_recv_direct'] = '已接收 (直邮)'; +$lang['filter_actions_recv_electronic'] = '已接收 (电子)'; +$lang['filter_actions_create_adif'] = '创建 ADIF'; +$lang['filter_actions_print_label'] = '打印标签'; +$lang['filter_actions_start_print_title'] = '打印标签'; +$lang['filter_actions_print_include_via'] = "包含通过"; +$lang['filter_actions_print_include_grid'] = '包含网格？'; +$lang['filter_actions_start_print'] = '开始打印编号'; +$lang['filter_actions_print'] = '打印'; +$lang['filter_actions_qsl_slideshow'] = 'QSL 展示窗'; +$lang['filter_actions_delete'] = '删除'; +$lang['filter_actions_delete_warning'] = "警告！确定要删除选中的QSO吗？"; /* diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index c68504a34..45bc556a4 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -117,11 +117,12 @@ $lang['gen_hamradio_prefix'] = "Prefix"; $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_mode'] = '模式'; -$lang['gen_hamradio_dx'] = 'DX'; +$lang['gen_hamradio_de'] = '本台呼号(De)'; +$lang['gen_hamradio_dx'] = '对方呼号(Dx)'; $lang['gen_hamradio_rst_sent'] = '发'; $lang['gen_hamradio_rst_rcvd'] = '收'; $lang['gen_hamradio_band'] = '频段'; -$lang['gen_hamradio_bandgroup'] = "Bandgroup"; +$lang['gen_hamradio_bandgroup'] = "波段"; $lang['gen_hamradio_band_rx'] = '频段 (RX)'; $lang['gen_hamradio_frequency'] = '频率'; $lang['gen_hamradio_frequency_rx'] = '频率 (RX)'; diff --git a/application/language/chinese_simplified/gridsquares_lang.php b/application/language/chinese_simplified/gridsquares_lang.php index 710b1460a..3e6402ae1 100644 --- a/application/language/chinese_simplified/gridsquares_lang.php +++ b/application/language/chinese_simplified/gridsquares_lang.php @@ -3,11 +3,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = '网格地图'; -$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; -$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; +$lang['gridsquares_activated_gridsquare_map'] = "激活的网格"; +$lang['gridsquares_gridsquare_activators'] = "网格激活者"; $lang['gridsquares_confirmed_is_green'] = '已确认的网格是绿色'; -$lang['gridsquares_worked_but_not_confirmed_is_red'] = '已工作但未确认的网格是红色'; +$lang['gridsquares_worked_but_not_confirmed_is_red'] = '已通联但未确认的网格是红色'; $lang['gridsquares_activated_but_not_confirmed_is_red'] = '已激活但未确认的网格是红色'; $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'] = '此地图不包括通过卫星，互联网或中继达成的QSO'; @@ -15,16 +15,16 @@ $lang['gridsquares_grid_squares'] = '网格'; $lang['gridsquares_total_count'] = '总数'; -$lang['gridsquares_minimum_count'] = "Minimum Count"; -$lang['gridsquares_show_qsos'] = "Show QSO's"; -$lang['gridsquares_show_map'] = "Show Map"; +$lang['gridsquares_minimum_count'] = "最低数量"; +$lang['gridsquares_show_qsos'] = "显示 QSO's"; +$lang['gridsquares_show_map'] = "显示地图"; $lang['gridsquares_band'] = '频率'; $lang['gridsquares_mode'] = '模式'; $lang['gridsquares_sat'] = '卫星'; $lang['gridsquares_confirmation'] = '确认'; $lang['gridsquares_button_plot'] = '绘制'; -$lang['gridsquares_button_clear_markers'] = "Clear Markers"; +$lang['gridsquares_button_clear_markers'] = "清除标记"; $lang['gridsquares_gridsquares'] = '网格'; $lang['gridsquares_gridsquares_confirmed'] = '已确认的网格'; diff --git a/application/language/chinese_simplified/lotw_lang.php b/application/language/chinese_simplified/lotw_lang.php index d8d6b9d35..7d7882592 100644 --- a/application/language/chinese_simplified/lotw_lang.php +++ b/application/language/chinese_simplified/lotw_lang.php @@ -58,5 +58,5 @@ $lang['lotw_cert_expired'] = '至少有一个LoTW证书已经过期!'; // Lotw User -$lang['lotw_user'] = '这个电台使用 LOTW。最后一次上传是'; -$lang['lotw_last_upload'] = 'Last upload'; +$lang['lotw_user'] = '这个电台使用 LOTW。'; +$lang['lotw_last_upload'] = '最后一次上传是'; diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 76eaa12a5..548c0fc22 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -59,10 +59,10 @@ $lang['menu_debug_information'] = '调试信息'; $lang['menu_search_text'] = '搜索呼号'; -$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; +$lang['menu_search_text_quicklog'] = "添加/搜索 呼号"; $lang['menu_search_button'] = '搜索'; -$lang['menu_search_button_qicksearch_log'] = "Log"; +$lang['menu_search_button_qicksearch_log'] = "日志"; $lang['menu_login_button'] = '登录'; $lang['menu_account'] = '账户'; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index c1d2f18fc..f2074c99b 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -64,9 +64,9 @@ $lang['qso_simplefle_clear'] = "Clear Logging Session"; $lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; -$lang['qso_simplefle_error_band'] = "Band is missing!"; -$lang['qso_simplefle_error_mode'] = "Mode is missing!"; -$lang['qso_simplefle_error_time'] = "Time is not set!"; +$lang['qso_simplefle_error_band'] = "找不到波段！"; +$lang['qso_simplefle_error_mode'] = "找不到模式！"; +$lang['qso_simplefle_error_time'] = "时间未设定！"; $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; diff --git a/application/language/chinese_simplified/statistics_lang.php b/application/language/chinese_simplified/statistics_lang.php index d1b3e0ec1..58607ee16 100644 --- a/application/language/chinese_simplified/statistics_lang.php +++ b/application/language/chinese_simplified/statistics_lang.php @@ -16,8 +16,8 @@ $lang['statistics_year'] = '年'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; -$lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_number_of_qso_worked_each_year'] = "每年通联的 QSO 数量"; +$lang['statistics_number_of_qso_worked'] = "通联的 QSO 数量"; /* * @@ -25,14 +25,14 @@ * */ -$lang['statistics_distances_worked'] = "Distances Worked"; -$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; -$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; -$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; -$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; -$lang['statistics_distances_qsos_with'] = "QSOs with"; -$lang['statistics_distances_and_band'] = "and band"; +$lang['statistics_distances_worked'] = "通联距离"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "次通联
    您最远的通联是与"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "在网格"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "距离是"; +$lang['statistics_distances_number_of_qsos'] = "QSO 数量"; +$lang['statistics_distances_callsigns_worked'] = "通联的呼号（最多显示5个）："; +$lang['statistics_distances_qsos_with'] = "QSO 与"; +$lang['statistics_distances_and_band'] = "和波段"; /* * @@ -40,5 +40,5 @@ * */ -$lang['statistics_timeline'] = "Timeline"; +$lang['statistics_timeline'] = "时间线"; From 83b3261034aafeea0c3db864a6af8decbcd8d58d Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 9 Nov 2023 15:11:36 +0100 Subject: [PATCH 091/121] Fix lookups for empty contest sessions --- application/controllers/Contesting.php | 2 +- application/models/Contesting_model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php index 87343ae5a..2ab204b60 100644 --- a/application/controllers/Contesting.php +++ b/application/controllers/Contesting.php @@ -188,7 +188,7 @@ public function checkIfWorkedBefore() { $result = $this->Contesting_model->checkIfWorkedBefore($call, $band, $mode, $contest); header('Content-Type: application/json'); - if ($result->num_rows()) { + if ($result && $result->num_rows()) { echo json_encode(array('message' => 'Worked before')); } return; diff --git a/application/models/Contesting_model.php b/application/models/Contesting_model.php index 7bd892155..3ab632487 100644 --- a/application/models/Contesting_model.php +++ b/application/models/Contesting_model.php @@ -214,7 +214,7 @@ function checkIfWorkedBefore($call, $band, $mode, $contest) { $contest_session = $this->getSession(); - if ($contest_session) { + if ($contest_session && $contest_session->qso != "") { $qsoarray = explode(',', $contest_session->qso); $date = DateTime::createFromFormat('d-m-Y H:i:s', $qsoarray[0]); From 04c64331fdf9b685498285b04629583b61b8a7df Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 9 Nov 2023 16:06:47 +0100 Subject: [PATCH 092/121] Skip rove table if empty and display info message --- application/language/bulgarian/general_words_lang.php | 2 ++ .../language/chinese_simplified/general_words_lang.php | 2 ++ application/language/czech/general_words_lang.php | 2 ++ application/language/dutch/general_words_lang.php | 2 ++ application/language/english/general_words_lang.php | 2 ++ application/language/finnish/general_words_lang.php | 2 ++ application/language/french/general_words_lang.php | 2 ++ application/language/german/general_words_lang.php | 2 ++ application/language/greek/general_words_lang.php | 2 ++ application/language/italian/general_words_lang.php | 2 ++ application/language/polish/general_words_lang.php | 2 ++ application/language/russian/general_words_lang.php | 2 ++ application/language/spanish/general_words_lang.php | 2 ++ application/language/swedish/general_words_lang.php | 2 ++ application/language/turkish/general_words_lang.php | 2 ++ application/views/components/hamsat/table.php | 6 ++++++ 16 files changed, 36 insertions(+) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 874f3a633..65724ec14 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index c68504a34..0d42ab703 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -211,3 +211,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index 11a88145f..d25662e20 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -207,3 +207,5 @@ $lang['gen_band_selection'] = 'Výběr pásma'; $lang['general_word_today'] = 'Dnes'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 939a7a9a4..279ab280d 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 5a0e34398..716b1f7c0 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -210,3 +210,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 3b54c7af6..8130c6027 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 74a266044..90b0394c5 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 3d55427c3..b9214ccf5 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -210,3 +210,5 @@ $lang['dashboard_country_files_warning'] = 'Die Länderlisten müssen aktualisiert werden! Klicke hier, um das zu tun!'; $lang['dashboard_locations_warning'] = 'Ea wurde kein Stationsstandort angelegt! Klicke hier, um das zu tun!'; $lang['dashboard_logbooks_warning'] = 'Es wurde kein Stationslogbuch angelegt. Klicke hier, um das zu tun!'; + +$lang['hams_at_no_activations_found'] = 'Keine bevorstehenden Aktivierungen gefunden. Bitte später noch einmal vorbeischauen.'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 550d6166f..da2e9a550 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index fc8fd0b64..b39655057 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index 3229e46ea..22ada7cd3 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -207,3 +207,5 @@ $lang['gen_band_selection'] = 'Band selection'; $lang['general_word_today'] = 'Today'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index 9f2c9b167..7afbdb95a 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -213,3 +213,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 74f0e6eec..53c01bfca 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index d386199d3..26344d1ce 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -213,3 +213,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 0f4f4ff0e..3eba7eb74 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php index ebda28b78..900472580 100644 --- a/application/views/components/hamsat/table.php +++ b/application/views/components/hamsat/table.php @@ -2,6 +2,11 @@

    Hamsat - Satellite Rovers

    This data is from https://hams.at/

    + +
    + +
    + @@ -87,4 +92,5 @@
    + From bb5355d32fcfe1d40051d7c0be71e5611cb762c3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 Nov 2023 21:49:17 +0100 Subject: [PATCH 093/121] bug fix for getFreqFromBand --- application/models/Bands.php | 2 +- application/views/simplefle/index.php | 1 + assets/js/sections/simplefle.js | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/application/models/Bands.php b/application/models/Bands.php index b8bbf5948..d3aac99c9 100644 --- a/application/models/Bands.php +++ b/application/models/Bands.php @@ -57,7 +57,7 @@ function get_all_bands() { $results = array(); foreach($result as $band) { - $results['b'.strtoupper($band->band)] = array('cw' => $band->cw, 'ssb' => $band->ssb, 'digi' => $band->data); + $results['b'.strtoupper($band->band)] = array('CW' => $band->cw, 'SSB' => $band->ssb, 'DIGI' => $band->data); } return $results; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 7fc368e6c..27321c3e8 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -1,6 +1,7 @@
    diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 7d112b6e9..f75459723 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -123,6 +123,7 @@ function handleInput() { var rst_r = null; items = row.startsWith("day ") ? [row] : row.split(" "); var itemNumber = 0; + var freq = 0; items.forEach((item) => { if (item === "") { return; @@ -415,11 +416,15 @@ function getBandFromFreq(freq) { } function getFreqFromBand(band, mode) { - const settingsMode = getSettingsMode(mode.toUpperCase()); - const id = "#" + band + settingsMode; - if ($(id).length) { - return $(id).val(); - } + var settingsMode = getSettingsMode(mode.toUpperCase()); + var settingsBand = "b" + band.toUpperCase(); + var bandData = Bands[settingsBand]; + + if (bandData) { + return bandData[settingsMode] / 1000000; + } + + } function getSettingsMode(mode) { From 31e3162ad98fe8ad08ff27a42741b9240c578ddd Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 Nov 2023 22:00:06 +0100 Subject: [PATCH 094/121] removed console.log --- application/views/simplefle/index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 27321c3e8..7fc368e6c 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -1,7 +1,6 @@
    From 172daaf799d737fa73f71da7c93d3b6df2898b23 Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 10 Nov 2023 07:35:00 +0100 Subject: [PATCH 095/121] Make rove comment a separate column --- application/views/components/hamsat/table.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php index 900472580..08c0fc540 100644 --- a/application/views/components/hamsat/table.php +++ b/application/views/components/hamsat/table.php @@ -13,6 +13,7 @@ Date Time Callsign + Comment Satellite Gridsquare(s) @@ -49,13 +50,16 @@ $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $CI->load->model('logbook_model'); $call_worked = $CI->logbook_model->check_if_callsign_worked_in_logbook($rove['callsign'], $logbooks_locations_array, "SAT"); - echo " "; if ($call_worked != 0) { echo "".$rove['callsign'].""; } else { echo $rove['callsign']; } - echo ""; + ?> + + + From c4d31e20cd69a70d2cf8c662cc4d43f5af6ff7e6 Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 10 Nov 2023 06:44:14 +0000 Subject: [PATCH 096/121] Added xss_clean and null-exception-handling to grid --- application/models/Logbook_model.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index bd54ec0ac..fdeef86eb 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -289,10 +289,10 @@ function create_qso() { } // Decide whether its single gridsquare or a multi which makes it vucc_grids - if (strpos(trim($this->input->post('locator')), ',') !== false) { - $data['COL_VUCC_GRIDS'] = strtoupper(trim($this->input->post('locator'))); + if (strpos(trim(xss_clean($this->input->post('locator')) ?? ''), ',') !== false) { + $data['COL_VUCC_GRIDS'] = strtoupper(trim(xss_clean($this->input->post('locator')) ?? '')); } else { - $data['COL_GRIDSQUARE'] = strtoupper(trim($this->input->post('locator'))); + $data['COL_GRIDSQUARE'] = strtoupper(trim(xss_clean($this->input->post('locator')) ?? '')); } // if eQSL username set, default SENT & RCVD to 'N' else leave as null From 4114c247f403f53b088dc5d684552b8bac793b30 Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 10 Nov 2023 09:20:41 +0100 Subject: [PATCH 097/121] Add some XSS clean here --- application/views/components/hamsat/table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php index 08c0fc540..e218916fd 100644 --- a/application/views/components/hamsat/table.php +++ b/application/views/components/hamsat/table.php @@ -59,7 +59,7 @@ From 428b67990787923c6b96c3064457e6c188e9f69c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 10 Nov 2023 12:55:25 +0100 Subject: [PATCH 098/121] no correct use of label for --- application/views/simplefle/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 7fc368e6c..a86ec04f2 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -73,7 +73,7 @@
    - +

    From 15f52f99ca07ef092547ef96e6c08cf979fd1e9f Mon Sep 17 00:00:00 2001 From: Robert Sammelson Date: Sat, 11 Nov 2023 01:25:21 -0500 Subject: [PATCH 099/121] Fix POTA regex --- assets/js/sections/simplefle.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index f75459723..17dd0c7c1 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -164,13 +164,13 @@ function handleInput() { qsotime = qsotime.slice(0, -2) + item; } else if ( item.match( - /^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i + /^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i ) ) { sotaWwff = item.toUpperCase(); } else if ( item.match( - /([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])|.*\/([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])|([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])\/.*/ + /([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|.*\/([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])\/.*/ ) ) { callsign = item.toUpperCase(); @@ -423,7 +423,7 @@ function getFreqFromBand(band, mode) { if (bandData) { return bandData[settingsMode] / 1000000; } - + } @@ -503,7 +503,7 @@ function isExampleDataEntered() { let isExampleData = false; if (textarea.value.startsWith("*example-data*")) { isExampleData = true; - + }; return isExampleData; @@ -559,7 +559,7 @@ function isIOTA(value) { } function isPOTA(value) { - if (value.match(/^(?!.*FF)[A-Z0-9]{1,3}-\d{4}$/)) { + if (value.match(/^(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}$/)) { return true; } } From 7ebf909fd767fe96ad1388a63f09ba27789181a2 Mon Sep 17 00:00:00 2001 From: Robert Sammelson Date: Sat, 11 Nov 2023 01:31:07 -0500 Subject: [PATCH 100/121] Format file --- assets/js/sections/simplefle.js | 201 +++++++++++++++++++------------- 1 file changed, 119 insertions(+), 82 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 17dd0c7c1..018371415 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -8,25 +8,25 @@ var callsign = ""; var errors = []; var qsoList = []; -$('#simpleFleInfoButton').click(function (event) { - var awardInfoLines = [ - lang_qso_simplefle_info_ln2, - lang_qso_simplefle_info_ln3, - lang_qso_simplefle_info_ln4 - ]; - var simpleFleInfo = ""; - awardInfoLines.forEach(function (line) { - simpleFleInfo += line + "

    "; - }); - BootstrapDialog.alert({ - title: "

    "+lang_qso_simplefle_info_ln1+"

    ", - message: simpleFleInfo, - }); +$("#simpleFleInfoButton").click(function (event) { + var awardInfoLines = [ + lang_qso_simplefle_info_ln2, + lang_qso_simplefle_info_ln3, + lang_qso_simplefle_info_ln4, + ]; + var simpleFleInfo = ""; + awardInfoLines.forEach(function (line) { + simpleFleInfo += line + "

    "; + }); + BootstrapDialog.alert({ + title: "

    " + lang_qso_simplefle_info_ln1 + "

    ", + message: simpleFleInfo, + }); }); -$('#js-syntax').click(function (event) { - $('#js-syntax').prop("disabled", false); - $.ajax({ +$("#js-syntax").click(function (event) { + $("#js-syntax").prop("disabled", false); + $.ajax({ url: base_url + "index.php/simplefle/displaySyntax", type: "post", success: function (html) { @@ -133,13 +133,15 @@ function handleInput() { var originalDate = new Date(extraQsoDate); originalDate.setDate(originalDate.getDate() + plusCount); extraQsoDate = originalDate.toISOString().split("T")[0]; - } else if (item.match(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/)) { - extraQsoDate = item; } else if ( - item.match(/^[0-2][0-9][0-5][0-9]$/) + item.match(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/) ) { + extraQsoDate = item; + } else if (item.match(/^[0-2][0-9][0-5][0-9]$/)) { qsotime = item; - } else if (item.match(/^CW$|^SSB$|^LSB$|^USB$|^FM$|^AM$|^PSK$|^FT8$/i)) { + } else if ( + item.match(/^CW$|^SSB$|^LSB$|^USB$|^FM$|^AM$|^PSK$|^FT8$/i) + ) { mode = item.toUpperCase(); } else if ( item.match(/^[0-9]{1,4}(?:m|cm|mm)$/) || @@ -164,13 +166,13 @@ function handleInput() { qsotime = qsotime.slice(0, -2) + item; } else if ( item.match( - /^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i + /^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i, ) ) { sotaWwff = item.toUpperCase(); } else if ( item.match( - /([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|.*\/([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])\/.*/ + /([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|.*\/([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])\/.*/, ) ) { callsign = item.toUpperCase(); @@ -206,7 +208,9 @@ function handleInput() { } if (isValidDate(extraQsoDate) === false) { - addErrorMessage(lang_qso_simplefle_error_date + " " + extraQsoDate); + addErrorMessage( + lang_qso_simplefle_error_date + " " + extraQsoDate, + ); extraQsoDate = qsodate; } @@ -251,14 +255,38 @@ function handleInput() { $("#qsoTable > tbody:last-child").append(tableRow); - localStorage.setItem(`user_${user_id}_tabledata`, $("#qsoTable").html()); - localStorage.setItem(`user_${user_id}_my-call`, $("#station-call").val()); - localStorage.setItem(`user_${user_id}_operator`, $("#operator").val()); - localStorage.setItem(`user_${user_id}_my-sota-wwff`, $("#my-sota-wwff").val()); - localStorage.setItem(`user_${user_id}_qso-area`, $(".qso-area").val()); - localStorage.setItem(`user_${user_id}_qsodate`, $("#qsodate").val()); - localStorage.setItem(`user_${user_id}_my-power`, $("#my-power").val()); - localStorage.setItem(`user_${user_id}_my-grid`, $("#my-grid").val()); + localStorage.setItem( + `user_${user_id}_tabledata`, + $("#qsoTable").html(), + ); + localStorage.setItem( + `user_${user_id}_my-call`, + $("#station-call").val(), + ); + localStorage.setItem( + `user_${user_id}_operator`, + $("#operator").val(), + ); + localStorage.setItem( + `user_${user_id}_my-sota-wwff`, + $("#my-sota-wwff").val(), + ); + localStorage.setItem( + `user_${user_id}_qso-area`, + $(".qso-area").val(), + ); + localStorage.setItem( + `user_${user_id}_qsodate`, + $("#qsodate").val(), + ); + localStorage.setItem( + `user_${user_id}_my-power`, + $("#my-power").val(), + ); + localStorage.setItem( + `user_${user_id}_my-grid`, + $("#my-grid").val(), + ); callsign = ""; sotaWwff = ""; @@ -272,7 +300,14 @@ function handleInput() { var qsoCount = qsoList.length; if (qsoCount) { - $(".js-qso-count").html("" + lang_qso_simplefle_qso_list_total + ": " + qsoCount + " " + lang_gen_hamradio_qso); + $(".js-qso-count").html( + "" + + lang_qso_simplefle_qso_list_total + + ": " + + qsoCount + + " " + + lang_gen_hamradio_qso, + ); } else { $(".js-qso-count").html(""); } @@ -283,31 +318,31 @@ function handleInput() { } function checkMainFieldsErrors() { - if ($("#station-call").val() === '-') { - $('#warningStationCall').show(); - $('#station-call').css('border', '2px solid rgb(217, 83, 79)'); - $('#warningStationCall').text(lang_qso_simplefle_error_stationcall); + if ($("#station-call").val() === "-") { + $("#warningStationCall").show(); + $("#station-call").css("border", "2px solid rgb(217, 83, 79)"); + $("#warningStationCall").text(lang_qso_simplefle_error_stationcall); } else { - $('#station-call').css('border', ''); - $('#warningStationCall').hide(); - } + $("#station-call").css("border", ""); + $("#warningStationCall").hide(); + } if ($("#operator").val() === "") { - $('#warningOperatorField').show(); - $('#operator').css('border', '2px solid rgb(217, 83, 79)'); - $('#warningOperatorField').text(lang_qso_simplefle_error_operator); - }else { - $('#operator').css('border', ''); - $('#warningOperatorField').hide(); - } + $("#warningOperatorField").show(); + $("#operator").css("border", "2px solid rgb(217, 83, 79)"); + $("#warningOperatorField").text(lang_qso_simplefle_error_operator); + } else { + $("#operator").css("border", ""); + $("#warningOperatorField").hide(); + } if ($("textarea").val() === "") { - $('#textarea').css('border', '2px solid rgb(217, 83, 79)'); - setTimeout(function() { - $('#textarea').css('border', ''); - }, 2000); - }else { - $('#textarea').css('border', ''); - } + $("#textarea").css("border", "2px solid rgb(217, 83, 79)"); + setTimeout(function () { + $("#textarea").css("border", ""); + }, 2000); + } else { + $("#textarea").css("border", ""); + } } $textarea.keydown(function (event) { @@ -382,7 +417,6 @@ $(".js-download-qso").click(function () { handleInput(); }); - function getBandFromFreq(freq) { if (freq > 1.7 && freq < 2) { return "160m"; @@ -421,14 +455,18 @@ function getFreqFromBand(band, mode) { var bandData = Bands[settingsBand]; if (bandData) { - return bandData[settingsMode] / 1000000; - } - - + return bandData[settingsMode] / 1000000; + } } function getSettingsMode(mode) { - if (mode === "AM" || mode === "FM" || mode === "SSB" || mode === "LSB" || mode === "USB") { + if ( + mode === "AM" || + mode === "FM" || + mode === "SSB" || + mode === "LSB" || + mode === "USB" + ) { return "SSB"; } @@ -451,7 +489,7 @@ for (const [key, value] of Object.entries(Bands)) {
    @@ -459,7 +497,7 @@ for (const [key, value] of Object.entries(Bands)) {
    @@ -467,7 +505,7 @@ for (const [key, value] of Object.entries(Bands)) {
    @@ -503,10 +541,8 @@ function isExampleDataEntered() { let isExampleData = false; if (textarea.value.startsWith("*example-data*")) { isExampleData = true; - - }; + } return isExampleData; - } function getAdifTag(tagName, value) { @@ -572,7 +608,6 @@ function isWWFF(value) { return false; } - $(document).ready(function () { setInterval(updateUTCTime, 1000); updateUTCTime(); @@ -621,10 +656,10 @@ $(document).ready(function () { $(".js-save-to-log").click(function () { if ($("textarea").val() === "") { - $('#textarea').css('border', '2px solid rgb(217, 83, 79)'); - setTimeout(function() { - $('#textarea').css('border', ''); - }, 2000); + $("#textarea").css("border", "2px solid rgb(217, 83, 79)"); + setTimeout(function () { + $("#textarea").css("border", ""); + }, 2000); return false; } if (false === isBandModeEntered()) { @@ -659,13 +694,11 @@ $(".js-save-to-log").click(function () { btnOKClass: "btn-warning", }); return false; - } - else { + } else { handleInput(); BootstrapDialog.confirm({ title: lang_general_word_attention, - message: - lang_qso_simplefle_confirm_save_to_log, + message: lang_qso_simplefle_confirm_save_to_log, type: BootstrapDialog.TYPE_INFO, btnCancelLabel: lang_general_word_cancel, btnOKLabel: lang_general_word_ok, @@ -686,15 +719,20 @@ $(".js-save-to-log").click(function () { var rst_rcvd = item[7]; var rst_sent = item[6]; var start_date = item[0]; - var start_time = item[1][0] + item[1][1] + ":" + item[1][2] + item[1][3]; + var start_time = + item[1][0] + + item[1][1] + + ":" + + item[1][2] + + item[1][3]; var band = item[4]; var mode = item[5]; var freq_display = item[3] * 1000000; var station_profile = $(".station_id").val(); - var sota_ref = ''; - var iota_ref = ''; - var pota_ref = ''; - var wwff_ref = ''; + var sota_ref = ""; + var iota_ref = ""; + var pota_ref = ""; + var wwff_ref = ""; if (isSOTA(item[8])) { sota_ref = item[8]; } else if (isIOTA(item[8])) { @@ -730,8 +768,7 @@ $(".js-save-to-log").click(function () { clearSession(); BootstrapDialog.alert({ title: lang_qso_simplefle_success_save_to_log_header, - message: - lang_qso_simplefle_success_save_to_log, + message: lang_qso_simplefle_success_save_to_log, }); } }, From 77c83adaad063ba2fea1071f1ec9fa828eafcdf3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 11 Nov 2023 09:35:27 +0100 Subject: [PATCH 101/121] check also recursive --- application/controllers/Debug.php | 94 ++++++++++++++----------------- 1 file changed, 43 insertions(+), 51 deletions(-) diff --git a/application/controllers/Debug.php b/application/controllers/Debug.php index 25bffcb68..cca65943a 100644 --- a/application/controllers/Debug.php +++ b/application/controllers/Debug.php @@ -1,69 +1,61 @@ load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - } - - /* User Facing Links to Backup URLs */ - public function index() - { + if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + } + + /* User Facing Links to Backup URLs */ + public function index() + { $this->load->helper('file'); // Test writing to backup folder - if ( ! write_file('backup/myfile.txt', "dummydata")) - { - $data['backup_folder'] = false; - } - else - { - if(unlink(realpath('backup/myfile.txt'))) { - $data['backup_folder'] = true; - } else { - $data['backup_folder'] = false; - } - } + $backup_folder = $this->is_really_writable('backup'); + $data['backup_folder'] = $backup_folder; // Test writing to updates folder - if ( ! write_file('updates/myfile.txt', "dummydata")) - { - $data['updates_folder'] = false; - } - else - { - if(unlink(realpath('updates/myfile.txt'))) { - $data['updates_folder'] = true; - } else { - $data['updates_folder'] = false; - } - } + $updates_folder = $this->is_really_writable('updates'); + $data['updates_folder'] = $updates_folder; // Test writing to uploads folder - if ( ! write_file('uploads/myfile.txt', "dummydata")) - { - $data['uploads_folder'] = false; - } - else - { - if(unlink(realpath('uploads/myfile.txt'))) { - $data['uploads_folder'] = true; - } else { - $data['uploads_folder'] = false; - } - } + $uploads_folder = $this->is_really_writable('uploads'); + $data['uploads_folder'] = $uploads_folder; + $data['page_title'] = "Debug"; + $this->load->view('interface_assets/header', $data); + $this->load->view('debug/main'); + $this->load->view('interface_assets/footer'); + } - $data['page_title'] = "Debug"; + private function is_really_writable($folder) + { + // Get the absolute path to the folder + $path = FCPATH . $folder; - $this->load->view('interface_assets/header', $data); - $this->load->view('debug/main'); - $this->load->view('interface_assets/footer'); - } + // Check if the folder exists + if (!file_exists($path)) { + return false; + } + // Check if the folder is writable + if (is_writable($path)) { + // Check if the subdirectories are writable (recursive check) + $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)); + foreach ($iterator as $item) { + if (!is_writable($item->getPathname())) { + return false; + } + } + + return true; + } -} \ No newline at end of file + return false; + } +} From 72808efb3e60b56921c1cc735ba0ff0636718e1b Mon Sep 17 00:00:00 2001 From: abarrau Date: Sat, 11 Nov 2023 19:04:58 +0100 Subject: [PATCH 102/121] update french language (+ standardize format) 1/ Update French tag value for files : account_lang.php --> done adif_lang.php --> done admin_lang.php --> done awards_lang.php contesting_lang.php --> done eqsl_lang.php --> non change export_lang.php filter_lang.php general_words_lang.php --> in progress gridsquares_lang.php lotw_lang.php menu_lang.php notes_lang.php --> done options_lang.php qslcard_lang.php --> done qso_lang.php station_lang.php statistics_lang.php --> done 2/ addition of a space (on 1 line of the adif file for each language) to standardize the structure of the files 3/ standardize css form-control for 1 field on add/edit user view --- application/language/bulgarian/adif_lang.php | 2 +- .../language/chinese_simplified/adif_lang.php | 2 +- application/language/czech/adif_lang.php | 2 +- application/language/dutch/adif_lang.php | 2 +- application/language/english/adif_lang.php | 2 +- application/language/finnish/adif_lang.php | 2 +- application/language/french/account_lang.php | 79 ++++++------ application/language/french/adif_lang.php | 120 +++++++++--------- application/language/french/admin_lang.php | 62 ++++----- .../language/french/contesting_lang.php | 34 ++--- .../language/french/general_words_lang.php | 34 ++--- application/language/french/notes_lang.php | 18 +-- application/language/french/qslcard_lang.php | 25 ++-- .../language/french/statistics_lang.php | 38 +++--- application/language/german/adif_lang.php | 2 +- application/language/greek/adif_lang.php | 2 +- application/language/italian/adif_lang.php | 2 +- application/language/polish/adif_lang.php | 2 +- application/language/russian/adif_lang.php | 2 +- application/language/spanish/adif_lang.php | 2 +- application/language/swedish/adif_lang.php | 2 +- application/language/turkish/adif_lang.php | 2 +- application/views/user/add.php | 2 +- application/views/user/edit.php | 2 +- 24 files changed, 223 insertions(+), 219 deletions(-) diff --git a/application/language/bulgarian/adif_lang.php b/application/language/bulgarian/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/bulgarian/adif_lang.php +++ b/application/language/bulgarian/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/chinese_simplified/adif_lang.php b/application/language/chinese_simplified/adif_lang.php index 9b04979d9..b23071d2f 100644 --- a/application/language/chinese_simplified/adif_lang.php +++ b/application/language/chinese_simplified/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF 文件"; -$lang['adif_hint_no_info_in_file'] ="如果导入的ADIF文件不包含此信息，选择此项。"; +$lang['adif_hint_no_info_in_file'] = "如果导入的ADIF文件不包含此信息，选择此项。"; $lang['adif_import_dup'] = "导入重复的QSO"; $lang['adif_mark_imported_lotw'] = "标记导入的QSO为已上传至 LoTW"; diff --git a/application/language/czech/adif_lang.php b/application/language/czech/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/czech/adif_lang.php +++ b/application/language/czech/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/dutch/adif_lang.php b/application/language/dutch/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/dutch/adif_lang.php +++ b/application/language/dutch/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/english/adif_lang.php b/application/language/english/adif_lang.php index e47d5b28b..4bc6753cc 100644 --- a/application/language/english/adif_lang.php +++ b/application/language/english/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/finnish/adif_lang.php b/application/language/finnish/adif_lang.php index 6893cadae..ae21746c9 100644 --- a/application/language/finnish/adif_lang.php +++ b/application/language/finnish/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index dd239ac79..832d27a23 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -3,18 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['account_logbook_fields'] = 'Champs Logbook'; -$lang['account_colonne1_text'] = 'Choisir colonne 1'; -$lang['account_colonne2_text'] = 'Choisir colonne 2'; -$lang['account_colonne3_text'] = 'Choisir colonne 3'; -$lang['account_colonne4_text'] = 'Choisir colonne 4'; -$lang['account_colonne5_text'] = 'Choisir colonne 5 (uniquement pour logbook)'; +$lang['account_column1_text'] = 'Contenu colonne 1'; +$lang['account_column2_text'] = 'Contenu colonne 2'; +$lang['account_column3_text'] = 'Contenu colonne 3'; +$lang['account_column4_text'] = 'Contenu colonne 4'; +$lang['account_column5_text'] = 'Contenu colonne 5 (uniquement pour logbook)'; -$lang['account_create_user_account'] = 'Creer un compte'; +$lang['account_create_user_account'] = 'Créer un compte'; $lang['account_edit_account'] = 'Editer un compte'; $lang['account_account_information'] = 'Informations du compte'; -$lang['account_user'] = "User"; -$lang['account_word_edited'] = "edited"; +$lang['account_user'] = 'Compte'; +$lang['account_word_edited'] = 'mis à jour'; $lang['account_username'] = 'Utilisateur'; $lang['account_email_address'] = 'Email'; $lang['account_password'] = 'Mot de passe'; @@ -33,42 +33,42 @@ $lang['account_gridsquare'] = 'Locator'; $lang['account_cloudlog_preferences'] = 'Préférences Cloudlog'; -$lang['account_timezone'] = 'Timezone'; +$lang['account_timezone'] = 'Fuseau horaire'; $lang['account_date_format'] = 'Format de la date'; -$lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; -$lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; -$lang['account_quicklog_feature'] = "Quicklog Field"; -$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; -$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; -$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; -$lang['account_quicklog_enter_log'] = "Log Callsign"; -$lang['account_quicklog_enter_search'] = "Search Callsign"; +$lang['account_log_end_time'] = 'Enregistrer les heures de fin des QSO séparément'; +$lang['account_log_end_time_hint'] = '(Choisissez \'oui\', si vous souhaitez enregistrer les heures de début et de fin des QSO séparément. Si la valeur est \'Non\', l\'heure de fin sera la même que l\'heure de début)'; +$lang['account_quicklog_feature'] = 'Champ Quicklog'; +$lang['account_quicklog_feature_hint'] = '(Si \'oui\', vous pouvez enregistrer les indicatifs d\'appel en utilisant le champ de recherche dans la barre du haut)'; +$lang['account_quicklog_enter'] = 'Quicklog - Action sur la touche \'Entrée\''; +$lang['account_quicklog_enter_hint'] = '(Action effectuée lorsque vous appuyez sur \'Entrée\' dans le champ quicklog ?)'; +$lang['account_quicklog_enter_log'] = 'Enregistre l\'indicatif'; +$lang['account_quicklog_enter_search'] = 'Recherche l\'indicatif'; $lang['account_measurement_preferences'] = 'Unité de mesure'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '(Sélectionnez le format de date à afficher)'; -$lang['account_choose_which_unit_distances_will_be_shown_in'] = '(Choisiez l\'unité de mesure à afficher)'; -$lang['account_cloudlog_language'] = 'Cloudlog Language'; -$lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; +$lang['account_choose_which_unit_distances_will_be_shown_in'] = '(Sélectionner l\'unité de mesure à afficher)'; +$lang['account_cloudlog_language'] = 'Langue utilisée par Cloudlog'; +$lang['account_choose_cloudlog_language'] = '(Sélectionner la langue à utiliser)'; $lang['account_main_menu'] = 'Menu principal'; -$lang['account_show_notes_in_the_main_menu'] = 'Voir les notes dans le main principal.'; +$lang['account_show_notes_in_the_main_menu'] = 'Voir les notes dans le main principal'; $lang['account_gridsquare_and_location_autocomplete'] = 'Renseignement automatique du lieu et du Locator'; -$lang['account_location_auto_lookup'] = 'Recherche automatique de lieu.'; -$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = '(Si activé, le Locator est récupéré en fonction du nom du lieu.)'; -$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'SOTA : Renseigner automatiquement le Locator et le nom du sommet.'; -$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'WWFF : Renseigner automatiquement le Locator et le nom de la référence.'; -$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'POTA : Renseigner automatiquement le Locateur et le nom du parc.'; -$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = '(Si activé, le nom et le Locator seront récupérés depuis l\'API et renseignés.)'; +$lang['account_location_auto_lookup'] = 'Recherche automatique de lieu'; +$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = '(Si \'oui\', le Locator est récupéré en fonction du nom du lieu)'; +$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'SOTA : Renseigner automatiquement le Locator et le nom du sommet'; +$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'WWFF : Renseigner automatiquement le Locator et le nom de la référence'; +$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'POTA : Renseigner automatiquement le Locateur et le nom du parc'; +$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = '(Si \'oui\', le nom et le Locator seront récupérés depuis l\'API et renseignés)'; $lang['account_previous_qsl_type'] = 'Type de QSL pour le statut'; -$lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Selectionner le type de QSL à afficher (statut) dans la session précédents QSOs.'; +$lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Sélectionner le type de QSL pour le statut à afficher dans la session \'Contacts précédents\''; $lang['account_qrzcom_hamqthcom_images'] = 'qrz.com/hamqth.com Images'; -$lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Affiche l\'image de profil du contact (depuis qrz.com/hamqth.com) dans la session QSO.'; -$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Indiquer les éléments d\'authentification pour qrz.com/hamqth.com credentials dans le fichier de configuration (config.php).'; +$lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Affiche l\'image de profil du contact (depuis qrz.com/hamqth.com) dans la session QSO'; +$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = '(Indiquer les éléments d\'authentification pour qrz.com/hamqth.com dans le fichier de configuration (config.php))'; $lang['account_amsat_status_upload'] = 'Envoi du statut AMSAT'; -$lang['account_upload_status_of_sat_qsos_to'] = 'Envoi des statuts des QSOs Satellites sur'; +$lang['account_upload_status_of_sat_qsos_to'] = 'Envoi des statuts des QSO par Satellite sur'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Utilisateur'; @@ -93,7 +93,7 @@ $lang['account_no_do_not_delete_this_user'] = 'Non, ne pas supprimer l\'utilisateur'; $lang['account_forgot_password'] = 'Mot de passe oublié ?'; -$lang['account_you_can_reset_your_password_here'] = 'Vous pouvez réinitialiser votre mot de passe ici.'; +$lang['account_you_can_reset_your_password_here'] = 'Vous pouvez réinitialiser votre mot de passe ici'; $lang['account_reset_password'] = 'Mot de passe réinitialisé'; $lang['account_the_email_field_is_required'] = 'Le champs Email est obligatoire'; $lang['account_confirm_password'] = 'Mot de passe confirmé'; @@ -104,14 +104,13 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; -$lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_user_mastodon_hint'] = "Main URL of your Mastodon server, e.g. https://radiosocial.de"; +$lang['account_user_mastodon'] = 'URL du serveur Mastodon'; +$lang['account_user_mastodon_hint'] = '(URL principale du serveur Mastodon server, ex:. https://radiosocial.de)'; -$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; -$lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Methods'; +$lang['account_default_band_settings'] = 'Paramètres par défaut'; +$lang['account_gridmap_default_band'] = 'Bandes'; +$lang['account_qsl_settings'] = 'Méthode QSL'; $lang['account_winkeyer'] = 'Winkeyer'; -$lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; -$lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; - +$lang['account_winkeyer_hint'] = 'REMARQUE : La prise en charge de Winkeyer dans Cloudlog est très expérimentale, lisez d\'abord le wiki avant de l\'activer https://github.com/magicbug/Cloudlog/wiki/Winkey'; +$lang['account_winkeyer_enabled'] = 'Activer Winkeyer'; \ No newline at end of file diff --git a/application/language/french/adif_lang.php b/application/language/french/adif_lang.php index 45e5196a9..1ed006bea 100644 --- a/application/language/french/adif_lang.php +++ b/application/language/french/adif_lang.php @@ -9,8 +9,8 @@ ___________________________________________________________________________________________ */ -$lang['adif_import'] = "ADIF Import"; -$lang['adif_export'] = "ADIF Export"; +$lang['adif_import'] = 'Importer ADIF'; +$lang['adif_export'] = 'Exporter ADIF'; // $lang['lotw_title'] --> application/language/english/lotw_lang.php $lang['darc_dcl'] = "DARC DCL"; @@ -22,33 +22,33 @@ */ // $lang['general_word_important'] --> application/language/english/general_words_lang.php -$lang['adif_alert_log_files_type'] = "Log Files must have the file type *.adi"; +$lang['adif_alert_log_files_type'] = 'Les fichiers de Log doivent avoir l\'extention : *.adi'; // $lang['general_word_warning'] --> application/language/english/general_words_lang.php "PHP Upload Warning" // $lang['gen_max_file_upload_size'] --> application/language/english/general_words_lang.php "PHP Upload Warning" -$lang['adif_select_stationlocation'] = "Select Station Location"; +$lang['adif_select_stationlocation'] = 'Sélectionner une Localisation'; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = '(A cocher, si l\'ADIF à importer, ne contient pas ces informations)'; -$lang['adif_import_dup'] = "Import duplicate QSOs"; -$lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; -$lang['adif_mark_imported_hrdlog'] = "Mark imported QSOs as uploaded to HRDLog.net Logbook"; -$lang['adif_mark_imported_qrz'] = "Mark imported QSOs as uploaded to QRZ Logbook"; -$lang['adif_mark_imported_clublog'] = "Mark imported QSOs as uploaded to Clublog Logbook"; +$lang['adif_import_dup'] = 'Importer les QSO en double'; +$lang['adif_mark_imported_lotw'] = 'Indiquer que les QSO importés ont été téléchargés sur LoTW'; +$lang['adif_mark_imported_hrdlog'] = 'Indiquer que les QSO importés ont été téléchargés dans le journal HRDLog.net'; +$lang['adif_mark_imported_qrz'] = 'Indiquer que les QSO importés ont été téléchargés dans le journal QRZ.com'; +$lang['adif_mark_imported_clublog'] = 'Indiquer que les QSO importés ont été téléchargés dans le journal Clublog'; -$lang['adif_dxcc_from_adif'] = "Use DXCC information from ADIF"; -$lang['adif_dxcc_from_adif_hint'] = "If not selected, Cloudlog will attempt to determine DXCC information automatically."; +$lang['adif_dxcc_from_adif'] = 'Utiliser l\'information du DXCC issue du fichier ADIF'; +$lang['adif_dxcc_from_adif_hint'] = '(Si cochée, Cloudlog tentera de déterminer automatiquement les informations DXCC.)'; -$lang['adif_always_use_login_call_as_op'] = "Always use login-callsign as operator-name on import"; +$lang['adif_always_use_login_call_as_op'] = 'Toujours utiliser l\'indicatif de connexion comme nom d\'opérateur lors de l\'import'; -$lang['adif_ignore_station_call'] = "Ignore Stationcallsign on import"; -$lang['adif_ignore_station_call_hint'] = "If selected, Cloudlog will try to import all QSO's of the ADIF, regardless if they match to the chosen station-location."; +$lang['adif_ignore_station_call'] = 'Ignorer l\'indicatif de la station lors de l\'import'; +$lang['adif_ignore_station_call_hint'] = '(Si cochée, Cloudlog tentera d\'importer TOUS les QSO de l\'ADIF, qu\'ils correspondent ou non à l\'emplacement de la station choisie)'; -$lang['adif_upload'] = "Upload"; +$lang['adif_upload'] = 'Importer'; /* ___________________________________________________________________________________________ @@ -56,18 +56,18 @@ ___________________________________________________________________________________________ */ -$lang['adif_export_take_it_anywhere'] = "Take your logbook file anywhere!"; -$lang['adif_export_take_it_anywhere_hint'] = "Exporting ADIFs allows you to import contacts into third party applications like LoTW, Awards or just for keeping a backup."; +$lang['adif_export_take_it_anywhere'] = 'Emportez votre fichier journal de trafic partout !'; +$lang['adif_export_take_it_anywhere_hint'] = 'L\'export de fichier ADIF vous permet d\'importer vos QSO dans des applications tierces comme LoTW, Awards ou simplement pour conserver une sauvegarde.'; -$lang['adif_mark_exported_lotw'] = "Mark exported QSOs as uploaded to LoTW"; -$lang['adif_mark_exported_no_lotw'] = "Export QSOs not uploaded to LoTW"; +$lang['adif_mark_exported_lotw'] = 'Indiquer que les QSO exportés ont été téléchargés sur LoTW'; +$lang['adif_mark_exported_no_lotw'] = 'Exporter les QSO non téléchargés sur LoTW'; -$lang['adif_export_qso'] = "Export QSO's"; +$lang['adif_export_qso'] = 'Exporter'; -$lang['adif_export_sat_only_qso'] = "Export Satellite-Only QSOs"; -$lang['adif_export_sat_only_qso_all'] = "Export All Satellite QSOs"; -$lang['adif_export_sat_only_qso_lotw'] = "Export All Satellite QSOs Confirmed on LoTW"; +$lang['adif_export_sat_only_qso'] = 'Export des QSO par Satellite seulement'; +$lang['adif_export_sat_only_qso_all'] = 'Exporter tous les QSO par satellite'; +$lang['adif_export_sat_only_qso_lotw'] = 'Exporter tous les QSO par satellite et confirmés sur LoTW'; /* ___________________________________________________________________________________________ @@ -75,29 +75,29 @@ ___________________________________________________________________________________________ */ -$lang['adif_lotw_export_if_selected'] = "If a date range is not selected then all QSOs will be marked!"; -$lang['adif_mark_qso_as_exported_to_lotw'] = "Mark QSOs as exported to LoTW"; +$lang['adif_lotw_export_if_selected'] = 'Si aucune date n\'est renseignées, tous les QSO seront marqués !'; +$lang['adif_mark_qso_as_exported_to_lotw'] = 'Marquer les QSO comme étant "téléchargé sur LoTW"'; -$lang['adif_qso_marked'] = "QSOs marked"; -$lang['adif_yay_its_done'] = "Yay, its done!"; -$lang['adif_qso_lotw_marked_confirm'] = "The QSOs are marked as exported to LoTW."; +$lang['adif_qso_marked'] = 'QSO marqués'; +$lang['adif_yay_its_done'] = 'Ok, réalisé !'; +$lang['adif_qso_lotw_marked_confirm'] = 'Les QSO ont été marqués comme téléchargés sur LoTW.'; /* ___________________________________________________________________________________________ DARC DCL ___________________________________________________________________________________________ */ -$lang['adif_dcl_text_pre'] = "Go to"; -$lang['adif_dcl_text_post'] = "and export your logbook with confirmed DOKs. To speed up the process you can select only DL QSOs to download (i.e. put \"DL\" into Prefix List). The downloaded ADIF file can be uploaded here in order to update QSOs with DOK info."; +$lang['adif_dcl_text_pre'] = 'Allez sur '; +$lang['adif_dcl_text_post'] = 'et exportez votre journal de trafic avec les DOK confirmés.
    Pour accélérer le processus, vous pouvez sélectionner uniquement les QSO DL à télécharger (c\'est-à-dire mettre "DL" dans la liste des préfixes).
    Le fichier ADIF téléchargé peut être téléchargé sur cette page afin de mettre à jour les QSO avec les informations DOK.'; -$lang['only_confirmed_qsos'] = "Only import DOK data from QSOs confirmed on DCL."; -$lang['only_confirmed_qsos_hint'] = "Uncheck if you also want to update DOK with data from unconfirmed QSOs in DCL."; +$lang['only_confirmed_qsos'] = 'Importez uniquement les données DOK des QSO confirmés sur DCL'; +$lang['only_confirmed_qsos_hint'] = '(Décoché, si vous souhaitez également mettre à jour DOK, avec les données des QSO non confirmés dans DCL)'; -$lang['overwrite_by_dcl'] = "Overwrite exisiting DOK in log by DCL (if different)"; -$lang['overwrite_by_dcl_hint'] = "If checked Cloudlog will forcibly overwrite existing DOK with DOK from DCL log."; +$lang['overwrite_by_dcl'] = 'Remplacer le DOC existant dans le journal par DCL (si différent)'; +$lang['overwrite_by_dcl_hint'] = '(Si cochée, Cloudlog écrasera de force le DOK existant par le DOK du journal DCL)'; -$lang['ignore_ambiguous'] = "Ignore QSOs that cannot be matched"; -$lang['ignore_ambiguous_hint'] = "If unchecked information about QSO which could not be found in Cloudlog will be displayed."; +$lang['ignore_ambiguous'] = 'Ignorer les QSO qui ne correspondent pas'; +$lang['ignore_ambiguous_hint'] = '(Si non cochée, les informations sur les QSO qui n\'ont pas pu être trouvées dans Cloudlog seront affichées)'; /* ___________________________________________________________________________________________ @@ -105,15 +105,15 @@ ___________________________________________________________________________________________ */ -$lang['adif_imported'] = "ADIF Imported"; -$lang['adif_yay_its_imported'] = "Yay, its imported!"; -$lang['adif_import_confirm'] = "The ADIF File has been imported."; +$lang['adif_imported'] = 'ADIF importé'; +$lang['adif_yay_its_imported'] = 'Ok, c\'est importé !'; +$lang['adif_import_confirm'] = 'Le fichier ADIF a été importé.'; -$lang['adif_import_dupes_inserted'] = " Dupes were inserted!"; -$lang['adif_import_dupes_skipped'] = " Dupes were skipped."; +$lang['adif_import_dupes_inserted'] = 'Des doublons ont été insérés !'; +$lang['adif_import_dupes_skipped'] = 'Les doublons ont été ignorés.'; -$lang['adif_import_errors'] = "ADIF Errors"; -$lang['adif_import_errors_hint'] = "You have ADIF errors, the QSOs have still been added but these fields have not been populated."; +$lang['adif_import_errors'] = 'ADIF Erreurs'; +$lang['adif_import_errors_hint'] = 'Vous avez des erreurs ADIF, les QSO ont quand même été ajoutés mais ces champs n\'ont pas été renseignés.'; /* ___________________________________________________________________________________________ @@ -121,19 +121,21 @@ ___________________________________________________________________________________________ */ -$lang['dcl_results'] = "Results of DCL DOK Update"; -$lang['dcl_info_updated'] = "DCL information for DOKs has been updated."; -$lang['dcl_qsos_updated'] = "QSOs updated"; -$lang['dcl_qsos_ignored'] = "QSOs ignored"; -$lang['dcl_qsos_unmatched'] = "QSOs unmatched"; -$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated."; -$lang['dcl_dok_errors'] = "DOK Errors"; -$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL"; +$lang['dcl_results'] = 'Résultats de la mise jour pour DCL DOK'; +$lang['dcl_info_updated'] = 'Les informations DCL pour les DOK ont été mis à jours.'; +$lang['dcl_qsos_updated'] = 'QSO mis à jour'; +$lang['dcl_qsos_ignored'] = 'QSO ignorés'; +$lang['dcl_qsos_unmatched'] = 'QSO sans correspondance'; +$lang['dcl_no_qsos_updated'] = 'Aucun QSO trouvé qui pourrait être mis à jour.'; +$lang['dcl_dok_errors'] = 'DOK Erreurs'; +$lang['dcl_dok_errors_details'] = 'Différente de données DOK entre votre journal de travail et DCL'; $lang['dcl_qsl_status'] = "DCL QSL Status"; -$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest"; -$lang['dcl_qsl_status_mno'] = "confirmed by award manager"; -$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data"; -$lang['dcl_qsl_status_w'] = "confirmation pending"; -$lang['dcl_qsl_status_x'] = "unconfirmed"; -$lang['dcl_qsl_status_unknown'] = "unknown"; -$lang['dcl_no_match'] = "QSO could not be matched"; +$lang['dcl_qsl_status_c'] = 'confirmé par LoTW/Clublog/eQSL/Contest'; +$lang['dcl_qsl_status_mno'] = 'confirmé par le manager de l\'Award'; +$lang['dcl_qsl_status_i'] = 'confirmé par recoupement des données DCL'; +$lang['dcl_qsl_status_w'] = 'confirmation en attente'; +$lang['dcl_qsl_status_x'] = 'non confirmé'; +$lang['dcl_qsl_status_unknown'] = 'inconnu'; +$lang['dcl_no_match'] = 'pas de correspondance pour le QSO'; + + diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index d071d3015..d3a2afc26 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -3,53 +3,53 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['admin_user_line1'] = 'Cloudlog a besoin d\'au moins un utilisateur configuré pour fonctionner.'; -$lang['admin_user_line2'] = 'Les utilisateurs peuvent se voir attribuer des rôles qui leur donnent différentes autorisations, telles que l\'ajout de QSO au journal de bord et l\'accès aux API Cloudlog.'; +$lang['admin_user_line2'] = 'Les utilisateurs peuvent se voir attribuer des rôles qui leur donnent différentes autorisations, telles que l\'ajout de QSO au journal de trafic et l\'accès aux API Cloudlog.'; $lang['admin_user_line3'] = 'L\'utilisateur actuellement connecté est affiché en haut à droite de chaque page.'; -$lang['admin_user_list'] = 'Utilisateurs List'; +$lang['admin_user_list'] = 'Liste des utilisateurs'; $lang['admin_user'] = 'Utilisateur'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Type'; $lang['admin_options'] = 'Options'; -$lang['admin_create_user'] = 'Creation d\'un utilisateur'; +$lang['admin_create_user'] = 'Création d\'un utilisateur'; $lang['admin_delete'] = 'Supprimer'; -$lang['admin_remove'] = "Remove"; +$lang['admin_remove'] = 'Enlever'; $lang['admin_edit'] = 'Editer'; -$lang['admin_create'] = 'Create'; -$lang['admin_update'] = 'Update'; -$lang['admin_copy'] = 'Copy'; -$lang['admin_save'] = 'Save'; -$lang['admin_close'] = 'Close'; -$lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_create'] = 'Créer'; +$lang['admin_update'] = 'Mettre à jour'; +$lang['admin_copy'] = 'Copier'; +$lang['admin_save'] = 'Enregistrer'; +$lang['admin_close'] = 'Fermer'; +$lang['admin_user_accounts'] = 'Compte des utilisateurs'; $lang['admin_danger'] = 'DANGER!'; -$lang['admin_experimental'] = "Experimental"; +$lang['admin_experimental'] = 'Expérimental'; // Contest Menu -$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; -$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; -$lang['admin_contest_menu_name'] = 'Name'; -$lang['admin_contest_menu_adif'] = 'ADIF Name'; -$lang['admin_contest_menu_active'] = 'Active'; -$lang['admin_contest_menu_n_active'] = 'Not Active'; -$lang['admin_contest_menu_activate'] = 'Activate'; -$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_menu_line_1'] = 'En utilisant la liste des concours, vous pouvez contrôler quels concours sont affichés lors de l\'enregistrement des QSO dans un concours.'; +$lang['admin_contest_menu_line_2'] = 'Les concours actifs seront affichés dans la liste déroulante \'Nom du concours\' sur les pages \'Contest Logging\' ; les concours inactifs seront masqués et ne pourront pas être sélectionnés.'; +$lang['admin_contest_menu_name'] = 'Nom'; +$lang['admin_contest_menu_adif'] = 'Nom ADIF'; +$lang['admin_contest_menu_active'] = 'Activé'; +$lang['admin_contest_menu_n_active'] = 'Désactivé'; +$lang['admin_contest_menu_activate'] = 'Activer'; +$lang['admin_contest_menu_deactivate'] = 'Désactiver'; -$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang['admin_contest_add_contest'] = 'Ajouter un concours'; $lang["admin_contest_create"] = "Create"; -$lang['admin_contest_all_active'] = 'Activate All'; -$lang['admin_contest_all_deactive'] = 'Deactivate All'; - -$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; -$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; -$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; -$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; -$lang['admin_contest_edit_update_contest'] = 'Update Contest'; -$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; -$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; -$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; +$lang['admin_contest_all_active'] = 'Activer tout'; +$lang['admin_contest_all_deactive'] = 'Désactiver tout'; + +$lang['admin_contest_name_adif'] = 'Nom ADIF du concours'; +$lang['admin_contest_name_of_contest'] = '(Nom du concours)'; +$lang['admin_contest_name_of_adif'] = '(Nom utilisé par le concours dans les spécifications ADIF)'; +$lang['admin_contest_edit_active_hint'] = '(Si \'Activer\', le concours sera affiché dans la liste des concours)'; +$lang['admin_contest_edit_update_contest'] = 'Mettre à jour'; +$lang['admin_contest_deletion_warning'] = 'ATTENTION ! Etes vous certain de vouloir supprimer le concours : '; +$lang['admin_contest_active_all_warning'] = 'ATTENTION ! Etes vous certain de vouloir activer tous les concours ? '; +$lang['admin_contest_deactive_all_warning'] = 'ATTENTION ! Etes vous certain de vouloir désactiver tous les concours ? '; diff --git a/application/language/french/contesting_lang.php b/application/language/french/contesting_lang.php index f062d6e25..5dbaf373b 100644 --- a/application/language/french/contesting_lang.php +++ b/application/language/french/contesting_lang.php @@ -2,31 +2,31 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['contesting_page_title'] = 'Logging Contest'; -$lang['contesting_button_reset_contest_session'] = 'Réinitialiser la session Contest'; -$lang['contesting_operator_callsign'] = 'Operator Callsign'; +$lang['contesting_page_title'] = 'Concours - enregistrement des QSO'; +$lang['contesting_button_reset_contest_session'] = 'Réinitialiser la session du concours'; +$lang['contesting_operator_callsign'] = 'Indicatif de l\'opérateur'; $lang['contesting_exchange_type'] = 'Type d\'échange'; -$lang['contesting_exchange_type_serial'] = 'Série'; -$lang['contesting_exchange_type_none'] = 'None'; -$lang['contesting_exchange_type_exchange'] = 'Exchange'; -$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; +$lang['contesting_exchange_type_serial'] = 'N° QSO'; +$lang['contesting_exchange_type_none'] = 'Aucun'; +$lang['contesting_exchange_type_exchange'] = 'Echange'; +$lang['contesting_exchange_type_gridsquare'] = 'Locator'; $lang['contesting_exchange_type_other'] = 'Autre'; -$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; -$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; -$lang['contesting_exchange_serial_s'] = 'Serial (S)'; -$lang['contesting_exchange_serial_r'] = 'Serial (R)'; -$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; -$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; +$lang['contesting_exchange_type_serial_exchange'] = 'N° QSO + Echange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'N° QSO + Locator'; +$lang['contesting_exchange_serial_s'] = 'N° QSO (S)'; +$lang['contesting_exchange_serial_r'] = 'N° QSO (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Locator (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Locator (R)'; -$lang['contesting_contest_name'] = 'Nom du Contest'; +$lang['contesting_contest_name'] = 'Nom du concours'; -$lang['contesting_btn_reset_qso'] = 'Réinitialise QSO'; +$lang['contesting_btn_reset_qso'] = 'Réinitialiser QSO'; $lang['contesting_btn_save_qso'] = 'Sauvegarder QSO'; $lang['contesting_title_callsign_suggestions'] = 'Suggestion d\'indicatif'; -$lang['contesting_title_contest_logbook'] = 'Logbook du Contest'; +$lang['contesting_title_contest_logbook'] = 'Journal de trafic du concours'; -$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; +$lang['contesting_copy_exch_to_dok'] = 'Copiez l\'échange reçu dans le champ DOK de la base de données !'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 90b0394c5..c63a94722 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -4,7 +4,7 @@ $lang['error_no_active_station_profile'] = 'Attention: vous devez activer le profil d\'une station.'; -$lang['notice_turn_the_radio_on'] = 'Vous n\'avez fait aucun QSOs aujourd\'hui. Il est temps d\'allumer la radio!'; +$lang['notice_turn_the_radio_on'] = 'Vous n\'avez réalisé aucun QSO aujourd\'hui. Il est temps d\'allumer la radio !'; $lang['general_word_important'] = 'Important'; $lang['general_word_warning'] = 'Warning'; @@ -94,7 +94,7 @@ $lang['general_mark_qsl_not_required'] = 'Marquer Carte QSL comme non requise'; $lang['general_delete_qso'] = 'Effacer QSO'; -$lang['general_more_qso'] = 'More QSOs'; +$lang['general_more_qso'] = 'Autres QSO'; $lang['general_lookup_qrz'] = 'Lookup on QRZ.com'; $lang['general_lookup_hamqth'] = 'Lookup on HamQTH'; @@ -171,7 +171,7 @@ $lang['gen_hamradio_longitude'] = "Longitude"; $lang['gen_hamradio_bearing'] = "Bearing"; $lang['gen_hamradio_distance'] = 'Distance'; -$lang['gen_hamradio_operator'] = 'Operateur'; +$lang['gen_hamradio_operator'] = 'Opérateur'; $lang['gen_hamradio_sig'] = 'Sig'; $lang['gen_hamradio_sig_info'] = 'Sig Info'; @@ -184,33 +184,33 @@ // Dashboard Words $lang['dashboard_you_have_had'] = 'Vous avez eu'; -$lang['dashboard_qsos_today'] = 'QSOs aujourd\'hui!'; -$lang['dashboard_qso_breakdown'] = 'QSOs Breakdown'; +$lang['dashboard_qsos_today'] = 'QSO aujourd\'hui !'; +$lang['dashboard_qso_breakdown'] = 'QSO Breakdown'; $lang['dashboard_countries_breakdown'] = 'Pays Breakdown'; -$lang['gen_to_date'] = 'To date'; +$lang['gen_to_date'] = 'au '; -$lang['gen_from_date'] = 'depuis la date'; +$lang['gen_from_date'] = 'Date, du '; $lang['gen_this_qso_was_confirmed_on'] = 'Ce QSO est confirmé depuis le'; -$lang['error_no_logbook_found'] = 'No logbooks were found. You need to define a logbook under Station Logbooks! Do it here:'; +$lang['error_no_logbook_found'] = 'Aucun journal de trafic n\'a été trouvé. Vous devez en définir un via le menu \'Station Logbooks\' ! Faites-le ici :'; -$lang['copy_to_clipboard'] = 'Copy to clipboard'; +$lang['copy_to_clipboard'] = 'Copier dans le presse-papier'; -$lang['africa'] = 'Africa'; +$lang['africa'] = 'Afrique'; $lang['antarctica'] = 'Antarctica'; -$lang['asia'] = 'Asia'; +$lang['asia'] = 'Asie'; $lang['europe'] = 'Europe'; -$lang['northamerica'] = 'North America'; -$lang['oceania'] = 'Oceania'; -$lang['southamerica'] = 'South America'; +$lang['northamerica'] = 'Amérique du Nord'; +$lang['oceania'] = 'Océanie'; +$lang['southamerica'] = 'Amérique du Sud'; $lang['gen_band_selection'] = 'Band selection'; -$lang['general_word_today'] = 'Today'; +$lang['general_word_today'] = 'Aujourd\'hui'; $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is'; $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; -$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'Vous n\'avez pas de journal de travail pour la station. Aller sur cette page pour en créer un !'; -$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; +$lang['hams_at_no_activations_found'] = 'Aucune activation à venir trouvée. Veuillez revenir plus tard.'; diff --git a/application/language/french/notes_lang.php b/application/language/french/notes_lang.php index 7728099dc..08032e1c2 100644 --- a/application/language/french/notes_lang.php +++ b/application/language/french/notes_lang.php @@ -3,19 +3,19 @@ defined('BASEPATH') OR exit('Accès direct au script non autorisé'); $lang['notes_menu_notes'] = 'Notes'; -$lang['notes_edit_note'] = 'Editer Note'; +$lang['notes_edit_note'] = 'Edition d\'une Note'; $lang['notes_your_notes'] = 'Vos Notes'; -$lang['notes_welcome'] = "Vous n'avez actuellement aucune note, C'est une manière fantastique de conserver vos données comme les réglages de boite d'accord, balises, notes sur les stations etc. et c'est bien mieux que des notes papiers que vous finirez par perdre"; -$lang['notes_create_note'] = 'Creation Note'; +$lang['notes_welcome'] = 'Vous n\'avez actuellement aucune note.
    C\'est une manière fantastique de conserver vos données comme les réglages de boite d\'accord, balises, notes sur les stations etc. et c\'est bien mieux que des notes papiers que vous finirez par perdre.'; +$lang['notes_create_note'] = 'Création d\'une nouvelle Note'; $lang['notes_input_title'] = 'Titre'; -$lang['notes_input_category'] = 'Categorie'; -$lang['notes_input_notes_content'] = 'Contenu Note'; -$lang['notes_input_btn_save_note'] = 'Enregistrer Note'; -$lang['notes_input_btn_edit_note'] = 'Editer Note'; -$lang['notes_input_btn_delete_note'] = 'Supprimer Note'; +$lang['notes_input_category'] = 'Catégorie'; +$lang['notes_input_notes_content'] = 'Contenu de la note '; +$lang['notes_input_btn_save_note'] = 'Enregistrer'; +$lang['notes_input_btn_edit_note'] = 'Editer'; +$lang['notes_input_btn_delete_note'] = 'Supprimer'; -$lang['notes_selection_general'] = 'General'; +$lang['notes_selection_general'] = 'Général'; $lang['notes_selection_antennas'] = 'Antennes'; $lang['notes_selection_satellites'] = 'Satellites'; diff --git a/application/language/french/qslcard_lang.php b/application/language/french/qslcard_lang.php index 88be760e0..c16c8a3ef 100644 --- a/application/language/french/qslcard_lang.php +++ b/application/language/french/qslcard_lang.php @@ -7,19 +7,22 @@ $lang['qslcard_string_disk_space'] = 'd\'espace disque pour stocker les actifs des cartes QSL'; $lang['qslcard_info'] = 'Info QSL'; -$lang['qslcard_sent'] = 'QSL Card has been sent'; -$lang['qslcard_sent_bureau'] = 'La carte QSL a été envoyé via le bureau'; -$lang['qslcard_sent_direct'] = 'La carte QSL a été envoyé via direct'; -$lang['qslcard_sent_electronic'] = 'QSL Card has been sent electronically'; -$lang['qslcard_sent_manager'] = 'QSL Card has been sent via manager'; -$lang['qslcard_rcvd'] = 'QSL Card has been received'; -$lang['qslcard_rcvd_bureau'] = 'La carte QSL a été reçue via the bureau'; -$lang['qslcard_rcvd_direct'] = 'La carte QSL a été reçue via direct'; +$lang['qslcard_sent'] = 'La carte QSL a été envoyée'; +$lang['qslcard_sent_bureau'] = 'La carte QSL a été envoyée via le bureau'; +$lang['qslcard_sent_direct'] = 'La carte QSL a été envoyée en direct'; +$lang['qslcard_sent_electronic'] = 'La carte QSL a été envoyée numériquement'; +$lang['qslcard_sent_manager'] = 'La carte QSL a été envoyée via QSL Manager'; +$lang['qslcard_rcvd'] = 'La carte QSL a été reçue'; +$lang['qslcard_rcvd_bureau'] = 'La carte QSL a été reçue via le bureau'; +$lang['qslcard_rcvd_direct'] = 'La carte QSL a été reçue en direct'; +$lang['qslcard_rcvd_electronic'] = 'La carte QSL a été reçue numériquement'; +$lang['qslcard_rcvd_manager'] = 'La carte QSL a été reçue via QSL Manager'; -$lang['qslcard_upload_front'] = 'Image de la face de la carte QSL envoyée'; -$lang['qslcard_upload_back'] = 'Image du dos de la carte QSL envoyée'; +$lang['qslcard_upload_front'] = 'Sélectionner l\'image \'recto\' de la QSL'; +$lang['qslcard_upload_back'] = 'Sélectionner l\'image \'verso\' de la QSL'; $lang['qslcard_upload_front'] = 'Uploaded QSL Card front image'; $lang['qslcard_upload_back'] = 'Uploaded QSL Card back image'; -$lang['qslcard_upload_button'] = 'Envoyer image de la carte QSL'; +$lang['qslcard_upload_button'] = 'Télécharger le(s) image(s) de la QSL'; + diff --git a/application/language/french/statistics_lang.php b/application/language/french/statistics_lang.php index 50a90e0d6..77155b4ac 100644 --- a/application/language/french/statistics_lang.php +++ b/application/language/french/statistics_lang.php @@ -2,22 +2,22 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['statistics_statistics'] = 'Statistics'; +$lang['statistics_statistics'] = 'Statistiques'; -$lang['statistics_explore_the_logbook'] = 'Explore the logbook.'; +$lang['statistics_explore_the_logbook'] = 'Informations sur le journal de trafic'; -$lang['statistics_years'] = 'Years'; -$lang['statistics_modes'] = 'Mode'; -$lang['statistics_bands'] = 'Bands'; -$lang['statistics_qsos'] = 'QSOs'; -$lang['statistics_unique_callsigns'] = 'Unique callsigns'; +$lang['statistics_years'] = 'Nb QSOs /An'; +$lang['statistics_modes'] = '% /Modes'; +$lang['statistics_bands'] = '% /Bandes'; +$lang['statistics_qsos'] = 'Nb QSOs /Bandes /Modes'; +$lang['statistics_unique_callsigns'] = 'Indicatif unique /Bandes /Modes'; $lang['statistics_total'] = 'Total'; -$lang['statistics_year'] = 'Year'; +$lang['statistics_year'] = 'Année'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; -$lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_number_of_qso_worked_each_year'] = 'Nombre de QSOs réalisés par an'; +$lang['statistics_number_of_qso_worked'] = 'QSOs réalisés'; /* * @@ -25,14 +25,14 @@ * */ -$lang['statistics_distances_worked'] = "Distances Worked"; -$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; -$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; -$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; -$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; -$lang['statistics_distances_qsos_with'] = "QSOs with"; -$lang['statistics_distances_and_band'] = "and band"; +$lang['statistics_distances_worked'] = 'Nombre de QSOs par plage de distances réalisées'; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = 'contacts utilisés pour le graphique.
    Le dernier contact réalisé est : '; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = ', avec le locator : '; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = ', pour une distance de : '; +$lang['statistics_distances_number_of_qsos'] = 'Nombre de QSOs'; +$lang['statistics_distances_callsigns_worked'] = 'Indicatif(s) contacté(s) (liste de 5 max)'; +$lang['statistics_distances_qsos_with'] = 'QSOs avec'; +$lang['statistics_distances_and_band'] = 'et bandes'; /* * @@ -40,5 +40,5 @@ * */ -$lang['statistics_timeline'] = "Timeline"; +$lang['statistics_timeline'] = 'Chronologie'; diff --git a/application/language/german/adif_lang.php b/application/language/german/adif_lang.php index c15174547..55ef8feeb 100644 --- a/application/language/german/adif_lang.php +++ b/application/language/german/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF Datei"; -$lang['adif_hint_no_info_in_file'] ="Wähle dies aus, wenn die hochgeladene ADIF-Datei diese Information nicht enthält."; +$lang['adif_hint_no_info_in_file'] = "Wähle dies aus, wenn die hochgeladene ADIF-Datei diese Information nicht enthält."; $lang['adif_import_dup'] = "Doppelte QSO hochladen"; $lang['adif_mark_imported_lotw'] = "Markiere hochgeladene QSO als bereits zu LoTW hochgeladen"; diff --git a/application/language/greek/adif_lang.php b/application/language/greek/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/greek/adif_lang.php +++ b/application/language/greek/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/italian/adif_lang.php b/application/language/italian/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/italian/adif_lang.php +++ b/application/language/italian/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/polish/adif_lang.php b/application/language/polish/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/polish/adif_lang.php +++ b/application/language/polish/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/russian/adif_lang.php b/application/language/russian/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/russian/adif_lang.php +++ b/application/language/russian/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/spanish/adif_lang.php b/application/language/spanish/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/spanish/adif_lang.php +++ b/application/language/spanish/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/swedish/adif_lang.php b/application/language/swedish/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/swedish/adif_lang.php +++ b/application/language/swedish/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/language/turkish/adif_lang.php b/application/language/turkish/adif_lang.php index 45e5196a9..4000ec252 100644 --- a/application/language/turkish/adif_lang.php +++ b/application/language/turkish/adif_lang.php @@ -32,7 +32,7 @@ // The File Input is translated by the Browser $lang['adif_file_label'] = "ADIF File"; -$lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; +$lang['adif_hint_no_info_in_file'] = "Select if ADIF being imported does not contain this information."; $lang['adif_import_dup'] = "Import duplicate QSOs"; $lang['adif_mark_imported_lotw'] = "Mark imported QSOs as uploaded to LoTW"; diff --git a/application/views/user/add.php b/application/views/user/add.php index aa3b9fcf2..d91184e42 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -578,7 +578,7 @@
    - ; - ; Date: Sat, 11 Nov 2023 21:30:45 +0100 Subject: [PATCH 103/121] Pass error message given by qrz.com to the user --- application/controllers/Logbook.php | 11 ++++++++--- application/libraries/Qrz.php | 2 +- application/views/search/result.php | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 37f469c3d..faffaef16 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -919,9 +919,14 @@ function search_result($id="", $id2="") { } $data['callsign'] = $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname')); - $CI = &get_instance(); - $CI->load->model('logbook_model'); - $data['grid_worked'] = $CI->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band')); + if (isset($data['callsign']['gridsquare'])) { + $CI = &get_instance(); + $CI->load->model('logbook_model'); + $data['grid_worked'] = $CI->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band')); + } + if (isset($data['callsign']['error'])) { + $data['error'] = $data['callsign']['error']; + } } /*else { // Lookup using hamli $this->load->library('hamli'); diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php index abb23bc9e..f87bd5afc 100755 --- a/application/libraries/Qrz.php +++ b/application/libraries/Qrz.php @@ -71,7 +71,7 @@ public function search($callsign, $key, $use_fullname = false) // Create XML object $xml = simplexml_load_string($xml); - if (empty($xml)) return; + if (!empty($xml->Session->Error)) return $data['error'] = $xml->Session->Error; // Return Required Fields $data['callsign'] = (string)$xml->Callsign->call; diff --git a/application/views/search/result.php b/application/views/search/result.php index 587c1c131..5e6b3274b 100644 --- a/application/views/search/result.php +++ b/application/views/search/result.php @@ -3,8 +3,8 @@

    Sorry, but we didn't find any past QSOs with

    -

    Callbook Search for

    + @@ -37,5 +37,9 @@
    + + +

    +
    From 5421e13f25ea803463c3fcf0bd58e78ba4b2921e Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 11 Nov 2023 22:38:05 +0100 Subject: [PATCH 104/121] Cover hamqth case for now with empty message --- application/controllers/Logbook.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index faffaef16..f0ff8f128 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -927,6 +927,8 @@ function search_result($id="", $id2="") { if (isset($data['callsign']['error'])) { $data['error'] = $data['callsign']['error']; } + } else { + $data['error'] = 'No result (qrz not configured)'; } /*else { // Lookup using hamli $this->load->library('hamli'); From d528b6b1399c4d4a5f08a33ee08a376891612c63 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 12 Nov 2023 12:38:35 +0100 Subject: [PATCH 105/121] fixed post reference --- application/views/view_log/qso.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 11db924f6..ace7f812c 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -377,7 +377,7 @@ config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
    -
    +
    Date: Sun, 12 Nov 2023 13:14:56 +0100 Subject: [PATCH 106/121] changed searchBar back to callsign --- application/views/interface_assets/footer.php | 4 ++-- application/views/interface_assets/header.php | 6 +++--- application/views/search/main.php | 2 +- application/views/view_log/qso.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index acd8656bf..1c945a5a4 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -924,8 +924,8 @@ function searchButtonPress(){ $(document).ready(function(){ - input->post('searchBar') != "") { ?> - $('#partial_view').load("logbook/search_result/input->post('searchBar')); ?>", function() { + input->post('callsign') != "") { ?> + $('#partial_view').load("logbook/search_result/input->post('callsign')); ?>", function() { $('[data-toggle="tooltip"]').tooltip() }); diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index a89ce6b27..3bc9bab99 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -244,7 +244,7 @@ function logQuicklog() { if (localStorage.getItem("quicklogCallsign") !== "") { localStorage.removeItem("quicklogCallsign"); } - localStorage.setItem("quicklogCallsign", $("input[name='searchBar']").val()); + localStorage.setItem("quicklogCallsign", $("input[name='callsign']").val()); window.open("", "_self"); } @@ -266,7 +266,7 @@ function handleKeyPress(event) {
    - +
    diff --git a/application/views/search/main.php b/application/views/search/main.php index baccd5c2e..78d36a6c8 100644 --- a/application/views/search/main.php +++ b/application/views/search/main.php @@ -30,7 +30,7 @@
    - +
    diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index ace7f812c..11db924f6 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -377,7 +377,7 @@ config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
    -
    +
    Date: Sun, 12 Nov 2023 15:34:18 +0100 Subject: [PATCH 107/121] loading MigrationVersion Model --- application/controllers/Debug.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application/controllers/Debug.php b/application/controllers/Debug.php index cca65943a..75bddc0ff 100644 --- a/application/controllers/Debug.php +++ b/application/controllers/Debug.php @@ -14,6 +14,10 @@ public function index() { $this->load->helper('file'); + $this->load->model('MigrationVersion'); + + $data['migration_version'] = $this->MigrationVersion->getMigrationVersion(); + // Test writing to backup folder $backup_folder = $this->is_really_writable('backup'); $data['backup_folder'] = $backup_folder; @@ -29,7 +33,7 @@ public function index() $data['page_title'] = "Debug"; $this->load->view('interface_assets/header', $data); - $this->load->view('debug/main'); + $this->load->view('debug/main', $data); $this->load->view('interface_assets/footer'); } From 2bab8a9633fe72ef6219548d9244763896a2e949 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 12 Nov 2023 15:34:32 +0100 Subject: [PATCH 108/121] show migration value from db --- application/views/debug/main.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/views/debug/main.php b/application/views/debug/main.php index 8c07bddd6..0b279ef2f 100644 --- a/application/views/debug/main.php +++ b/application/views/debug/main.php @@ -21,6 +21,11 @@ Base URL config->item('base_url'); ?> ")'> + + Migration + There is something wrong with your Migration in Database!"); ?> + +
    From 8e3f2e8d6ef0e1eb5e1e40f6932b6b9bb5946ff9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 12 Nov 2023 15:34:48 +0100 Subject: [PATCH 109/121] new MigrationVersion Model --- application/models/MigrationVersion.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 application/models/MigrationVersion.php diff --git a/application/models/MigrationVersion.php b/application/models/MigrationVersion.php new file mode 100644 index 000000000..bec7d47ab --- /dev/null +++ b/application/models/MigrationVersion.php @@ -0,0 +1,20 @@ +db->select_max('version'); + $query = $this->db->get('migrations'); + $migration_version = $query->row(); + + if ($query->num_rows() == 1) { + $migration_version = $query->row()->version; + return $migration_version; + } else { + return null; + } + } + +} + +?> From c55c3bb5947cdb30cc81d7b33fd0fce17c3e7f6f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 12 Nov 2023 15:41:10 +0100 Subject: [PATCH 110/121] $data already in the header --- application/controllers/Debug.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Debug.php b/application/controllers/Debug.php index 75bddc0ff..5d8d2a9c8 100644 --- a/application/controllers/Debug.php +++ b/application/controllers/Debug.php @@ -33,7 +33,7 @@ public function index() $data['page_title'] = "Debug"; $this->load->view('interface_assets/header', $data); - $this->load->view('debug/main', $data); + $this->load->view('debug/main'); $this->load->view('interface_assets/footer'); } From 3dbae9897d24f22a36f23cd7757f19e0b41cc59e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 12 Nov 2023 16:10:42 +0100 Subject: [PATCH 111/121] datetimepicker error in browser --- application/views/interface_assets/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index acd8656bf..913214277 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2335,7 +2335,7 @@ className: 'buttons-clear', $('[class*="buttons"]').css("color", "white"); } $('#eqsl_force_from_date').datetimepicker({ - format: 'YYYY/MM/DD', + format: 'YYYY/MM/DD' }); From 5e4e27bbf5ddeb2d173717d3965b788d23ca8d78 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 12 Nov 2023 16:25:54 +0100 Subject: [PATCH 112/121] fixing typo --- application/views/adif/import.php | 4 ++-- application/views/hrdlog/export.php | 2 +- application/views/qrz/export.php | 2 +- application/views/webadif/export.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/views/adif/import.php b/application/views/adif/import.php index c8e04aad4..8e6d7aa74 100644 --- a/application/views/adif/import.php +++ b/application/views/adif/import.php @@ -156,7 +156,7 @@

    - +
    @@ -213,7 +213,7 @@

    - +
    diff --git a/application/views/hrdlog/export.php b/application/views/hrdlog/export.php index 9b8662b41..8260ded01 100644 --- a/application/views/hrdlog/export.php +++ b/application/views/hrdlog/export.php @@ -80,7 +80,7 @@

    To date:

    - +
    diff --git a/application/views/qrz/export.php b/application/views/qrz/export.php index 95a89dd21..9a7b76b28 100644 --- a/application/views/qrz/export.php +++ b/application/views/qrz/export.php @@ -79,7 +79,7 @@

    To date:

    - +
    diff --git a/application/views/webadif/export.php b/application/views/webadif/export.php index ccfdb719f..80cabaa5e 100644 --- a/application/views/webadif/export.php +++ b/application/views/webadif/export.php @@ -104,7 +104,7 @@

    To date:

    - +
    From 53028d223d8c7dd32dbb6b371403ed5a7aec2df0 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 12 Nov 2023 16:29:37 +0100 Subject: [PATCH 113/121] datetimepicker --- application/views/interface_assets/footer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 913214277..42f6ba0d8 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2300,6 +2300,7 @@ function displayActivatorsContacts(call, band, leogeo) { ?> +