From 2fe5720da99cbfcf7f9ace7341e99f6e2cbe1a5f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 14 Oct 2023 20:12:48 +0200 Subject: [PATCH 01/30] Station DXCC Deleted Warning --- .../language/bulgarian/station_lang.php | 1 + .../chinese_simplified/station_lang.php | 1 + application/language/czech/station_lang.php | 1 + application/language/dutch/station_lang.php | 1 + application/language/english/station_lang.php | 1 + application/language/finnish/station_lang.php | 1 + application/language/french/station_lang.php | 1 + application/language/german/station_lang.php | 1 + application/language/greek/station_lang.php | 1 + application/language/italian/station_lang.php | 1 + application/language/polish/station_lang.php | 1 + application/language/russian/station_lang.php | 1 + application/language/spanish/station_lang.php | 1 + application/language/swedish/station_lang.php | 1 + application/language/turkish/station_lang.php | 1 + application/views/station_profile/create.php | 19 ++++++++ application/views/station_profile/edit.php | 48 ++++++++++++++----- 17 files changed, 71 insertions(+), 11 deletions(-) diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/english/station_lang.php b/application/language/english/station_lang.php index 8ab12cb44..be785f8f6 100644 --- a/application/language/english/station_lang.php +++ b/application/language/english/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index db0f3b100..fad5b2425 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Bist du sicher, dass du $lang['station_location_confirm_del_stationlocation_qso'] = 'Es werden alle QSO an diesem Stationsstandort gelöscht!'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = "Station DXCC Einteilung. Zum Beispiel: 'Federal Republic of Germany'"; +$lang['station_location_dxcc_warning'] = "Stoppe hier für einen Moment. Das von dir gewählte DXCC ist abgelaufen und nicht mehr gültig. Überprüfe, welches das richtige DXCC für den Standort der Station ist. Als Beispiel: Deutschland ist nicht mehr \'Germany\' sondern \'Federal Republic of Germany\'"; $lang['station_location_city'] = 'Station Stadt'; $lang['station_location_city_hint'] = 'Station Stadt. Zum Beispiel: Berlin'; $lang['station_location_state'] = 'Station Staat'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index 5d8e037a9..ce5d2c0f7 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 30d7a112b..bf73dcf3b 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -58,7 +58,26 @@ +
+ + +
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index e13deff45..2eda1248a 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -64,20 +64,46 @@
+
- - num_rows() > 0) { ?> - - - + + num_rows() > 0) { ?> + + + +
+ + +
From 262c0ea888ef93cc7fe8a7acd9a3b305d661bae5 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 14 Oct 2023 20:16:44 +0200 Subject: [PATCH 02/30] Pretty Code --- application/views/station_profile/create.php | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index bf73dcf3b..e8bebb6ef 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -62,20 +62,20 @@
- + From 4b0f32fd6a70c0c6c5c4dddaf3cec5e6e0906293 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 14 Oct 2023 21:05:33 +0200 Subject: [PATCH 03/30] js snippet of dxcc warning in footer --- application/views/interface_assets/footer.php | 15 ++++++++++++ application/views/station_profile/create.php | 24 ++++--------------- application/views/station_profile/edit.php | 24 ++++--------------- 3 files changed, 25 insertions(+), 38 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index d5ac95d34..ccf684fcd 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -541,6 +541,21 @@ $(document).ready(function() { }); + +
num_rows() > 0) { ?> @@ -60,24 +64,6 @@
- - -
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 2eda1248a..46b2d23d6 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -64,7 +64,11 @@
- + +
@@ -86,24 +90,6 @@
- - -
From 190d3cb0fddff01e847234ac3d99543b665b164a Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 15 Oct 2023 21:08:45 +0200 Subject: [PATCH 04/30] Generalize band and also use in QSO entry --- application/controllers/Qso.php | 1 + application/language/english/account_lang.php | 6 ++---- application/language/german/account_lang.php | 6 ++---- application/views/qso/index.php | 6 ++++-- application/views/user/add.php | 4 ++-- application/views/user/edit.php | 9 ++------- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index 395c8a678..c99d86ac1 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -38,6 +38,7 @@ class QSO extends CI_Controller { $data['iota'] = $this->logbook_model->fetchIota(); $data['modes'] = $this->modes->active(); $data['bands'] = $this->bands->get_user_bands_for_qso_entry(); + $data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band'); $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); $this->load->library('form_validation'); diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 42fac1b1d..41002e020 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index cf72c87d9..cec2a3673 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Anmeldung'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL des Mastodonservers'; -$lang['account_gridmap_settings'] = 'Einstellung der Planquadratkarte'; +$lang['account_default_band_settings'] = 'Einstellung für Standardband und -bestätigungsmethode'; $lang['account_gridmap_default_band'] = 'Standardband'; -$lang['account_qsl_settings'] = 'QSL-Methoden, die in der Planquadratkarte und beim anlegen eines QSOs angezeigt werden'; - - +$lang['account_qsl_settings'] = 'Standard QSL-Methoden'; diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 3f9a6850f..66dda5934 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -107,8 +107,10 @@ echo ''; foreach($bandgroup as $band) { echo ''."\n"; + if ($this->session->userdata('band') == $band || $user_gridmap_default_band == $band) { + echo ' selected'; + } + echo '>' . $band . ''."\n"; } echo ''; } diff --git a/application/views/user/add.php b/application/views/user/add.php index 2c57e3940..3003333f7 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -546,7 +546,7 @@
- +
@@ -564,7 +564,7 @@
- +
- +
@@ -562,13 +562,8 @@ } ?>
-
-
- -
-
- +
Date: Sun, 15 Oct 2023 21:25:47 +0200 Subject: [PATCH 05/30] Adapt other languages --- application/language/bulgarian/account_lang.php | 6 ++---- application/language/chinese_simplified/account_lang.php | 6 ++---- application/language/czech/account_lang.php | 6 ++---- application/language/dutch/account_lang.php | 6 ++---- application/language/finnish/account_lang.php | 6 ++---- application/language/french/account_lang.php | 6 ++---- application/language/greek/account_lang.php | 6 ++---- application/language/italian/account_lang.php | 6 ++---- application/language/polish/account_lang.php | 6 ++---- application/language/russian/account_lang.php | 6 ++---- application/language/spanish/account_lang.php | 6 ++---- application/language/swedish/account_lang.php | 6 ++---- application/language/turkish/account_lang.php | 6 ++---- 13 files changed, 26 insertions(+), 52 deletions(-) diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index c6cf047ad..9e0d1dbbe 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 93de5fee7..95137e8a4 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = '登录'; $lang['account_mastodon'] = 'Mastodon服务器'; $lang['account_user_mastodon'] = 'Mastodon 地址'; -$lang['account_gridmap_settings'] = '网格地图设置'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = '默认波段'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index 949d20803..a90109e9f 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Přihlásit se'; $lang['account_mastodon'] = 'Mastodon server'; $lang['account_user_mastodon'] = 'URL Mastodon serveru'; -$lang['account_gridmap_settings'] = 'Nastavení pro Mapu lokátorů'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Výchozí pásma'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 3e69e4044..0e9080668 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index fd39dc302..4c9f645d7 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Kirjaudu'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Gridsquare -kartan asetukset'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Oletusbandi'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index c01c9e7f3..62b046244 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index 0d6534450..1d3c64722 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 6e33c589a..b241c8094 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index 728841780..4422b3ce9 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 7895ac1fe..c6263c0fa 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Вход'; $lang['account_mastodon'] = 'Сервер Mastodon'; $lang['account_user_mastodon'] = 'URL профиля пользователя Mastodon'; -$lang['account_gridmap_settings'] = 'Настройки для карты квадратов'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Диапазон по умолчанию'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index 88edcc857..8be93609d 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index 545611052..90cd5dd25 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL till Mastodonserver'; -$lang['account_gridmap_settings'] = 'Inställningar för Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Standard Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 98300af57..efb04a524 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; From 983ad2c233a9b9d5f5178bec98012d44a3d7dfc2 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 10:42:26 +0200 Subject: [PATCH 06/30] Updated Lang --- application/language/bulgarian/station_lang.php | 2 +- application/language/chinese_simplified/station_lang.php | 2 +- application/language/czech/station_lang.php | 2 +- application/language/dutch/station_lang.php | 2 +- application/language/finnish/station_lang.php | 2 +- application/language/french/station_lang.php | 2 +- application/language/greek/station_lang.php | 2 +- application/language/italian/station_lang.php | 2 +- application/language/polish/station_lang.php | 2 +- application/language/russian/station_lang.php | 2 +- application/language/spanish/station_lang.php | 2 +- application/language/swedish/station_lang.php | 2 +- application/language/turkish/station_lang.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index ce5d2c0f7..471a2f4b5 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; From cf540407c87d6b934ab02330db1394cc5d81bf6f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 10:51:04 +0200 Subject: [PATCH 07/30] Changed Warning Color --- application/views/interface_assets/footer.php | 2 +- application/views/station_profile/create.php | 2 +- application/views/station_profile/edit.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index ccf684fcd..57cf9b53a 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -547,7 +547,7 @@ document.getElementById('dxcc_select').addEventListener('change', function() { var isDeleted = selectedOption.textContent.includes(""); if (isDeleted) { - this.style.border = '2px solid red'; + this.style.border = '2px solid rgb(217, 83, 79)'; warningMessage.innerText = lang_station_location_dxcc_warning; } else { this.style.border = ''; diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index c48b853d0..a58745811 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -62,7 +62,7 @@ -
+
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 46b2d23d6..d42f97020 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -88,7 +88,7 @@ -
+
From 9b2c4b713fc82fe37124bec2544d679e3bfac8d4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 11:22:26 +0200 Subject: [PATCH 08/30] Changed Style and added a sentence --- application/language/bulgarian/station_lang.php | 2 +- application/language/chinese_simplified/station_lang.php | 2 +- application/language/czech/station_lang.php | 2 +- application/language/dutch/station_lang.php | 2 +- application/language/english/station_lang.php | 2 +- application/language/finnish/station_lang.php | 2 +- application/language/french/station_lang.php | 2 +- application/language/german/station_lang.php | 2 +- application/language/greek/station_lang.php | 2 +- application/language/italian/station_lang.php | 2 +- application/language/polish/station_lang.php | 2 +- application/language/russian/station_lang.php | 2 +- application/language/spanish/station_lang.php | 2 +- application/language/swedish/station_lang.php | 2 +- application/language/turkish/station_lang.php | 2 +- application/views/station_profile/create.php | 2 +- application/views/station_profile/edit.php | 2 +- assets/css/general.css | 5 +++++ 18 files changed, 22 insertions(+), 17 deletions(-) diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/english/station_lang.php b/application/language/english/station_lang.php index be785f8f6..53b7fc39e 100644 --- a/application/language/english/station_lang.php +++ b/application/language/english/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index fad5b2425..2d9df402a 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Bist du sicher, dass du $lang['station_location_confirm_del_stationlocation_qso'] = 'Es werden alle QSO an diesem Stationsstandort gelöscht!'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = "Station DXCC Einteilung. Zum Beispiel: 'Federal Republic of Germany'"; -$lang['station_location_dxcc_warning'] = "Stoppe hier für einen Moment. Das von dir gewählte DXCC ist abgelaufen und nicht mehr gültig. Überprüfe, welches das richtige DXCC für den Standort der Station ist. Als Beispiel: Deutschland ist nicht mehr \'Germany\' sondern \'Federal Republic of Germany\'"; +$lang['station_location_dxcc_warning'] = "Stoppe hier für einen Moment. Das von dir gewählte DXCC ist abgelaufen und nicht mehr gültig. Überprüfe, welches das richtige DXCC für den Standort der Station ist. Als Beispiel: Deutschland ist nicht mehr \'Germany\' sondern \'Federal Republic of Germany\'. Wenn du dir sicher bist, ignoriere diese Warnung."; $lang['station_location_city'] = 'Station Stadt'; $lang['station_location_city_hint'] = 'Station Stadt. Zum Beispiel: Berlin'; $lang['station_location_state'] = 'Station Staat'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index 471a2f4b5..eb8bd0be9 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index a58745811..1a41eef10 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -62,7 +62,7 @@ -
+
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index d42f97020..37c6d45e3 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -88,7 +88,7 @@ -
+
diff --git a/assets/css/general.css b/assets/css/general.css index 6a9794d73..9664f88e9 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -537,3 +537,8 @@ div#station_logbooks_linked_table_paginate { #dx, #state, #gridsquare, #sota, #wwff, #pota { text-transform: uppercase; } + +#warningMessage { + color: white !Important; + background-color: rgb(217, 83, 79) !Important; +} From d01813730837d6d4760461fa353af07e70605a79 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 17:04:48 +0200 Subject: [PATCH 09/30] changed to jquery, used bootstrap alerts --- application/views/interface_assets/footer.php | 23 +++++++++++-------- application/views/station_profile/create.php | 7 ++---- application/views/station_profile/edit.php | 7 ++---- assets/css/general.css | 5 ---- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 57cf9b53a..30f1cea42 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -542,17 +542,22 @@ $(document).ready(function() { diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 1a41eef10..6408889eb 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -46,10 +46,7 @@
- +
num_rows() > 0) { ?> @@ -62,7 +59,7 @@ -
+
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 37c6d45e3..f8a24a0f5 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -65,10 +65,7 @@
- +
@@ -88,7 +85,7 @@ -
+
diff --git a/assets/css/general.css b/assets/css/general.css index 9664f88e9..6a9794d73 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -537,8 +537,3 @@ div#station_logbooks_linked_table_paginate { #dx, #state, #gridsquare, #sota, #wwff, #pota { text-transform: uppercase; } - -#warningMessage { - color: white !Important; - background-color: rgb(217, 83, 79) !Important; -} From 4ab1200c56c91641d5deb658a1df7152ede4aa7e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 17:06:07 +0200 Subject: [PATCH 10/30] Removed unnecessary comments --- application/views/station_profile/create.php | 2 -- application/views/station_profile/edit.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 6408889eb..6c187ad29 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -45,8 +45,6 @@
- -
num_rows() > 0) { ?> diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index f8a24a0f5..5da5c6c25 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -64,8 +64,6 @@
- -
From 886829ba426c3ec5d11ccde117386f5427fbb0aa Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 16 Oct 2023 22:39:33 +0200 Subject: [PATCH 11/30] Rename default band and confirmation values in DB --- application/config/migration.php | 2 +- application/controllers/Activated_gridmap.php | 4 +-- application/controllers/Gridmap.php | 4 +-- application/controllers/Logbook.php | 32 ++++++++--------- application/controllers/Qso.php | 2 +- application/controllers/User.php | 28 +++++++-------- .../145_rename_gridmap_variables.php | 34 +++++++++++++++++++ application/models/Logbook_model.php | 8 ++--- application/models/User_model.php | 14 ++++---- application/views/activated_gridmap/index.php | 10 +++--- application/views/gridmap/index.php | 10 +++--- application/views/qso/index.php | 2 +- application/views/user/add.php | 24 ++++++------- application/views/user/edit.php | 24 ++++++------- 14 files changed, 116 insertions(+), 82 deletions(-) create mode 100644 application/migrations/145_rename_gridmap_variables.php diff --git a/application/config/migration.php b/application/config/migration.php index ba2ca6cf8..f1c279091 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 144; +$config['migration_version'] = 145; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/Activated_gridmap.php b/application/controllers/Activated_gridmap.php index a91edd907..a15ec91e2 100644 --- a/application/controllers/Activated_gridmap.php +++ b/application/controllers/Activated_gridmap.php @@ -19,8 +19,8 @@ class Activated_gridmap extends CI_Controller { $data['bands'] = $this->bands->get_worked_bands(); $data['sats_available'] = $this->bands->get_worked_sats(); - $data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band'); - $data['user_gridmap_confirmation'] = $this->session->userdata('user_gridmap_confirmation'); + $data['user_default_band'] = $this->session->userdata('user_default_band'); + $data['user_default_confirmation'] = $this->session->userdata('user_default_confirmation'); $data['layer'] = $this->optionslib->get_option('option_map_tile_server'); diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php index cc28c06e6..02b22838e 100644 --- a/application/controllers/Gridmap.php +++ b/application/controllers/Gridmap.php @@ -19,8 +19,8 @@ class Gridmap extends CI_Controller { $data['bands'] = $this->bands->get_worked_bands(); $data['sats_available'] = $this->bands->get_worked_sats(); - $data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band'); - $data['user_gridmap_confirmation'] = $this->session->userdata('user_gridmap_confirmation'); + $data['user_default_band'] = $this->session->userdata('user_default_band'); + $data['user_default_confirmation'] = $this->session->userdata('user_default_confirmation'); $data['layer'] = $this->optionslib->get_option('option_map_tile_server'); diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index bb0084c00..d5484a23e 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -201,20 +201,20 @@ class Logbook extends CI_Controller { $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); - $user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); + $user_default_confirmation = $this->session->userdata('user_default_confirmation'); if(!empty($logbooks_locations_array)) { $extrawhere=''; - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { $extrawhere="COL_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } @@ -304,7 +304,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode) "workedBefore" => false, "confirmed" => false, ]; - $user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); + $user_default_confirmation = $this->session->userdata('user_default_confirmation'); $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -330,16 +330,16 @@ function worked_grid_before($gridsquare, $type, $band, $mode) $extrawhere=''; - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { $extrawhere="COL_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } @@ -386,7 +386,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode) "confirmed" => false, ]; - $user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); + $user_default_confirmation = $this->session->userdata('user_default_confirmation'); $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -412,16 +412,16 @@ function worked_grid_before($gridsquare, $type, $band, $mode) } $extrawhere=''; - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { $extrawhere="COL_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } @@ -481,7 +481,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode) "confirmed" => false, ]; - $user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); + $user_default_confirmation = $this->session->userdata('user_default_confirmation'); $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -507,16 +507,16 @@ function worked_grid_before($gridsquare, $type, $band, $mode) } $extrawhere=''; - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { $extrawhere="COL_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index c99d86ac1..5fa968f1d 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -38,7 +38,7 @@ class QSO extends CI_Controller { $data['iota'] = $this->logbook_model->fetchIota(); $data['modes'] = $this->modes->active(); $data['bands'] = $this->bands->get_user_bands_for_qso_entry(); - $data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band'); + $data['user_default_band'] = $this->session->userdata('user_default_band'); $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); $this->load->library('form_validation'); diff --git a/application/controllers/User.php b/application/controllers/User.php index 90afaf026..57b8e0ecb 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -88,8 +88,8 @@ class User extends CI_Controller { $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type'); $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); - $data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band'); - $data['user_gridmap_confirmation'] = ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''); + $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['language'] = $this->input->post('language'); $this->load->view('user/add', $data); } else { @@ -123,8 +123,8 @@ class User extends CI_Controller { $this->input->post('user_previous_qsl_type'), $this->input->post('user_amsat_status_upload'), $this->input->post('user_mastodon_url'), - $this->input->post('user_gridmap_default_band'), - ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''), + $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('language'), )) { // Check for errors @@ -170,8 +170,8 @@ class User extends CI_Controller { $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type'); $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); - $data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band'); - $data['user_gridmap_confirmation'] = ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''); + $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['language'] = $this->input->post('language'); $this->load->view('user/add', $data); $this->load->view('interface_assets/footer'); @@ -413,16 +413,16 @@ class User extends CI_Controller { $data['user_mastodon_url'] = $q->user_mastodon_url; } - if($this->input->post('user_gridmap_default_band')) { - $data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band', false); + if($this->input->post('user_default_band')) { + $data['user_default_band'] = $this->input->post('user_default_band', false); } else { - $data['user_gridmap_default_band'] = $q->user_gridmap_default_band; + $data['user_default_band'] = $q->user_default_band; } - if($this->input->post('user_gridmap_confirmation')) { - $data['user_gridmap_confirmation'] = ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''); + if($this->input->post('user_default_confirmation')) { + $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' : ''); } else { - $data['user_gridmap_confirmation'] = $q->user_gridmap_confirmation; + $data['user_default_confirmation'] = $q->user_default_confirmation; } if($this->input->post('user_column1')) { @@ -527,8 +527,8 @@ class User extends CI_Controller { $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type'); $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); - $data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band'); - $data['user_gridmap_confirmation'] = ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''); + $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['language'] = $this->input->post('language'); $data['user_winkey'] = $this->input->post('user_winkey'); $this->load->view('user/edit'); diff --git a/application/migrations/145_rename_gridmap_variables.php b/application/migrations/145_rename_gridmap_variables.php new file mode 100644 index 000000000..8b183b8a5 --- /dev/null +++ b/application/migrations/145_rename_gridmap_variables.php @@ -0,0 +1,34 @@ +db->field_exists('user_gridmap_default_band', 'users')) { + $this->db->query("ALTER TABLE `users` CHANGE `user_gridmap_default_band` `user_default_band` VARCHAR(10) DEFAULT NULL;"); + } + if ($this->db->field_exists('user_default_confirmation', 'users')) { + $this->db->query("ALTER TABLE `users` CHANGE `user_default_confirmation` `user_default_confirmation` VARCHAR(3) DEFAULT NULL;"); + } + } + + public function down() + { + if ($this->db->field_exists('user_default_band', 'users')) { + $this->db->query("ALTER TABLE `users` CHANGE `user_default_band` `user_gridmap_default_band` VARCHAR(10) DEFAULT NULL;"); + } + if ($this->db->field_exists('user_default_confirmation', 'users')) { + $this->db->query("ALTER TABLE `users` CHANGE `user_default_confirmation` `user_default_confirmation` VARCHAR(3) DEFAULT NULL;"); + } + } +} diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index c0b3f6849..314a5da42 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1688,7 +1688,7 @@ class Logbook_model extends CI_Model { } function check_if_callsign_cnfmd_in_logbook($callsign, $StationLocationsArray = null, $band = null) { - $user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); + $user_default_confirmation = $this->session->userdata('user_default_confirmation'); if($StationLocationsArray == null) { $CI =& get_instance(); @@ -1699,16 +1699,16 @@ class Logbook_model extends CI_Model { } $extrawhere=''; - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { $extrawhere="COL_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } diff --git a/application/models/User_model.php b/application/models/User_model.php index 57dadbdfa..4b34c6647 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -124,7 +124,7 @@ class User_Model extends CI_Model { $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_gridmap_default_band, $user_gridmap_confirmation, $language) { + $user_default_band, $user_default_confirmation, $language) { // Check that the user isn't already used if(!$this->exists($username)) { $data = array( @@ -154,8 +154,8 @@ class User_Model extends CI_Model { 'user_previous_qsl_type' => xss_clean($user_previous_qsl_type), 'user_amsat_status_upload' => xss_clean($user_amsat_status_upload), 'user_mastodon_url' => xss_clean($user_mastodon_url), - 'user_gridmap_default_band' => xss_clean($user_gridmap_default_band), - 'user_gridmap_confirmation' => xss_clean($user_gridmap_confirmation), + 'user_default_band' => xss_clean($user_default_band), + 'user_default_confirmation' => xss_clean($user_default_confirmation), 'language' => xss_clean($language), ); @@ -215,8 +215,8 @@ class User_Model extends CI_Model { 'user_previous_qsl_type' => xss_clean($fields['user_previous_qsl_type']), 'user_amsat_status_upload' => xss_clean($fields['user_amsat_status_upload']), 'user_mastodon_url' => xss_clean($fields['user_mastodon_url']), - 'user_gridmap_default_band' => xss_clean($fields['user_gridmap_default_band']), - 'user_gridmap_confirmation' => (isset($fields['user_gridmap_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_gridmap_confirmation_lotw']) ? 'L' : '').(isset($fields['user_gridmap_confirmation_eqsl']) ? 'E' : ''), + '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' : ''), 'language' => xss_clean($fields['language']), 'winkey' => xss_clean($fields['user_winkey']), ); @@ -341,8 +341,8 @@ class User_Model extends CI_Model { 'user_previous_qsl_type' => isset($u->row()->user_previous_qsl_type) ? $u->row()->user_previous_qsl_type: 0, 'user_amsat_status_upload' => isset($u->row()->user_amsat_status_upload) ? $u->row()->user_amsat_status_upload: 0, 'user_mastodon_url' => $u->row()->user_mastodon_url, - 'user_gridmap_default_band' => $u->row()->user_gridmap_default_band, - 'user_gridmap_confirmation' => $u->row()->user_gridmap_confirmation, + 'user_default_band' => $u->row()->user_default_band, + 'user_default_confirmation' => $u->row()->user_default_confirmation, 'active_station_logbook' => $u->row()->active_station_logbook, 'language' => isset($u->row()->language) ? $u->row()->language: 'english', 'isWinkeyEnabled' => $u->row()->winkey, diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 8a21a5513..0a39b452e 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -52,7 +52,7 @@ '.$band.''."\n"; @@ -60,7 +60,7 @@ - disabled> ' . $sat . ''."\n"; @@ -84,7 +84,7 @@
'; ?> @@ -92,7 +92,7 @@
'; ?> @@ -100,7 +100,7 @@
'; ?> diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index baa60b77e..a79bfea10 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -52,7 +52,7 @@ '.$band.''."\n"; @@ -60,7 +60,7 @@ - disabled> ' . $sat . ''."\n"; @@ -84,7 +84,7 @@
'; ?> @@ -92,7 +92,7 @@
'; ?> @@ -100,7 +100,7 @@
'; ?> diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 66dda5934..e8ef6e168 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -107,7 +107,7 @@ echo ''; foreach($bandgroup as $band) { echo ''."\n"; diff --git a/application/views/user/add.php b/application/views/user/add.php index 3003333f7..9d6c1e52c 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -550,13 +550,13 @@
- + - ; '.$band.''."\n"; @@ -566,28 +566,28 @@
- '; ?> - +
- '; ?> - +
- '; ?> - +
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index b4972fab2..423e81a0a 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -549,13 +549,13 @@
- + - ; '.$band.''."\n"; @@ -565,28 +565,28 @@
- '; ?> - +
- '; ?> - +
- '; ?> - +
From 6a0290aead9516725de0535f4d79118d72e1481a Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 16 Oct 2023 23:01:22 +0200 Subject: [PATCH 12/30] Fix c+p mistake --- application/migrations/145_rename_gridmap_variables.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/migrations/145_rename_gridmap_variables.php b/application/migrations/145_rename_gridmap_variables.php index 8b183b8a5..9d84c2f67 100644 --- a/application/migrations/145_rename_gridmap_variables.php +++ b/application/migrations/145_rename_gridmap_variables.php @@ -17,8 +17,8 @@ class Migration_rename_gridmap_variables extends CI_Migration { if ($this->db->field_exists('user_gridmap_default_band', 'users')) { $this->db->query("ALTER TABLE `users` CHANGE `user_gridmap_default_band` `user_default_band` VARCHAR(10) DEFAULT NULL;"); } - if ($this->db->field_exists('user_default_confirmation', 'users')) { - $this->db->query("ALTER TABLE `users` CHANGE `user_default_confirmation` `user_default_confirmation` VARCHAR(3) DEFAULT NULL;"); + if ($this->db->field_exists('user_gridmap_confirmation', 'users')) { + $this->db->query("ALTER TABLE `users` CHANGE `user_gridmap_confirmation` `user_default_confirmation` VARCHAR(3) DEFAULT NULL;"); } } From 180a020923233f05df3d54a9b164537c32cf88c4 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 17 Oct 2023 05:53:42 +0200 Subject: [PATCH 13/30] Fix typo in downgrade migration --- application/migrations/145_rename_gridmap_variables.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/migrations/145_rename_gridmap_variables.php b/application/migrations/145_rename_gridmap_variables.php index 9d84c2f67..cba66f0c6 100644 --- a/application/migrations/145_rename_gridmap_variables.php +++ b/application/migrations/145_rename_gridmap_variables.php @@ -28,7 +28,7 @@ class Migration_rename_gridmap_variables extends CI_Migration { $this->db->query("ALTER TABLE `users` CHANGE `user_default_band` `user_gridmap_default_band` VARCHAR(10) DEFAULT NULL;"); } if ($this->db->field_exists('user_default_confirmation', 'users')) { - $this->db->query("ALTER TABLE `users` CHANGE `user_default_confirmation` `user_default_confirmation` VARCHAR(3) DEFAULT NULL;"); + $this->db->query("ALTER TABLE `users` CHANGE `user_default_confirmation` `user_gridmap_confirmation` VARCHAR(3) DEFAULT NULL;"); } } } From fc18464c47e571829ffa915f5250ca73659dd54b Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 17 Oct 2023 10:13:58 +0000 Subject: [PATCH 14/30] DupeSearch JS --- assets/js/sections/logbookadvanced.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index e386c14d6..1acff398d 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -283,6 +283,7 @@ $(document).ready(function () { pota: this.pota.value, wwff: this.wwff.value, qslimages: this.qslimages.value, + dupes: this.dupes.value, }, dataType: 'json', success: function (data) { @@ -502,6 +503,10 @@ $(document).ready(function () { quickSearch('pota'); }); + $('#dupeButton').click(function (event) { + dupeSearch(); + }); + $('#optionButton').click(function (event) { $('#optionButton').prop("disabled", true); $.ajax({ @@ -588,6 +593,12 @@ $(document).ready(function () { }); }); + function dupeSearch() { + $('#searchForm').trigger("reset"); + $("#dupes").val("Y"); + $('#searchForm').submit(); + } + function quickSearch(type) { var elements = $('#qsoList tbody input:checked'); var nElements = elements.length; @@ -672,6 +683,7 @@ $(document).ready(function () { }); $('#searchForm').on('reset', function(e) { + $("#dupes").val(""); setTimeout(function() { $('#searchForm').submit(); }); From cf084f577c7216546360dc9daecdcf00448c3b7e Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 17 Oct 2023 10:14:10 +0000 Subject: [PATCH 15/30] DupeSearch Lang & PHP-Logic --- application/controllers/Logbookadvanced.php | 1 + application/language/english/filter_lang.php | 3 ++- application/language/german/filter_lang.php | 3 ++- application/models/Logbookadvanced_model.php | 14 ++++++++++++++ application/views/logbookadvanced/index.php | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 617b8bbc4..8f290e81c 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -124,6 +124,7 @@ class Logbookadvanced extends CI_Controller { 'pota' => xss_clean($this->input->post('pota')), 'wwff' => xss_clean($this->input->post('wwff')), 'qslimages' => xss_clean($this->input->post('qslimages')), + 'dupes' => xss_clean($this->input->post('dupes')), ); $qsos = []; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 288364a3a..e19513bbc 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -15,6 +15,7 @@ $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'; @@ -153,4 +154,4 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php -$lang['filter_options_close'] = 'Close'; \ No newline at end of file +$lang['filter_options_close'] = 'Close'; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index 416937c9f..4f7bd3138 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -15,6 +15,7 @@ $lang['filter_filters'] = 'Filter'; $lang['filter_actions'] = 'Aktionen'; $lang['filter_results'] = '# Resultate'; $lang['filter_search'] = 'Suche'; +$lang['filter_dupes'] = 'Doppelte'; $lang['filter_map'] = 'Karte'; $lang['filter_options'] = 'Optionen'; $lang['filter_reset'] = 'Reset'; @@ -153,4 +154,4 @@ $lang['filter_options_show'] = 'Anzeigen'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php -$lang['filter_options_close'] = 'Schliessen'; \ No newline at end of file +$lang['filter_options_close'] = 'Schliessen'; diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 20fa1a3b9..c9cb793d8 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -7,6 +7,20 @@ class Logbookadvanced_model extends CI_Model { $conditions = []; $binding = [$searchCriteria['user_id']]; + if ($searchCriteria['dupes'] !== '') { + $id_sql="select group_concat(x.qsoids separator ',') as QSO_IDs from ( + select GROUP_CONCAT(col_primary_key separator ',') as qsoids, COL_CALL, COL_MODE, COL_SUBMODE, station_callsign, COL_SAT_NAME, COL_BAND, min(col_time_on) Mintime, max(col_time_on) Maxtime from + TABLE_HRD_CONTACTS_V01 join station_profile on TABLE_HRD_CONTACTS_V01.station_id = station_profile.station_id where station_profile.user_id=? + group by col_call, col_mode, COL_SUBMODE, STATION_CALLSIGN, col_band, COL_SAT_NAME having count(*) > 1 and timediff(maxtime, mintime) < 3000) x"; + $id_query = $this->db->query($id_sql, $searchCriteria['user_id']); + foreach ($id_query->result() as $id) { + $ids2fetch=$id->QSO_IDs; + } + if ($ids2fetch !== '') { + $conditions[] = "qsos.COL_PRIMARY_KEY in (".$ids2fetch.")"; + } + } + if ($searchCriteria['dateFrom'] !== '') { $from = DateTime::createFromFormat('d/m/Y', $searchCriteria['dateFrom']); $from = $from->format('Y-m-d'); diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index cf67e3b14..c1256f5ed 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -53,6 +53,7 @@ $options = json_decode($options);
" method="post"> +
@@ -390,6 +391,7 @@ $options = json_decode($options); + From 9e633d3b86997cbb5d175fdf11e9b46168686980 Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 17 Oct 2023 10:22:02 +0000 Subject: [PATCH 16/30] Added dupe-element to every lang-file --- application/language/bulgarian/filter_lang.php | 1 + application/language/chinese_simplified/filter_lang.php | 1 + application/language/czech/filter_lang.php | 1 + application/language/dutch/filter_lang.php | 1 + application/language/english/filter_lang.php | 2 +- application/language/finnish/filter_lang.php | 1 + application/language/french/filter_lang.php | 1 + application/language/german/filter_lang.php | 2 +- application/language/greek/filter_lang.php | 1 + application/language/italian/filter_lang.php | 1 + application/language/polish/filter_lang.php | 1 + application/language/russian/filter_lang.php | 1 + application/language/spanish/filter_lang.php | 1 + application/language/swedish/filter_lang.php | 1 + application/language/turkish/filter_lang.php | 1 + 15 files changed, 15 insertions(+), 2 deletions(-) diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index e19513bbc..02876376f 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -15,7 +15,7 @@ $lang['filter_filters'] = 'Filters'; $lang['filter_actions'] = 'Actions'; $lang['filter_results'] = '# Results'; $lang['filter_search'] = 'Search'; -$lang['filter_dupes'] = 'Dupes'; +$lang['filter_dupes'] = "Dupes"; $lang['filter_map'] = 'Map'; $lang['filter_options'] = 'Options'; $lang['filter_reset'] = 'Reset'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index cea415fc8..94cdce6e4 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -15,6 +15,7 @@ $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'] = 'Suche zurücksetzen'; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index 4f7bd3138..a2bd57bb4 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -15,7 +15,7 @@ $lang['filter_filters'] = 'Filter'; $lang['filter_actions'] = 'Aktionen'; $lang['filter_results'] = '# Resultate'; $lang['filter_search'] = 'Suche'; -$lang['filter_dupes'] = 'Doppelte'; +$lang['filter_dupes'] = "Dupes"; $lang['filter_map'] = 'Karte'; $lang['filter_options'] = 'Optionen'; $lang['filter_reset'] = 'Reset'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -15,6 +15,7 @@ $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'; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 288364a3a..23de947fc 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -15,6 +15,7 @@ $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'; From 1d33c5d938f68c39ad2834f42761fde4d798f12b Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 17 Oct 2023 10:23:51 +0000 Subject: [PATCH 17/30] Maintable as var --- application/models/Logbookadvanced_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index c9cb793d8..eb150267c 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -9,8 +9,8 @@ class Logbookadvanced_model extends CI_Model { if ($searchCriteria['dupes'] !== '') { $id_sql="select group_concat(x.qsoids separator ',') as QSO_IDs from ( - select GROUP_CONCAT(col_primary_key separator ',') as qsoids, COL_CALL, COL_MODE, COL_SUBMODE, station_callsign, COL_SAT_NAME, COL_BAND, min(col_time_on) Mintime, max(col_time_on) Maxtime from - TABLE_HRD_CONTACTS_V01 join station_profile on TABLE_HRD_CONTACTS_V01.station_id = station_profile.station_id where station_profile.user_id=? + select GROUP_CONCAT(col_primary_key separator ',') as qsoids, COL_CALL, COL_MODE, COL_SUBMODE, station_callsign, COL_SAT_NAME, COL_BAND, min(col_time_on) Mintime, max(col_time_on) Maxtime from " . $this->config->item('table_name') . " + join station_profile on " . $this->config->item('table_name') . ".station_id = station_profile.station_id where station_profile.user_id=? group by col_call, col_mode, COL_SUBMODE, STATION_CALLSIGN, col_band, COL_SAT_NAME having count(*) > 1 and timediff(maxtime, mintime) < 3000) x"; $id_query = $this->db->query($id_sql, $searchCriteria['user_id']); foreach ($id_query->result() as $id) { From 2660aba8eaa56dc5ed55d63456733d60b314c911 Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 17 Oct 2023 12:23:40 +0000 Subject: [PATCH 18/30] Small bugfix if no dupe is found --- application/models/Logbookadvanced_model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index eb150267c..7ea86004a 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -16,8 +16,10 @@ class Logbookadvanced_model extends CI_Model { foreach ($id_query->result() as $id) { $ids2fetch=$id->QSO_IDs; } - if ($ids2fetch !== '') { + if ($ids2fetch ?? '' !== '') { $conditions[] = "qsos.COL_PRIMARY_KEY in (".$ids2fetch.")"; + } else { + $conditions[] = "1=0"; } } From 2bc95722ea8d5a06fbf7035c782721297b977e22 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 17 Oct 2023 15:07:54 +0200 Subject: [PATCH 19/30] fixed c+p bug --- application/views/logbookadvanced/index.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index c1256f5ed..035874316 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -342,34 +342,34 @@ $options = json_decode($options); dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> - dx->show ?? "true") == "true") { ?> -
From eda0d3cf3c4650f37ff5d77b043c1a70165ac47e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 17 Oct 2023 15:22:19 +0200 Subject: [PATCH 20/30] Added some new Translations --- application/language/bulgarian/admin_lang.php | 1 + application/language/bulgarian/general_words_lang.php | 2 ++ application/language/chinese_simplified/admin_lang.php | 1 + application/language/chinese_simplified/general_words_lang.php | 2 ++ application/language/czech/admin_lang.php | 1 + application/language/czech/general_words_lang.php | 2 ++ application/language/dutch/admin_lang.php | 1 + application/language/dutch/general_words_lang.php | 2 ++ application/language/english/admin_lang.php | 1 + application/language/english/general_words_lang.php | 2 ++ application/language/finnish/admin_lang.php | 1 + application/language/finnish/general_words_lang.php | 2 ++ application/language/french/admin_lang.php | 1 + application/language/french/general_words_lang.php | 2 ++ application/language/german/admin_lang.php | 1 + application/language/german/general_words_lang.php | 2 ++ application/language/greek/admin_lang.php | 1 + application/language/greek/general_words_lang.php | 2 ++ application/language/italian/admin_lang.php | 1 + application/language/italian/general_words_lang.php | 2 ++ application/language/polish/admin_lang.php | 1 + application/language/polish/general_words_lang.php | 2 ++ application/language/russian/admin_lang.php | 1 + application/language/russian/general_words_lang.php | 2 ++ application/language/spanish/admin_lang.php | 1 + application/language/spanish/general_words_lang.php | 2 ++ application/language/swedish/admin_lang.php | 1 + application/language/swedish/general_words_lang.php | 2 ++ application/language/turkish/admin_lang.php | 1 + application/language/turkish/general_words_lang.php | 2 ++ 30 files changed, 45 insertions(+) diff --git a/application/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php index 74959c858..b0ac319d6 100644 --- a/application/language/bulgarian/admin_lang.php +++ b/application/language/bulgarian/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Edit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index d3e8069a9..ad60d22b5 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Инфо'; $lang['general_word_choose_file'] = 'Изберете файл'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Час'; diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index 66b2c7f9c..5c40dce0d 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = '设置'; $lang['admin_create_user'] = '创建用户'; $lang['admin_delete'] = '删除用户'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = '编辑用户'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 1ba39a62f..fe9491ab9 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = '消息'; $lang['general_word_choose_file'] = '选择文件'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = '日期'; $lang['general_word_time'] = '时间'; diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php index c8999c96b..b32aedaf2 100644 --- a/application/language/czech/admin_lang.php +++ b/application/language/czech/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Možnosti'; $lang['admin_create_user'] = 'Vytvořit uživatele'; $lang['admin_delete'] = 'Smazat'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Upravit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index ddf2b921a..5e888a953 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Vybrat soubor'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Čas'; diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php index 06b4b1527..2972aa4e4 100644 --- a/application/language/dutch/admin_lang.php +++ b/application/language/dutch/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Edit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index c4a681932..59fb0f8fc 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Choose file'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Tijd'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index 125504d10..03f93baae 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Edit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 677fa46f3..7d8f45497 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Choose file'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Time'; diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php index f1ada5357..2bb11e055 100644 --- a/application/language/finnish/admin_lang.php +++ b/application/language/finnish/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Valinnat'; $lang['admin_create_user'] = 'Luo käyttäjä'; $lang['admin_delete'] = 'Poista'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Muokkaa'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 8aa4b7413..4280b539e 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Valitse tiedosto'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Päivä'; $lang['general_word_time'] = 'Aika'; diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index 4aa4bde5c..7f591a52d 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Creation d\'un utilisateur'; $lang['admin_delete'] = 'Supprimer'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Editer'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index aae52ca19..95a96b1ce 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Information'; $lang['general_word_choose_file'] = 'Choose file'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Heure'; diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index a4d531693..2e958b854 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Optionen'; $lang['admin_create_user'] = 'Benutzer anlegen'; $lang['admin_delete'] = 'Löschen'; +$lang['admin_remove'] = "Entfernen"; $lang['admin_edit'] = 'Bearbeiten'; $lang['admin_create'] = 'Erstelle'; $lang['admin_update'] = 'Aktualisiere'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 3bad33597..5c180e170 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Datei wählen'; $lang['general_word_next'] = 'Weiter'; $lang['general_word_previous'] = 'Zurück'; +$lang['general_word_enabled'] = "Eingeschaltet"; +$lang['general_word_disabled'] = "Ausgeschaltet"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Zeit'; diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php index 125504d10..03f93baae 100644 --- a/application/language/greek/admin_lang.php +++ b/application/language/greek/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Edit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 840397525..55dbd5610 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Πληροφορίες'; $lang['general_word_choose_file'] = 'Επιλογή αρχείου'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Ημερομηνία'; $lang['general_word_time'] = 'Ωρα'; diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php index 125504d10..03f93baae 100644 --- a/application/language/italian/admin_lang.php +++ b/application/language/italian/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Edit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 5a3fbebac..f632cd5e0 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Scegli file'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Orario'; diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php index 125504d10..03f93baae 100644 --- a/application/language/polish/admin_lang.php +++ b/application/language/polish/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Edit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index 8bc8d39fb..4ac127823 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Informacja'; $lang['general_word_choose_file'] = 'Wybież plik'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Godzina'; diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php index 0c9f98340..83e76ea91 100644 --- a/application/language/russian/admin_lang.php +++ b/application/language/russian/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Опции'; $lang['admin_create_user'] = 'Создать пользователя'; $lang['admin_delete'] = 'Удалить'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Редактировать'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index 82e585940..4a494ab9f 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Информация'; $lang['general_word_choose_file'] = 'Выберите файл'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Время'; diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php index 125504d10..03f93baae 100644 --- a/application/language/spanish/admin_lang.php +++ b/application/language/spanish/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Edit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 2ac9fa17b..84353d0bd 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Información'; $lang['general_word_choose_file'] = 'Elegir archivo'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Fecha'; $lang['general_word_time'] = 'Hora'; diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php index e0e15fe62..0ca2c1ead 100644 --- a/application/language/swedish/admin_lang.php +++ b/application/language/swedish/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Alternativ'; $lang['admin_create_user'] = 'Skapa användare'; $lang['admin_delete'] = 'Radera'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Redigera'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index bde8621e4..8fe9d674b 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Välj fil'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Tid'; diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index 5929467c1..506368b4a 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -15,6 +15,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; +$lang['admin_remove'] = "Remove"; $lang['admin_edit'] = 'Edit'; $lang['admin_create'] = 'Create'; $lang['admin_update'] = 'Update'; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 0438ba66c..1bf1157b0 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -14,6 +14,8 @@ $lang['general_word_info'] = 'Bilgiler'; $lang['general_word_choose_file'] = 'Dosya seç'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_disabled'] = "Disabled"; $lang['general_word_date'] = 'Tarih'; $lang['general_word_time'] = 'Saat'; From ab6f4adeff631a089a5bc6c9b4cf63a14ec543f7 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 17 Oct 2023 15:34:17 +0200 Subject: [PATCH 21/30] Station Logbooks Multilang --- application/views/logbooks/create.php | 6 ++-- application/views/logbooks/edit.php | 44 ++++++++++++++------------- application/views/logbooks/index.php | 32 +++++++++---------- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/application/views/logbooks/create.php b/application/views/logbooks/create.php index a28cd0669..96e00ecaa 100644 --- a/application/views/logbooks/create.php +++ b/application/views/logbooks/create.php @@ -25,12 +25,12 @@
- + - You can call a station logbook anything. +
- +
diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php index 092e5bc40..6530c323e 100644 --- a/application/views/logbooks/edit.php +++ b/application/views/logbooks/edit.php @@ -21,20 +21,20 @@
-
: logbook_name; ?>
+
: logbook_name; ?>
- + logbook_name; } ?>" required> - Shortname for the station location. For example: Home (IO87IP) +
- +
@@ -42,36 +42,38 @@
-
Public Slug
+
-

Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only.

- +

+


+ /

- +
- +
- +
public_slug != "") { ?>
-

Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook.

- +

+ @@ -103,11 +105,11 @@ ?>
- + @@ -115,7 +117,7 @@ - +
@@ -124,14 +126,14 @@
- Linked Locations +
- + @@ -141,7 +143,7 @@ foreach ($station_locations_linked->result() as $row) { ?> - + - + diff --git a/application/views/logbooks/index.php b/application/views/logbooks/index.php index c510b2b52..c2ca7c641 100644 --- a/application/views/logbooks/index.php +++ b/application/views/logbooks/index.php @@ -12,16 +12,16 @@
- What are Station Logbooks +
-

Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle.

+

- Station Logbooks Create a Station Logbook +
@@ -31,12 +31,12 @@
Location Name
station_profile_name;?> (Callsign: station_callsign;?> DXCC: station_country; if ($row->end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?>)station_profile_name;?> (: station_callsign;?> : station_country; if ($row->end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?>)
No linked locations
- - - - - - + + + + + + @@ -48,29 +48,29 @@ From ced311107c129093d90280819c84aafe4d1dead3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 17 Oct 2023 15:48:43 +0200 Subject: [PATCH 22/30] Station Logbooks Multilang --- .../language/bulgarian/station_lang.php | 47 +++++++++++++++++-- .../chinese_simplified/station_lang.php | 47 +++++++++++++++++-- application/language/czech/station_lang.php | 47 +++++++++++++++++-- application/language/dutch/station_lang.php | 47 +++++++++++++++++-- application/language/english/station_lang.php | 46 +++++++++++++++++- application/language/finnish/station_lang.php | 47 +++++++++++++++++-- application/language/french/station_lang.php | 47 +++++++++++++++++-- application/language/german/station_lang.php | 47 ++++++++++++++++++- application/language/greek/station_lang.php | 47 +++++++++++++++++-- application/language/italian/station_lang.php | 47 +++++++++++++++++-- application/language/polish/station_lang.php | 47 +++++++++++++++++-- application/language/russian/station_lang.php | 47 +++++++++++++++++-- application/language/spanish/station_lang.php | 47 +++++++++++++++++-- application/language/swedish/station_lang.php | 47 +++++++++++++++++-- application/language/turkish/station_lang.php | 47 +++++++++++++++++-- application/views/logbooks/edit.php | 2 +- 16 files changed, 662 insertions(+), 44 deletions(-) diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/english/station_lang.php b/application/language/english/station_lang.php index 53b7fc39e..6c0d8c6b6 100644 --- a/application/language/english/station_lang.php +++ b/application/language/english/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index 2d9df402a..397a31bb4 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -2,9 +2,52 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ -$lang['station_location'] = 'Stationsstandort'; +$lang['station_logbooks'] = "Stationslogbücher"; +$lang['station_logbooks_description_header'] = "Was sind Stationslogbücher"; +$lang['station_logbooks_description_text'] = "Stationslogbücher ermöglichen es dir, Stationsstandorte zu gruppieren. Dadurch können Sie alle Standorte innerhalb einer Sitzung von den Logbuchbereichen bis zur Analyse sehen. Das ist besonders nützlich, wenn Sie an verschiedenen Standorten arbeiten, die jedoch zu derselben DXCC- oder VUCC-Zone gehören."; +$lang['station_logbooks_create'] = "Erstelle Stationslogbuch"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Verknüpfung"; +$lang['station_logbooks_public_search'] = "Öffentl. Suche"; +$lang['station_logbooks_set_active'] = "Setze als aktives Logbuch"; +$lang['station_logbooks_active_logbook'] = "Aktives Logbuch"; +$lang['station_logbooks_edit_logbook'] = "Bearbeite Stationslogbuch"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Bist du sicher, dass du das folgende Logbuch löschen willst? Du wirst alle Standorte, welche hier verknüpft sind mit einem anderen Logbuch verknüpfen müssen.: "; +$lang['station_logbooks_view_public'] = "Zeige die öffentl. Seite für das Logbuch: "; +$lang['station_logbooks_create_name'] = "Stationslogbuch Name"; +$lang['station_logbooks_create_name_hint'] = "Du kannst das Stationslogbuch völlig frei benennen."; +$lang['station_logbooks_edit_name_hint'] = "Kurzname für das Stationslogbuch. Zum Beispiel: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Aktualisiere Stationslogbuch Name"; +$lang['station_logbooks_public_slug'] = "Öffentlicher Link"; +$lang['station_logbooks_public_slug_hint'] = "Mit einem öffentlichen Link kannst du dieses Logbuch mit jedem über eine eigene Seite teilen. Dieser Linkzusatz darf jedoch nur Buchstaben & Zahlen enthalten."; +$lang['station_logbooks_public_slug_format1'] = "So wird der Link aussehen:"; +$lang['station_logbooks_public_slug_format2'] = "[dein Link]"; +$lang['station_logbooks_public_slug_input'] = "Gib ein, wie der öffentliche Link lauten soll:"; +$lang['station_logbooks_public_slug_visit'] = "Besuche die öffentl. Seite"; +$lang['station_logbooks_public_search_hint'] = "Einschalten der Suchfunktion gibt Besuchern deiner öffentlichen Logbuch Seite die Möglichkeit über ein Suchfeld Einträge zu suchen. Die Suche deckt dabei nur dieses Logbuch ab."; +$lang['station_logbooks_public_search_enabled'] = "Öffentliche Suche eingeschaltet"; +$lang['station_logbooks_select_avail_loc'] = "Wähle verfügbare Stationsstandorte"; +$lang['station_logbooks_link_loc'] = "Verknüpfe Standort"; +$lang['station_logbooks_linked_loc'] = "Verknüpfte Standorte"; +$lang['station_logbooks_no_linked_loc'] = "Keine verknüpften Standorte"; + + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ + +$lang['station_loc'] = 'Stationsstandort'; +$lang['station_location_plural'] = "Stationsstandorte"; $lang['station_location_header_ln1'] = 'Stationsstandorte definieren die Orte, von denen aus du QRV bist. Dein Zuhause, Bei Freunden oder Unterwegs'; $lang['station_location_header_ln2'] = 'Ähnlich wie Logbücher trennen die Stationsstandorte die entsprechenden QSO voneinander ab.'; $lang['station_location_header_ln3'] = 'Es kann immer nur ein Stationsstandort aktiv sein. Welches das aktuell ist siehst du in der Liste an dem "Aktive Station" Symbol'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index eb8bd0be9..6c0d8c6b6 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -2,9 +2,51 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -// Station Location +/* +___________________________________________________________________________________________ +Station Logbooks +___________________________________________________________________________________________ +*/ + +$lang['station_logbooks'] = "Station Logbooks"; +$lang['station_logbooks_description_header'] = "What are Station Logbooks"; +$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle."; +$lang['station_logbooks_create'] = "Create Station Logbook"; +$lang['station_logbooks_status'] = "Status"; +$lang['station_logbooks_link'] = "Link"; +$lang['station_logbooks_public_search'] = "Public Search"; +$lang['station_logbooks_set_active'] = "Set as Active Logbook"; +$lang['station_logbooks_active_logbook'] = "Active Logbook"; +$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]' +$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: "; +$lang['station_logbooks_view_public'] = "View Public Page for Logbook: "; +$lang['station_logbooks_create_name'] = "Station Logbook Name"; +$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything."; +$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)"; +$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name"; +$lang['station_logbooks_public_slug'] = "Public Slug"; +$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."; +$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:"; +$lang['station_logbooks_public_slug_format2'] = "[your slug]"; +$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice"; +$lang['station_logbooks_public_slug_visit'] = "Visit Public Page"; +$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook."; +$lang['station_logbooks_public_search_enabled'] = "Public search enabled"; +$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations"; +$lang['station_logbooks_link_loc'] = "Link Location"; +$lang['station_logbooks_linked_loc'] = "Linked Locations"; +$lang['station_logbooks_no_linked_loc'] = "No Linked Locations"; + + + +/* +___________________________________________________________________________________________ +Station Locations +___________________________________________________________________________________________ +*/ $lang['station_location'] = 'Station Location'; +$lang['station_location_plural'] = "Station Locations"; $lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.'; $lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.'; $lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.'; @@ -20,7 +62,7 @@ $lang['station_location_name_hint'] = 'Shortname for the station location. For e $lang['station_location_callsign'] = 'Station Callsign'; $lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P'; $lang['station_location_power'] = 'Station Power (W)'; -$lang['station_location_power_hint'] = 'Desfault station power in Watt. Overwritten by CAT.'; +$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.'; $lang['station_location_emptylog'] = 'Empty Log'; $lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: '; $lang['station_location_set_active'] = 'Set Active'; @@ -66,4 +108,3 @@ $lang['station_location_oqrs_text'] = "OQRS Text"; $lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing."; - diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php index 6530c323e..4e81aed19 100644 --- a/application/views/logbooks/edit.php +++ b/application/views/logbooks/edit.php @@ -133,7 +133,7 @@
NameStatusEditDeleteLinkPublic Search
session->userdata('active_station_logbook') != $row->logbook_id) { ?> - logbook_id; ?>" class="btn btn-outline-primary btn-sm">Set as Active Logbook + logbook_id; ?>" class="btn btn-outline-primary btn-sm"> Active Logbook'; + echo "" . lang('station_logbooks_active_logbook') . ""; }?> - logbook_id; ?>" class="btn btn-outline-primary btn-sm"> + logbook_id; ?>" class="btn btn-outline-primary btn-sm"> session->userdata('active_station_logbook') != $row->logbook_id) { ?> - logbook_id; ?>" class="btn btn-danger btn-sm" onclick="return confirm('Are you sure you want delete station logbook logbook_name; ?>? You must re-link any locations linked here to another logbook.');"> + logbook_id; ?>" class="btn btn-danger btn-sm" onclick="return confirm('logbook_name; ?>');"> public_slug != '') { ?> - public_slug; ?>" class="btn btn-outline-primary btn-sm" > + public_slug; ?>" class="btn btn-outline-primary btn-sm" > public_search == 1) { - echo "Enabled"; + echo "" . lang('general_word_enabled') . ""; } else { - echo "Disabled"; + echo "" . lang('general_word_disabled') . ""; } ?>
- + From 75fb11285da6752e086a356b1430dca2f9cddd76 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 17 Oct 2023 15:53:21 +0200 Subject: [PATCH 23/30] typo --- application/language/german/station_lang.php | 3 +-- application/views/logbooks/edit.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index 397a31bb4..261734cdf 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -39,14 +39,13 @@ $lang['station_logbooks_no_linked_loc'] = "Keine verknüpften Standorte"; - /* ___________________________________________________________________________________________ Station Locations ___________________________________________________________________________________________ */ -$lang['station_loc'] = 'Stationsstandort'; +$lang['station_location'] = 'Stationsstandort'; $lang['station_location_plural'] = "Stationsstandorte"; $lang['station_location_header_ln1'] = 'Stationsstandorte definieren die Orte, von denen aus du QRV bist. Dein Zuhause, Bei Freunden oder Unterwegs'; $lang['station_location_header_ln2'] = 'Ähnlich wie Logbücher trennen die Stationsstandorte die entsprechenden QSO voneinander ab.'; diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php index 4e81aed19..7df9b7781 100644 --- a/application/views/logbooks/edit.php +++ b/application/views/logbooks/edit.php @@ -90,7 +90,7 @@
-
+
From e5ca3e67bfdfe17af1db98a6bd290ae2019c17ba Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 17 Oct 2023 16:19:05 +0200 Subject: [PATCH 24/30] Add update function for DCL DOK data --- application/controllers/Adif.php | 64 ++++++++++++- application/language/bulgarian/adif_lang.php | 31 +++++++ .../language/chinese_simplified/adif_lang.php | 31 +++++++ application/language/czech/adif_lang.php | 31 +++++++ application/language/dutch/adif_lang.php | 31 +++++++ application/language/english/adif_lang.php | 31 +++++++ application/language/finnish/adif_lang.php | 31 +++++++ application/language/french/adif_lang.php | 31 +++++++ application/language/german/adif_lang.php | 31 +++++++ application/language/greek/adif_lang.php | 31 +++++++ application/language/italian/adif_lang.php | 31 +++++++ application/language/polish/adif_lang.php | 31 +++++++ application/language/russian/adif_lang.php | 31 +++++++ application/language/spanish/adif_lang.php | 31 +++++++ application/language/swedish/adif_lang.php | 31 +++++++ application/language/turkish/adif_lang.php | 31 +++++++ application/models/Logbook_model.php | 91 +++++++++++++++++++ application/views/adif/dcl_success.php | 33 +++++++ application/views/adif/import.php | 57 +++++++++++- 19 files changed, 706 insertions(+), 4 deletions(-) create mode 100644 application/views/adif/dcl_success.php diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index b8464d8fa..99c624f30 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -165,6 +165,7 @@ class adif extends CI_Controller { $data['active_station_info'] = $station_profile->row(); $data['page_title'] = "ADIF Import"; + $data['tab'] = "adif"; $config['upload_path'] = './uploads/'; $config['allowed_types'] = 'adi|ADI|adif|ADIF'; @@ -177,7 +178,7 @@ class adif extends CI_Controller { $data['max_upload'] = ini_get('upload_max_filesize'); $this->load->view('interface_assets/header', $data); - $this->load->view('adif/import'); + $this->load->view('adif/import', $data); $this->load->view('interface_assets/footer'); } else { if ($this->stations->check_station_is_accessible($this->input->post('station_profile'))) { @@ -221,6 +222,67 @@ class adif extends CI_Controller { } } + + public function dcl() { + $this->load->model('stations'); + $data['station_profile'] = $this->stations->all_of_user(); + + $data['page_title'] = "DCL Import"; + $data['tab'] = "dcl"; + + $config['upload_path'] = './uploads/'; + $config['allowed_types'] = 'adi|ADI|adif|ADIF'; + + $this->load->library('upload', $config); + + if ( ! $this->upload->do_upload()) { + $data['error'] = $this->upload->display_errors(); + + $data['max_upload'] = ini_get('upload_max_filesize'); + + $this->load->view('interface_assets/header', $data); + $this->load->view('adif/import', $data); + $this->load->view('interface_assets/footer'); + } else { + $data = array('upload_data' => $this->upload->data()); + + ini_set('memory_limit', '-1'); + set_time_limit(0); + + $this->load->model('logbook_model'); + + $this->load->library('adif_parser'); + + $this->adif_parser->load_from_file('./uploads/'.$data['upload_data']['file_name']); + + $this->adif_parser->initialize(); + $error_count = array(0, 0); + $custom_errors = ""; + while($record = $this->adif_parser->get_record()) + { + if(count($record) == 0) { + break; + }; + + $dok_result = $this->logbook_model->update_dok($record, $this->input->post('ignoreAmbiguous'), $this->input->post('onlyConfirmed'), $this->input->post('overwriteDok')); + if (!empty($dok_result)) { + if ($dok_result[0] != 0) { + $custom_errors .= $dok_result[1]."
"; + $error_count[1]++; + } else { + $error_count[0]++; + } + } + }; + unlink('./uploads/'.$data['upload_data']['file_name']); + $data['dcl_error_count'] = $error_count; + $data['dcl_errors'] = $custom_errors; + $data['page_title'] = "DCL Data Imported"; + $this->load->view('interface_assets/header', $data); + $this->load->view('adif/dcl_success'); + $this->load->view('interface_assets/footer'); + } + } } /* End of file adif.php */ diff --git a/application/language/bulgarian/adif_lang.php b/application/language/bulgarian/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/bulgarian/adif_lang.php +++ b/application/language/bulgarian/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/chinese_simplified/adif_lang.php b/application/language/chinese_simplified/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/chinese_simplified/adif_lang.php +++ b/application/language/chinese_simplified/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/czech/adif_lang.php b/application/language/czech/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/czech/adif_lang.php +++ b/application/language/czech/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/dutch/adif_lang.php b/application/language/dutch/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/dutch/adif_lang.php +++ b/application/language/dutch/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/english/adif_lang.php b/application/language/english/adif_lang.php index a8b979d1c..1f03e7c8c 100644 --- a/application/language/english/adif_lang.php +++ b/application/language/english/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/finnish/adif_lang.php b/application/language/finnish/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/finnish/adif_lang.php +++ b/application/language/finnish/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/french/adif_lang.php b/application/language/french/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/french/adif_lang.php +++ b/application/language/french/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/german/adif_lang.php b/application/language/german/adif_lang.php index 6ca8681c2..de401a7ab 100644 --- a/application/language/german/adif_lang.php +++ b/application/language/german/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $lang['adif_qso_marked'] = "QSO's markiert"; $lang['adif_yay_its_done'] = "Yay, geschafft!"; $lang['adif_qso_lotw_marked_confirm'] = "Die QSO wurden als 'zu LoTW hochgeladen' markiert"; +/* +___________________________________________________________________________________________ +DARC DCL +___________________________________________________________________________________________ +*/ +$lang['adif_dcl_text_pre'] = "Gehe zum"; +$lang['adif_dcl_text_post'] = "und exportiere dein Logbuch mit bestätigten DOKs. Um den Prozess zu beschleunigen, kannst du QSOs ausschließlich mit DL-Stationen auswählen (indem du \"DL\" in die Präfixliste einträgst). Die heruntergeladene ADIF-Datei kannst du hier hochladen, um dein Logbuch mit DOK Informationen zu aktualisieren."; + +$lang['only_confirmed_qsos'] = "Importiere nur DOK Informationen von QSOs, die auf DCL bestätigt sind."; +$lang['only_confirmed_qsos_hint'] = "Deaktiviere diese Option, um auch DOK Infos von QSOS zu importieren, die auf DCL nicht bestätig sind."; + +$lang['overwrite_by_dcl'] = "Überschreibe existierende DOK im Logbuch durch DCL (wenn unterschiedlich)."; +$lang['overwrite_by_dcl_hint'] = "Wenn aktiviert, wird Cloudlog den existierenden DOK mit dem DOK aus dem DCL überschreiben."; + +$lang['ignore_ambiguous'] = "Ignoriere QSOs, die nicht eindeutig zugeordnet werden können."; +$lang['ignore_ambiguous_hint'] = "Wenn deaktiviert, werden auch Infos zu QSOs angezeigt, die im Logbuch nicht gefunden werden konnten."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Duplikate wurden übersprungen."; $lang['adif_import_errors'] = "ADIF Fehler"; $lang['adif_import_errors_hint'] = "Es gibt ADIF Fehler. Die QSO wurden hinzugefügt, jedoch wurden die fehlerhaften Felder nicht ausgefüllt."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$lang['dcl_results'] = "Ergebnisse des DCL DOK Updates"; +$lang['dcl_info_updated'] = "QSOs wurden mit der DOK Information aus dem DCL aktualisiert."; +$lang['dcl_qsos_updated'] = "Aktualisierte QSOs:"; +$lang['dcl_qsos_ignored'] = "Ignorierte QSOs:"; +$lang['dcl_no_qsos_updated'] = "Keine QSOs aktualisiert."; +$lang['dcl_dok_errors'] = "DOK Fehler"; +$lang['dcl_dok_errors_details'] = "Die DOK Informationen im Logbuch weichen von denen im DCL ab:"; diff --git a/application/language/greek/adif_lang.php b/application/language/greek/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/greek/adif_lang.php +++ b/application/language/greek/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/italian/adif_lang.php b/application/language/italian/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/italian/adif_lang.php +++ b/application/language/italian/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/polish/adif_lang.php b/application/language/polish/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/polish/adif_lang.php +++ b/application/language/polish/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/russian/adif_lang.php b/application/language/russian/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/russian/adif_lang.php +++ b/application/language/russian/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/spanish/adif_lang.php b/application/language/spanish/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/spanish/adif_lang.php +++ b/application/language/spanish/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/swedish/adif_lang.php b/application/language/swedish/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/swedish/adif_lang.php +++ b/application/language/swedish/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/language/turkish/adif_lang.php b/application/language/turkish/adif_lang.php index a8b979d1c..7b507f60a 100644 --- a/application/language/turkish/adif_lang.php +++ b/application/language/turkish/adif_lang.php @@ -12,6 +12,7 @@ ________________________________________________________________________________ $lang['adif_import'] = "ADIF Import"; $lang['adif_export'] = "ADIF Export"; // $lang['lotw_title'] --> application/language/english/lotw_lang.php +$lang['darc_dcl'] = "DARC DCL"; /* @@ -81,6 +82,22 @@ $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."; +/* +___________________________________________________________________________________________ +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['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['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['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."; /* ___________________________________________________________________________________________ @@ -97,3 +114,17 @@ $lang['adif_import_dupes_skipped'] = " Dupes were 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."; + +/* +___________________________________________________________________________________________ +DCL Success +___________________________________________________________________________________________ +*/ + +$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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_dok_errors'] = "DOK Errors"; +$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:"; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 314a5da42..72d804d64 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -3474,6 +3474,97 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = return $my_error; } + function update_dok($record, $ignoreAmbiguous, $onlyConfirmed, $overwriteDok) { + $CI =& get_instance(); + $CI->load->model('logbooks_model'); + $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + + if(isset($record['call'])) { + $call = strtoupper($record['call']); + } else { + return array(3, 'Callsign not found'); + } + + // Join date+time + $time_on = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i', strtotime($record['time_on'])); + + // Store Band + if(isset($record['band'])) { + $band = strtolower($record['band']); + } else { + if (isset($record['freq'])){ + if($freq != "0") { + $band = $CI->frequency->GetBand($freq); + } + } + } + + if (isset($record['mode'])) { + $mode = $record['mode']; + } else { + $mode = ''; + } + + if (isset($record['darc_dok'])) { + $darc_dok = $record['darc_dok']; + } else { + $darc_dok = ''; + } + + if ($darc_dok != '') { + $this->db->select('COL_PRIMARY_KEY, COL_DARC_DOK'); + $this->db->where('COL_CALL', $call); + $this->db->like('COL_TIME_ON', $time_on, 'after'); + $this->db->where('COL_BAND', $band); + $this->db->where('COL_MODE', $mode); + $this->db->where_in('station_id', $logbooks_locations_array); + $check = $this->db->get($this->config->item('table_name')); + if ($check->num_rows() != 1) { + if ($ignoreAmbiguous == '1') { + return array(); + } else { + return array(2, $result['message'] = $time_on." ".$call." ".$band." ".$mode." QSO could not be matched."); + } + } else { + if ($check->row()->COL_DARC_DOK != $darc_dok) { + $dcl_cnfm = array('c', 'm', 'n', 'o', 'i'); + // Ref https://confluence.darc.de/pages/viewpage.action?pageId=21037270 + if ($onlyConfirmed == '1') { + if (in_array($record['app_dcl_status'], $dcl_cnfm)) { + if ($check->row()->COL_DARC_DOK == '' || $overwriteDok == '1') { + $this->set_dok($check->row()->COL_PRIMARY_KEY, $darc_dok); + return array(0, ''); + } else { + return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status']."."); + } + + } else { + return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status']."."); + } + } else { + if ($check->row()->COL_DARC_DOK == '' || $overwriteDok == '1') { + $this->set_dok($check->row()->COL_PRIMARY_KEY, $darc_dok); + return array(0, ''); + } else { + return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status']."."); + } + } + } + } + } + + } + + function set_dok($key, $dok) { + $data = array( + 'COL_DARC_DOK' => $dok, + ); + + $this->db->where(array('COL_PRIMARY_KEY' => $key)); + $this->db->update($this->config->item('table_name'), $data); + return; + } + function get_main_mode_from_mode($mode) { return ($this->get_main_mode_if_submode($mode) == null ? $mode : $this->get_main_mode_if_submode($mode)); } diff --git a/application/views/adif/dcl_success.php b/application/views/adif/dcl_success.php new file mode 100644 index 000000000..090acd727 --- /dev/null +++ b/application/views/adif/dcl_success.php @@ -0,0 +1,33 @@ +
+
+ session->flashdata('message')) { ?> + +
+

session->flashdata('message'); ?>

+
+ + +
+
+ +
+
+ 0) { ?> +

Yay, its updated!

+

+

.

+

.

+ +

+

+ + +

+

+

+ +
+
+ + +
diff --git a/application/views/adif/import.php b/application/views/adif/import.php index 35c1a2234..e25f9259b 100644 --- a/application/views/adif/import.php +++ b/application/views/adif/import.php @@ -2,11 +2,18 @@

+ +
  • - +
  • @@ -14,14 +21,17 @@
    • +
  • + +
-
+
- + @@ -213,6 +223,47 @@
+
+ + + + +

+
+ +
+
+
+ + +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ + +
+
+
+
+ + + +
From 44b875dbb041f37cb2b4152ccc6ab90eafff1102 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 17 Oct 2023 16:28:29 +0200 Subject: [PATCH 25/30] Fix typo and all of its c+p friends --- application/language/bulgarian/adif_lang.php | 2 +- application/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/adif_lang.php | 2 +- 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/adif/import.php | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/application/language/bulgarian/adif_lang.php b/application/language/bulgarian/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/bulgarian/adif_lang.php +++ b/application/language/bulgarian/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/chinese_simplified/adif_lang.php b/application/language/chinese_simplified/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/chinese_simplified/adif_lang.php +++ b/application/language/chinese_simplified/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/czech/adif_lang.php b/application/language/czech/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/czech/adif_lang.php +++ b/application/language/czech/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/dutch/adif_lang.php b/application/language/dutch/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/dutch/adif_lang.php +++ b/application/language/dutch/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/english/adif_lang.php b/application/language/english/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/english/adif_lang.php +++ b/application/language/english/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/finnish/adif_lang.php b/application/language/finnish/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/finnish/adif_lang.php +++ b/application/language/finnish/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/french/adif_lang.php b/application/language/french/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/french/adif_lang.php +++ b/application/language/french/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/german/adif_lang.php b/application/language/german/adif_lang.php index 6ca8681c2..9297c7247 100644 --- a/application/language/german/adif_lang.php +++ b/application/language/german/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Wähle Stationsstandort"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF Datei"; +$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."; diff --git a/application/language/greek/adif_lang.php b/application/language/greek/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/greek/adif_lang.php +++ b/application/language/greek/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/italian/adif_lang.php b/application/language/italian/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/italian/adif_lang.php +++ b/application/language/italian/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/polish/adif_lang.php b/application/language/polish/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/polish/adif_lang.php +++ b/application/language/polish/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/russian/adif_lang.php b/application/language/russian/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/russian/adif_lang.php +++ b/application/language/russian/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/spanish/adif_lang.php b/application/language/spanish/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/spanish/adif_lang.php +++ b/application/language/spanish/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/swedish/adif_lang.php b/application/language/swedish/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/swedish/adif_lang.php +++ b/application/language/swedish/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/language/turkish/adif_lang.php b/application/language/turkish/adif_lang.php index a8b979d1c..e0e1e4ab1 100644 --- a/application/language/turkish/adif_lang.php +++ b/application/language/turkish/adif_lang.php @@ -29,7 +29,7 @@ $lang['adif_select_stationlocation'] = "Select Station Location"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser -$lang['aif_file_label'] = "ADIF File"; +$lang['adif_file_label'] = "ADIF File"; $lang['adif_hint_no_info_in_file'] ="Select if ADIF being imported does not contain this information."; diff --git a/application/views/adif/import.php b/application/views/adif/import.php index 35c1a2234..86742e376 100644 --- a/application/views/adif/import.php +++ b/application/views/adif/import.php @@ -37,7 +37,7 @@ - +
From 589c1c8021cae053035927f4c0aa5f53210d1668 Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 17 Oct 2023 17:31:32 +0000 Subject: [PATCH 26/30] Fixes issue that reassign failed, when col_station_callsign was not given --- application/models/Logbook_model.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 72d804d64..ae3226eb4 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4148,7 +4148,11 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = ); $this->db->where(array('station_id' => NULL)); - $this->db->where('col_station_callsign', $station_callsign); + if ($station_callsign == '') { + $this->db->where(array('col_station_callsign' => NULL)); + } else { + $this->db->where('col_station_callsign', $station_callsign); + } $this->db->update($this->config->item('table_name'), $data); if ($this->db->affected_rows() > 0) { return TRUE; From b014ca49cbcecc89618f191c8514bf9e02360fcb Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 17 Oct 2023 20:47:10 +0200 Subject: [PATCH 27/30] Winkeyer Translation --- .../language/bulgarian/account_lang.php | 6 ++++++ application/language/bulgarian/admin_lang.php | 1 + .../chinese_simplified/account_lang.php | 6 ++++++ .../language/chinese_simplified/admin_lang.php | 1 + application/language/czech/account_lang.php | 6 ++++++ application/language/czech/admin_lang.php | 1 + application/language/dutch/account_lang.php | 6 ++++++ application/language/dutch/admin_lang.php | 1 + application/language/english/account_lang.php | 6 ++++++ application/language/english/admin_lang.php | 1 + application/language/finnish/account_lang.php | 6 ++++++ application/language/finnish/admin_lang.php | 1 + application/language/french/account_lang.php | 6 ++++++ application/language/french/admin_lang.php | 1 + application/language/german/account_lang.php | 6 ++++++ application/language/german/admin_lang.php | 1 + application/language/greek/account_lang.php | 6 ++++++ application/language/greek/admin_lang.php | 1 + application/language/italian/account_lang.php | 6 ++++++ application/language/italian/admin_lang.php | 1 + application/language/polish/account_lang.php | 6 ++++++ application/language/polish/admin_lang.php | 1 + application/language/russian/account_lang.php | 6 ++++++ application/language/russian/admin_lang.php | 1 + application/language/spanish/account_lang.php | 6 ++++++ application/language/spanish/admin_lang.php | 1 + application/language/swedish/account_lang.php | 6 ++++++ application/language/swedish/admin_lang.php | 1 + application/language/turkish/account_lang.php | 6 ++++++ application/language/turkish/admin_lang.php | 1 + application/views/user/edit.php | 18 +++++++++--------- 31 files changed, 114 insertions(+), 9 deletions(-) diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 9e0d1dbbe..6ced0516f 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php index b0ac319d6..e48558ba3 100644 --- a/application/language/bulgarian/admin_lang.php +++ b/application/language/bulgarian/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 95137e8a4..e59c5728c 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -95,7 +95,13 @@ $lang['account_login'] = '登录'; $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_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = '默认波段'; $lang['account_qsl_settings'] = 'Default QSL-Methods'; + +$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"; + diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index 5c40dce0d..86034e4f7 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index a90109e9f..2c92fe145 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -95,7 +95,13 @@ $lang['account_login'] = 'Přihlásit se'; $lang['account_mastodon'] = 'Mastodon server'; $lang['account_user_mastodon'] = 'URL Mastodon serveru'; +$lang['account_user_mastodon_hint'] = "Main URL of your Mastodon server, e.g. https://radiosocial.de"; $lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Výchozí pásma'; $lang['account_qsl_settings'] = 'Default QSL-Methods'; + +$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"; + diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php index b32aedaf2..890fb449d 100644 --- a/application/language/czech/admin_lang.php +++ b/application/language/czech/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 0e9080668..e82f3c209 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php index 2972aa4e4..2f4982373 100644 --- a/application/language/dutch/admin_lang.php +++ b/application/language/dutch/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 41002e020..4fd8019cd 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index 03f93baae..f045c1a92 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index 4c9f645d7..273ce8b58 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -95,7 +95,13 @@ $lang['account_login'] = 'Kirjaudu'; $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_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Oletusbandi'; $lang['account_qsl_settings'] = 'Default QSL-Methods'; + +$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"; + diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php index 2bb11e055..ca8b5d128 100644 --- a/application/language/finnish/admin_lang.php +++ b/application/language/finnish/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index 62b046244..7f68aa8cc 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index 7f591a52d..d071d3015 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index cec2a3673..ac2448fbd 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -95,7 +95,13 @@ $lang['account_login'] = 'Anmeldung'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL des Mastodonservers'; +$lang['account_user_mastodon_hint'] = "Haupt-URL des Mastodonservers, z.B. https://radiosocial.de"; $lang['account_default_band_settings'] = 'Einstellung für Standardband und -bestätigungsmethode'; $lang['account_gridmap_default_band'] = 'Standardband'; $lang['account_qsl_settings'] = 'Standard QSL-Methoden'; + +$lang['account_winkeyer'] = 'Winkeyer'; +$lang['account_winkeyer_hint'] = "Die Winkeyer Unterstützung in Cloudlog ist sehr experimentell. Lese zuerst den Wikieintrag auf https://github.com/magicbug/Cloudlog/wiki/Winkey bevor du ihn einschaltest."; +$lang['account_winkeyer_enabled'] = "Winkeyer Features Eingeschaltet"; + diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index 2e958b854..683ad29e5 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Speichern'; $lang['admin_close'] = 'Schliessen'; $lang['admin_user_accounts'] = 'Benutzerkonten'; $lang['admin_danger'] = 'ACHTUNG!'; +$lang['admin_experimental'] = "Experimentell"; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index 1d3c64722..8b7a73a16 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php index 03f93baae..f045c1a92 100644 --- a/application/language/greek/admin_lang.php +++ b/application/language/greek/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index b241c8094..bb5f1ec0f 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php index 03f93baae..f045c1a92 100644 --- a/application/language/italian/admin_lang.php +++ b/application/language/italian/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index 4422b3ce9..366f0520d 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php index 03f93baae..f045c1a92 100644 --- a/application/language/polish/admin_lang.php +++ b/application/language/polish/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index c6263c0fa..b26cfbab6 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -95,7 +95,13 @@ $lang['account_login'] = 'Вход'; $lang['account_mastodon'] = 'Сервер Mastodon'; $lang['account_user_mastodon'] = 'URL профиля пользователя Mastodon'; +$lang['account_user_mastodon_hint'] = "Main URL of your Mastodon server, e.g. https://radiosocial.de"; $lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Диапазон по умолчанию'; $lang['account_qsl_settings'] = 'Default QSL-Methods'; + +$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"; + diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php index 83e76ea91..8f5113df9 100644 --- a/application/language/russian/admin_lang.php +++ b/application/language/russian/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'Аккаунты пользователей'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index 8be93609d..28e0d77e7 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php index 03f93baae..f045c1a92 100644 --- a/application/language/spanish/admin_lang.php +++ b/application/language/spanish/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index 90cd5dd25..0c61964ef 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -95,7 +95,13 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL till Mastodonserver'; +$lang['account_user_mastodon_hint'] = "Main URL of your Mastodon server, e.g. https://radiosocial.de"; $lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Standard Band'; $lang['account_qsl_settings'] = 'Default QSL-Methods'; + +$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"; + diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php index 0ca2c1ead..ab4babfb7 100644 --- a/application/language/swedish/admin_lang.php +++ b/application/language/swedish/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index efb04a524..3c6fb8cf3 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -95,7 +95,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_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_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"; + diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index 506368b4a..574a8a8a5 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -24,6 +24,7 @@ $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_danger'] = 'DANGER!'; +$lang['admin_experimental'] = "Experimental"; diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 423e81a0a..2b2f03d65 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -534,7 +534,7 @@
-
Main URL of your Mastodon server, e.g. https://radiosocial.de
+
@@ -570,7 +570,7 @@ echo ' checked'; } echo '>'; ?> - +
'; ?> - +
'; ?> - +
@@ -600,18 +600,18 @@
- Winkeyer Experimental +
-

Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling.

+

- +
From a3dd9f49328bf818ffcd5ff60f37313a2df99af4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 17 Oct 2023 21:04:57 +0200 Subject: [PATCH 28/30] design of buttons consistency --- application/views/labels/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/labels/index.php b/application/views/labels/index.php index 2b2e74221..96d2bf3b7 100644 --- a/application/views/labels/index.php +++ b/application/views/labels/index.php @@ -26,8 +26,8 @@

QSL Card Labels

- Create New Label Type - Create New Paper Type + Create New Label Type + Create New Paper Type

Paper types

From 5de2f2a93b893fa800bcba13b06cd715c8433c83 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 18 Oct 2023 11:31:15 +0200 Subject: [PATCH 29/30] Beautify DCL sync output and add some more useful information --- application/controllers/Adif.php | 16 +++++++--- application/language/bulgarian/adif_lang.php | 17 +++++++--- .../language/chinese_simplified/adif_lang.php | 17 +++++++--- application/language/czech/adif_lang.php | 17 +++++++--- application/language/dutch/adif_lang.php | 17 +++++++--- application/language/english/adif_lang.php | 17 +++++++--- application/language/finnish/adif_lang.php | 16 +++++++--- application/language/french/adif_lang.php | 17 +++++++--- application/language/german/adif_lang.php | 17 +++++++--- application/language/greek/adif_lang.php | 17 +++++++--- application/language/italian/adif_lang.php | 17 +++++++--- application/language/polish/adif_lang.php | 17 +++++++--- application/language/russian/adif_lang.php | 17 +++++++--- application/language/spanish/adif_lang.php | 17 +++++++--- application/language/swedish/adif_lang.php | 17 +++++++--- application/language/turkish/adif_lang.php | 17 +++++++--- application/models/Logbook_model.php | 31 ++++++++++++++++--- application/views/adif/dcl_success.php | 20 +++++++++--- 18 files changed, 248 insertions(+), 73 deletions(-) diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index 99c624f30..5992bfdb8 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -256,7 +256,7 @@ class adif extends CI_Controller { $this->adif_parser->load_from_file('./uploads/'.$data['upload_data']['file_name']); $this->adif_parser->initialize(); - $error_count = array(0, 0); + $error_count = array(0, 0, 0); $custom_errors = ""; while($record = $this->adif_parser->get_record()) { @@ -266,11 +266,17 @@ class adif extends CI_Controller { $dok_result = $this->logbook_model->update_dok($record, $this->input->post('ignoreAmbiguous'), $this->input->post('onlyConfirmed'), $this->input->post('overwriteDok')); if (!empty($dok_result)) { - if ($dok_result[0] != 0) { - $custom_errors .= $dok_result[1]."
"; - $error_count[1]++; - } else { + switch ($dok_result[0]) { + case 0: $error_count[0]++; + break; + case 1: + $custom_errors .= $dok_result[1]; + $error_count[1]++; + break; + case 2: + $custom_errors .= $dok_result[1]; + $error_count[2]++; } } }; diff --git a/application/language/bulgarian/adif_lang.php b/application/language/bulgarian/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/bulgarian/adif_lang.php +++ b/application/language/bulgarian/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/chinese_simplified/adif_lang.php b/application/language/chinese_simplified/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/chinese_simplified/adif_lang.php +++ b/application/language/chinese_simplified/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/czech/adif_lang.php b/application/language/czech/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/czech/adif_lang.php +++ b/application/language/czech/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/dutch/adif_lang.php b/application/language/dutch/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/dutch/adif_lang.php +++ b/application/language/dutch/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/english/adif_lang.php b/application/language/english/adif_lang.php index 2cf537b8c..e47d5b28b 100644 --- a/application/language/english/adif_lang.php +++ b/application/language/english/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/finnish/adif_lang.php b/application/language/finnish/adif_lang.php index d8ddb51a1..6893cadae 100644 --- a/application/language/finnish/adif_lang.php +++ b/application/language/finnish/adif_lang.php @@ -123,8 +123,16 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs updated."; +$lang['dcl_qsos_updated'] = "QSOs updated"; +$lang['dcl_qsos_ignored'] = "QSOs ignored"; +$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_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_qsos_updated'] = "No QSOs found which could be updated."; diff --git a/application/language/french/adif_lang.php b/application/language/french/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/french/adif_lang.php +++ b/application/language/french/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/german/adif_lang.php b/application/language/german/adif_lang.php index c40cdfa9a..c15174547 100644 --- a/application/language/german/adif_lang.php +++ b/application/language/german/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $lang['dcl_results'] = "Ergebnisse des DCL DOK Updates"; $lang['dcl_info_updated'] = "QSOs wurden mit der DOK Information aus dem DCL aktualisiert."; -$lang['dcl_qsos_updated'] = "Aktualisierte QSOs:"; -$lang['dcl_qsos_ignored'] = "Ignorierte QSOs:"; -$lang['dcl_no_qsos_updated'] = "Keine QSOs aktualisiert."; +$lang['dcl_qsos_updated'] = "Aktualisierte QSOs"; +$lang['dcl_qsos_ignored'] = "Ignorierte QSOs"; +$lang['dcl_qsos_unmatched'] = "Nicht gefundene QSOs"; +$lang['dcl_no_qsos_updated'] = "Keine QSOs gefunden, die aktualisiert werden konnten."; $lang['dcl_dok_errors'] = "DOK Fehler"; -$lang['dcl_dok_errors_details'] = "Die DOK Informationen im Logbuch weichen von denen im DCL ab:"; +$lang['dcl_dok_errors_details'] = "Die DOK Informationen im Logbuch weichen von denen im DCL ab"; +$lang['dcl_qsl_status'] = "DCL QSL Status"; +$lang['dcl_qsl_status_c'] = "bestätigt durch LoTW/Clublog/eQSL/Contest"; +$lang['dcl_qsl_status_mno'] = "bestätigt durch Diplommananger"; +$lang['dcl_qsl_status_i'] = "bestätigt durch Cross-Check von DCL-Daten"; +$lang['dcl_qsl_status_w'] = "Bestätigung ausstehend"; +$lang['dcl_qsl_status_x'] = "nicht bestätigt"; +$lang['dcl_qsl_status_unknown'] = "unbekannt"; +$lang['dcl_no_match'] = "QSO konnte nicht gefunden werden"; diff --git a/application/language/greek/adif_lang.php b/application/language/greek/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/greek/adif_lang.php +++ b/application/language/greek/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/italian/adif_lang.php b/application/language/italian/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/italian/adif_lang.php +++ b/application/language/italian/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/polish/adif_lang.php b/application/language/polish/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/polish/adif_lang.php +++ b/application/language/polish/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/russian/adif_lang.php b/application/language/russian/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/russian/adif_lang.php +++ b/application/language/russian/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/spanish/adif_lang.php b/application/language/spanish/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/spanish/adif_lang.php +++ b/application/language/spanish/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/swedish/adif_lang.php b/application/language/swedish/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/swedish/adif_lang.php +++ b/application/language/swedish/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/language/turkish/adif_lang.php b/application/language/turkish/adif_lang.php index d8ddb51a1..45e5196a9 100644 --- a/application/language/turkish/adif_lang.php +++ b/application/language/turkish/adif_lang.php @@ -123,8 +123,17 @@ ________________________________________________________________________________ $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_no_qsos_updated'] = "No QSOs 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_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"; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 72d804d64..701a0ba87 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -3477,6 +3477,7 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = function update_dok($record, $ignoreAmbiguous, $onlyConfirmed, $overwriteDok) { $CI =& get_instance(); $CI->load->model('logbooks_model'); + $custom_date_format = $this->session->userdata('user_date_format'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); if(isset($record['call'])) { @@ -3523,9 +3524,31 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = if ($ignoreAmbiguous == '1') { return array(); } else { - return array(2, $result['message'] = $time_on." ".$call." ".$band." ".$mode." QSO could not be matched."); + return array(2, $result['message'] = "
"); } } else { + $dcl_qsl_status = ''; + switch($record['app_dcl_status']) { + case 'c': + $dcl_qsl_status = lang('dcl_qsl_status_c'); + break; + case 'm': + case 'n': + case 'o': + $dcl_qsl_status = lang('dcl_qsl_status_mno'); + break; + case 'i': + $dcl_qsl_status = lang('dcl_qsl_status_i'); + break; + case 'w': + $dcl_qsl_status = lang('dcl_qsl_status_w'); + break; + case 'x': + $dcl_qsl_status = lang('dcl_qsl_status_x'); + break; + default: + $dcl_qsl_status = lang('dcl_qsl_status_unknown'); + } if ($check->row()->COL_DARC_DOK != $darc_dok) { $dcl_cnfm = array('c', 'm', 'n', 'o', 'i'); // Ref https://confluence.darc.de/pages/viewpage.action?pageId=21037270 @@ -3535,18 +3558,18 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = $this->set_dok($check->row()->COL_PRIMARY_KEY, $darc_dok); return array(0, ''); } else { - return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status']."."); + return array(1, $result['message'] = ""); } } else { - return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status']."."); + return array(1, $result['message'] = ""); } } else { if ($check->row()->COL_DARC_DOK == '' || $overwriteDok == '1') { $this->set_dok($check->row()->COL_PRIMARY_KEY, $darc_dok); return array(0, ''); } else { - return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status']."."); + return array(1, $result['message'] = ""); } } } diff --git a/application/views/adif/dcl_success.php b/application/views/adif/dcl_success.php index 090acd727..0af525c4c 100644 --- a/application/views/adif/dcl_success.php +++ b/application/views/adif/dcl_success.php @@ -15,16 +15,28 @@ 0) { ?>

Yay, its updated!

-

.

-

.

-

+

-

+
".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."".str_replace('0', 'Ø', $call)."".$band."".$mode."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".lang('dcl_no_match')."
".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."".$band."".$mode."".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : $check->row()->COL_DARC_DOK)))."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".$dcl_qsl_status."
".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."".$band."".$mode."".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : $check->row()->COL_DARC_DOK)))."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".$dcl_qsl_status."
".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."".$band."".$mode."".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : $check->row()->COL_DARC_DOK)))."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".$dcl_qsl_status."
+ + + + + + + + + + + +
DateTimeCallBandModeDOK in LogDOK in DCLDCL QSL Status
From 276c0a9e1b278ce8b36683e9a1e7e7a9863d2cd3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 18 Oct 2023 11:45:15 +0200 Subject: [PATCH 30/30] Multilang QSO Deletion Warning --- 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 + application/views/interface_assets/footer.php | 2 ++ assets/js/sections/common.js | 4 ++-- 17 files changed, 19 insertions(+), 2 deletions(-) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 34aab0356..0fdcbf2fd 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'This note content is exported to QSL services lik $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 "; // QSO Details diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 37399d7af..338f6c79a 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = '此笔记内容被导出到QSL服务，如 eqsl.c $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 "; // QSO Details diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 68d29fe99..b276233c3 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'This note content is exported to QSL services lik $lang['qso_btn_reset_qso'] = 'Vymazat'; $lang['qso_btn_save_qso'] = 'Uložit spojení'; $lang['qso_btn_edit_qso'] = 'Editovat spojení'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 9c4655c58..cbaab061c 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'This note content is exported to QSL services lik $lang['qso_btn_reset_qso'] = 'Wis QSO'; $lang['qso_btn_save_qso'] = 'Bewaar QSO'; $lang['qso_btn_edit_qso'] = 'Edit QSO'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index f8bf82033..f761b8ce9 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'This note content is exported to QSL services lik $lang['qso_btn_reset_qso'] = 'Reset'; $lang['qso_btn_save_qso'] = 'Save QSO'; $lang['qso_btn_edit_qso'] = 'Edit QSO'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 9207145fb..573d2626c 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'Tämä viestisi siirtyy myös QSL-palveluihin, ku $lang['qso_btn_reset_qso'] = 'Tyhjennä'; $lang['qso_btn_save_qso'] = 'TALLENNA QSO'; $lang['qso_btn_edit_qso'] = 'muokkaa QSO:a'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index b64ac41de..6601bbdca 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'This note content is exported to QSL services lik $lang['qso_btn_reset_qso'] = 'Réinitialiser'; $lang['qso_btn_save_qso'] = 'Enregistrer QSO'; $lang['qso_btn_edit_qso'] = 'Edit QSO'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 229d2bc28..bdc29eda0 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'Dieser Notizeninhalt wird an QSL Services wie eqs $lang['qso_btn_reset_qso'] = 'Zurücksetzen'; $lang['qso_btn_save_qso'] = 'Speichere QSO'; $lang['qso_btn_edit_qso'] = 'Editiere QSO'; +$lang['qso_delete_warning'] = "Warnung! Bist du sicher, dass du dieses QSO löschen willst mit "; // QSO Details diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 1a398b3fe..148e6c5ea 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'Αυτό το περιεχόμενο σημείω $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 "; // QSO Details diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 9f7618ecf..8b80a5850 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'Il contenuto di questa nota è esportato a serviz $lang['qso_btn_reset_qso'] = 'Reset'; $lang['qso_btn_save_qso'] = 'Salva QSO'; $lang['qso_btn_edit_qso'] = 'Modifica QSO'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 42804a262..cc751b392 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'This note content is exported to QSL services lik $lang['qso_btn_reset_qso'] = 'Resetuj'; $lang['qso_btn_save_qso'] = 'Zapisz QSO'; $lang['qso_btn_edit_qso'] = 'Edytuj QSO'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index c6d1f084b..deaa19ade 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'СОдержимое этой заметки эк $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 "; // QSO Details diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index fdd4967c5..cfa35165c 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'This note content is exported to QSL services lik $lang['qso_btn_reset_qso'] = 'Resetear'; $lang['qso_btn_save_qso'] = 'Guardar QSO'; $lang['qso_btn_edit_qso'] = 'Editar QSO'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 673be8bd5..06c200cf3 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'Detta innehåll exporteras till QSL-services som $lang['qso_btn_reset_qso'] = 'Reset'; $lang['qso_btn_save_qso'] = 'Spara QSO'; $lang['qso_btn_edit_qso'] = 'Redigera QSO'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 9b9f82533..797ccdac6 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -28,6 +28,7 @@ $lang['qsl_notes_helptext'] = 'Bu not içeriği eqsl.cc gibi QSL servislere akta $lang['qso_btn_reset_qso'] = 'Baştan başla'; $lang['qso_btn_save_qso'] = 'QSO\'yu kaydet'; $lang['qso_btn_edit_qso'] = 'QSO\'yu düzenle'; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 30f1cea42..9f6cbd156 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -16,6 +16,8 @@ General Language */ var lang_general_word_qso_data = ""; + var lang_general_word_danger = ""; + var lang_qso_delete_warning = ""; diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 8461239f0..1fa33e57e 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -90,8 +90,8 @@ function qsl_ignore(id, method) { function qso_delete(id, call) { BootstrapDialog.confirm({ - title: 'DANGER', - message: 'Warning! Are you sure you want delete QSO with ' + call + '?' , + title: lang_general_word_danger, + message: lang_qso_delete_warning + call + '?' , type: BootstrapDialog.TYPE_DANGER, closable: true, draggable: true,