From 95adb100a8a54a507d792c4a0c49c154b0532016 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 21:56:34 +0200 Subject: [PATCH 01/21] Multilang "QSO Data" --- .../language/bulgarian/general_words_lang.php | 1 + .../chinese_simplified/general_words_lang.php | 1 + application/language/czech/general_words_lang.php | 1 + application/language/dutch/general_words_lang.php | 1 + application/language/english/general_words_lang.php | 1 + application/language/finnish/general_words_lang.php | 1 + application/language/french/general_words_lang.php | 1 + application/language/german/general_words_lang.php | 1 + application/language/greek/general_words_lang.php | 1 + application/language/italian/general_words_lang.php | 1 + application/language/polish/general_words_lang.php | 1 + application/language/russian/general_words_lang.php | 1 + application/language/spanish/general_words_lang.php | 1 + application/language/swedish/general_words_lang.php | 1 + application/language/turkish/general_words_lang.php | 1 + application/views/interface_assets/footer.php | 12 ++++++------ assets/js/sections/common.js | 2 +- assets/js/sections/distances.js | 2 +- assets/js/sections/gridmap.js | 2 +- 19 files changed, 24 insertions(+), 9 deletions(-) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index b12dd0e6..8280d94a 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Редактирай QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Маркирайте QSL получена (Бюро)'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 54d54087..3c86be41 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = '编辑 QSO'; $lang['general_mark_qsl_rx_bureau'] = '标记 已收到的QSL (卡片局)'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index 117603e5..cb4cb942 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Upravit QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Označit QSL přijato (Bureau)'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 8f1dd444..b1eadcf2 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Wijzig QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Markeer QSL ontvangen (Bureau)'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 4d647888..d0d29613 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Edit QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Mark QSL Received (Bureau)'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index fe2c3878..fdd763b2 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Muokkaa QSO:a'; $lang['general_mark_qsl_rx_bureau'] = 'Merkitse QSL vastaanotetuksi (Bureau)'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index b6008fcc..083df05c 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Editer QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Marquer QSL Reçue (Bureau)'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 792957f0..1ce22f7c 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Daten'; $lang['general_edit_qso'] = 'QSO bearbeiten'; $lang['general_mark_qsl_rx_bureau'] = 'Markiere QSL erhalten (Büro)'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 594e38dd..144736cb 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Επεξεργασία QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Σημείωση QSL ως Ελήφθη (Bureau)'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index e99f6048..5248c761 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Modifica QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Segna QSL Ricevuta (Bureau)'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index bbfb361a..8f901531 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_mark_qsl_requested'] = 'Zaznacz QSL zgodnie z żądaniem'; $lang['general_mark_qsl_requested_bureau'] = 'Zaznacz QSL zgodnie z żądaniem (Biuro)'; $lang['general_mark_qsl_requested_direct'] = 'Zaznacz QSL zgodnie z żądaniem (Bezpośredni)'; $lang['general_mark_qsl_not_required'] = 'Zaznacz QSLjako niewymagane'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_delete_qso'] = 'Usuń QSO'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index 5d31cf4d..429ec284 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_eqslcards'] = 'eQSL'; $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_word_details'] = 'Details'; $lang['general_edit_qso'] = 'Редактировать QSO'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 2530076c..f3d98671 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Editar QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Marcar QSL Recibida (Buró)'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index fea6e71b..fb2d12ea 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'Redigera QSO'; $lang['general_mark_qsl_rx_bureau'] = 'Ange QSL mottagen (Byrå)'; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 5b27c473..3f267605 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -58,6 +58,7 @@ $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; $lang['general_word_details'] = 'Details'; +$lang['general_word_qso_data'] = 'QSO Data'; $lang['general_edit_qso'] = 'QSO değiştirme'; $lang['general_mark_qsl_rx_bureau'] = 'QSL\'i alındı Olarak İşaretle (Ofis)'; diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index a08a0021..377f1c21 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1786,7 +1786,7 @@ $(document).ready(function(){ type: 'post', success: function(html) { BootstrapDialog.show({ - title: 'QSO Data', + title: '', cssClass: 'qso-dialog', size: BootstrapDialog.SIZE_WIDE, nl2br: false, @@ -2083,7 +2083,7 @@ $(document).ready(function(){ }, success: function(html) { BootstrapDialog.show({ - title: 'QSO Data', + title: '', size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-was-dialog', nl2br: false, @@ -2149,7 +2149,7 @@ $(document).ready(function(){ }, success: function(html) { BootstrapDialog.show({ - title: 'QSO Data', + title: '', size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-was-dialog', nl2br: false, @@ -2379,7 +2379,7 @@ function viewEqsl(picture, callsign) { }, success: function (html) { BootstrapDialog.show({ - title: 'QSO Data', + title: '', size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-dialog', nl2br: false, @@ -2424,7 +2424,7 @@ function viewEqsl(picture, callsign) { }, success: function (html) { var dialog = new BootstrapDialog({ - title: 'QSO Data', + title: '', size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-dialog', nl2br: false, @@ -2704,7 +2704,7 @@ function viewEqsl(picture, callsign) { data: {'State': state, 'County': county }, success: function(html) { BootstrapDialog.show({ - title: 'QSO Data', + title: '', size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-counties-dialog', nl2br: false, diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 4f677864..6125652f 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -124,7 +124,7 @@ function qso_edit(id) { }, success: function(html) { BootstrapDialog.show({ - title: 'QSO Data', + title: '', cssClass: 'edit-dialog', size: BootstrapDialog.SIZE_WIDE, nl2br: false, diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index b1abe9c2..c4e67109 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -144,7 +144,7 @@ function getDistanceQsos(distance) { }, success: function (html) { BootstrapDialog.show({ - title: 'QSO Data', + title: '', size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-dialog', nl2br: false, diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index 6ff91e5d..a349d407 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -123,7 +123,7 @@ function spawnGridsquareModal(loc_4char) { data: ajax_data, success: function (html) { BootstrapDialog.show({ - title: 'QSO Data', + title: '', cssClass: 'qso-dialog', size: BootstrapDialog.SIZE_WIDE, nl2br: false, From b59c44f1be945be1cd7884c445079d40658f78d7 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 5 Oct 2023 00:20:52 +0200 Subject: [PATCH 02/21] Multilang Contesting --- .../language/bulgarian/contesting_lang.php | 16 +++++++++- .../chinese_simplified/contesting_lang.php | 16 +++++++++- .../language/czech/contesting_lang.php | 16 +++++++++- .../language/dutch/contesting_lang.php | 16 +++++++++- .../language/english/contesting_lang.php | 14 ++++++++ .../language/finnish/contesting_lang.php | 16 +++++++++- .../language/french/contesting_lang.php | 14 ++++++++ .../language/german/contesting_lang.php | 16 +++++++++- .../language/greek/contesting_lang.php | 14 ++++++++ .../language/italian/contesting_lang.php | 14 ++++++++ .../language/polish/contesting_lang.php | 14 ++++++++ .../language/russian/contesting_lang.php | 14 ++++++++ .../language/spanish/contesting_lang.php | 14 ++++++++ .../language/swedish/contesting_lang.php | 14 ++++++++ .../language/turkish/contesting_lang.php | 14 ++++++++ application/views/contesting/index.php | 32 +++++++++---------- 16 files changed, 232 insertions(+), 22 deletions(-) diff --git a/application/language/bulgarian/contesting_lang.php b/application/language/bulgarian/contesting_lang.php index e6f3d1d1..35976bd4 100644 --- a/application/language/bulgarian/contesting_lang.php +++ b/application/language/bulgarian/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('Не е разрешен директен дост $lang['contesting_page_title'] = 'Регистриране на състезание'; $lang['contesting_button_reset_contest_session'] = 'Нулиране на сесията на състезанието'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Тип обмен'; $lang['contesting_exchange_type_serial'] = 'Serial'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Друг'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Име на състезанието'; @@ -15,4 +25,8 @@ $lang['contesting_btn_reset_qso'] = 'Нулиране на QSO'; $lang['contesting_btn_save_qso'] = 'Запазване на QSO'; $lang['contesting_title_callsign_suggestions'] = 'Предложения за инициали'; -$lang['contesting_title_contest_logbook'] = 'Дневник на състезанието'; \ No newline at end of file +$lang['contesting_title_contest_logbook'] = 'Дневник на състезанието'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/chinese_simplified/contesting_lang.php b/application/language/chinese_simplified/contesting_lang.php index 3154f7fb..a65ffa3f 100644 --- a/application/language/chinese_simplified/contesting_lang.php +++ b/application/language/chinese_simplified/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = '竞赛日志'; $lang['contesting_button_reset_contest_session'] = '重置竞赛会话'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = '信号交换类型'; $lang['contesting_exchange_type_serial'] = '序列编号'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = '其他'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = '竞赛名称'; @@ -15,4 +25,8 @@ $lang['contesting_btn_reset_qso'] = '重置 QSO'; $lang['contesting_btn_save_qso'] = '保存 QSO'; $lang['contesting_title_callsign_suggestions'] = '呼号建议'; -$lang['contesting_title_contest_logbook'] = '竞赛日志簿'; \ No newline at end of file +$lang['contesting_title_contest_logbook'] = '竞赛日志簿'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/czech/contesting_lang.php b/application/language/czech/contesting_lang.php index 67fa5643..3f636050 100644 --- a/application/language/czech/contesting_lang.php +++ b/application/language/czech/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = 'Závodní deník'; $lang['contesting_button_reset_contest_session'] = 'Resetovat závod'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Typ předávaného kódu'; $lang['contesting_exchange_type_serial'] = 'Číslo spojení'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Jiné'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Název závodu'; @@ -15,4 +25,8 @@ $lang['contesting_btn_reset_qso'] = 'Smazat QSO'; $lang['contesting_btn_save_qso'] = 'Uložit QSO'; $lang['contesting_title_callsign_suggestions'] = 'Našeptávač značek'; -$lang['contesting_title_contest_logbook'] = 'Závodní deník'; \ No newline at end of file +$lang['contesting_title_contest_logbook'] = 'Závodní deník'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/dutch/contesting_lang.php b/application/language/dutch/contesting_lang.php index 9fbce0f6..d5c6f5f8 100644 --- a/application/language/dutch/contesting_lang.php +++ b/application/language/dutch/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan'); $lang['contesting_page_title'] = 'Contest Logging'; $lang['contesting_button_reset_contest_session'] = 'Herstel Contest Sessie'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Soort uitwisseling'; $lang['contesting_exchange_type_serial'] = 'Volgnummer'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Anders'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Contest Naam'; @@ -15,4 +25,8 @@ $lang['contesting_btn_reset_qso'] = 'Wis QSO'; $lang['contesting_btn_save_qso'] = 'Bewaar QSO'; $lang['contesting_title_callsign_suggestions'] = 'Roepnaam suggesties'; -$lang['contesting_title_contest_logbook'] = 'Contest Logboek'; \ No newline at end of file +$lang['contesting_title_contest_logbook'] = 'Contest Logboek'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/english/contesting_lang.php b/application/language/english/contesting_lang.php index 8c619179..f078f321 100644 --- a/application/language/english/contesting_lang.php +++ b/application/language/english/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = 'Contest Logging'; $lang['contesting_button_reset_contest_session'] = 'Start new Contest Session'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Exchange Type'; $lang['contesting_exchange_type_serial'] = 'Serial'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Other'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Contest Name'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Save QSO'; $lang['contesting_title_callsign_suggestions'] = 'Callsign Suggestions'; $lang['contesting_title_contest_logbook'] = 'Contest Logbook'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/finnish/contesting_lang.php b/application/language/finnish/contesting_lang.php index 1e37e860..eb8a3ad8 100644 --- a/application/language/finnish/contesting_lang.php +++ b/application/language/finnish/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = 'Kilpailuloki'; $lang['contesting_button_reset_contest_session'] = 'Nollaa kilpailuloki'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Annettava sanoma'; $lang['contesting_exchange_type_serial'] = 'Sarjanumero'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Muu'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Kilpailun nimi'; @@ -15,4 +25,8 @@ $lang['contesting_btn_reset_qso'] = 'Nollaa QSO'; $lang['contesting_btn_save_qso'] = 'TALLENNA QSO'; $lang['contesting_title_callsign_suggestions'] = 'Ehdotettu kutsu'; -$lang['contesting_title_contest_logbook'] = 'Kilpailussa pidetyt yhteydet'; \ No newline at end of file +$lang['contesting_title_contest_logbook'] = 'Kilpailussa pidetyt yhteydet'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/french/contesting_lang.php b/application/language/french/contesting_lang.php index 87ae5b2b..f062d6e2 100644 --- a/application/language/french/contesting_lang.php +++ b/application/language/french/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = 'Logging Contest'; $lang['contesting_button_reset_contest_session'] = 'Réinitialiser la session Contest'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Type d\'échange'; $lang['contesting_exchange_type_serial'] = 'Série'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Autre'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Nom du Contest'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Sauvegarder QSO'; $lang['contesting_title_callsign_suggestions'] = 'Suggestion d\'indicatif'; $lang['contesting_title_contest_logbook'] = 'Logbook du Contest'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/german/contesting_lang.php b/application/language/german/contesting_lang.php index 9ba387c7..127e32a8 100644 --- a/application/language/german/contesting_lang.php +++ b/application/language/german/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('Direkter Zugriff auf Skripte ist nicht erlaubt'); $lang['contesting_page_title'] = 'Contest-Logging'; $lang['contesting_button_reset_contest_session'] = 'Beginne neue Contest-Sitzung'; +$lang['contesting_operator_callsign'] = 'Operator Rufzeichen'; $lang['contesting_exchange_type'] = 'Austauschtyp'; -$lang['contesting_exchange_type_serial'] = 'Laufende Nummer'; +$lang['contesting_exchange_type_serial'] = '(Lauf)-Nummer'; +$lang['contesting_exchange_type_none'] = 'Nichts'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Planquadrat'; $lang['contesting_exchange_type_other'] = 'Andere'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Planquadrat'; +$lang['contesting_exchange_serial_s'] = 'Nummer (S)'; +$lang['contesting_exchange_serial_r'] = 'Nummer (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Planquadrat (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Planquadrat (R)'; $lang['contesting_contest_name'] = 'Contest-Name'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Speichere QSO'; $lang['contesting_title_callsign_suggestions'] = 'Rufzeichenvorschläge'; $lang['contesting_title_contest_logbook'] = 'Contest-Logbuch'; + +$lang['contesting_copy_exch_to_dok'] = 'Kopiere den erhaltenen Exchange in das DOK Feld der Datenbank!'; + + diff --git a/application/language/greek/contesting_lang.php b/application/language/greek/contesting_lang.php index 85be4a56..2350f539 100644 --- a/application/language/greek/contesting_lang.php +++ b/application/language/greek/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = 'Αρχείο διαγωνισμού'; $lang['contesting_button_reset_contest_session'] = 'Επαναφορά Session διαγωνισμού'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Είδος Ανταλλαγής'; $lang['contesting_exchange_type_serial'] = 'Serial'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Αλλα'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Ονομα Διαγωνισμού'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Aποθήκευση QSO'; $lang['contesting_title_callsign_suggestions'] = 'Προτάσεις διακριτικού'; $lang['contesting_title_contest_logbook'] = 'Αρχείο διαγωνισμού'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/italian/contesting_lang.php b/application/language/italian/contesting_lang.php index be96e2b5..4821a34c 100644 --- a/application/language/italian/contesting_lang.php +++ b/application/language/italian/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('Non è permesso l\'accesso diretto allo script'); $lang['contesting_page_title'] = 'Log per Contest'; $lang['contesting_button_reset_contest_session'] = 'Azzera Sessione Contest'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Tipologia Scambio'; $lang['contesting_exchange_type_serial'] = 'Seriale'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Altro'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Nome Contest'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Salva QSO'; $lang['contesting_title_callsign_suggestions'] = 'Suggerimenti Nominativi'; $lang['contesting_title_contest_logbook'] = 'Log del Contest'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/polish/contesting_lang.php b/application/language/polish/contesting_lang.php index 0e81005a..3b9b940b 100644 --- a/application/language/polish/contesting_lang.php +++ b/application/language/polish/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = 'Logowanie Zawodów'; $lang['contesting_button_reset_contest_session'] = 'Wyczyść sesje'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Typ wymiany'; $lang['contesting_exchange_type_serial'] = 'Numeracja'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Inne'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Nazwa Zawodów'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Zapisz łączność'; $lang['contesting_title_callsign_suggestions'] = 'Podpowiadanie znaków'; $lang['contesting_title_contest_logbook'] = 'Log zawodów'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/russian/contesting_lang.php b/application/language/russian/contesting_lang.php index d55e0b4d..1b27e105 100644 --- a/application/language/russian/contesting_lang.php +++ b/application/language/russian/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = 'Журнал соревнований'; $lang['contesting_button_reset_contest_session'] = 'Сбросить сессию соревнований'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Тип обмена'; $lang['contesting_exchange_type_serial'] = 'Последовательный'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Другой'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Название соревнований'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Сохранить QSO'; $lang['contesting_title_callsign_suggestions'] = 'Предложение позывных'; $lang['contesting_title_contest_logbook'] = 'Журнал соревнований'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/spanish/contesting_lang.php b/application/language/spanish/contesting_lang.php index 7e2b0371..7bd9c978 100644 --- a/application/language/spanish/contesting_lang.php +++ b/application/language/spanish/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('Acceso directo a los scripts restringido'); $lang['contesting_page_title'] = 'Registro de concurso'; $lang['contesting_button_reset_contest_session'] = 'Resetar la sesión del concurso'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Tipo de intercambio'; $lang['contesting_exchange_type_serial'] = 'Serial'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Other'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Nombre del concurso'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Guardar QSO'; $lang['contesting_title_callsign_suggestions'] = 'Indicativos sugeridos'; $lang['contesting_title_contest_logbook'] = 'Logbook del concurso'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/swedish/contesting_lang.php b/application/language/swedish/contesting_lang.php index 25c7c51b..624c1542 100644 --- a/application/language/swedish/contesting_lang.php +++ b/application/language/swedish/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['contesting_page_title'] = 'Contest-loggning'; $lang['contesting_button_reset_contest_session'] = 'Nollställ denna contest-session'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Exchange-typ'; $lang['contesting_exchange_type_serial'] = 'Seriell'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Annat'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Contest-namn'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'Spara QSO'; $lang['contesting_title_callsign_suggestions'] = 'Signal-förslag'; $lang['contesting_title_contest_logbook'] = 'Contest loggbok'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/language/turkish/contesting_lang.php b/application/language/turkish/contesting_lang.php index c01bd2ee..4cec6522 100644 --- a/application/language/turkish/contesting_lang.php +++ b/application/language/turkish/contesting_lang.php @@ -4,10 +4,20 @@ defined('BASEPATH') OR exit('Doğrudan komut dosyası erişimine izin verilmez') $lang['contesting_page_title'] = 'Contest Logging'; $lang['contesting_button_reset_contest_session'] = 'Yarışma oturumunu baştan başlat'; +$lang['contesting_operator_callsign'] = 'Operator Callsign'; $lang['contesting_exchange_type'] = 'Haberleşme Tipi'; $lang['contesting_exchange_type_serial'] = 'Seri numarası'; +$lang['contesting_exchange_type_none'] = 'None'; +$lang['contesting_exchange_type_exchange'] = 'Exchange'; +$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; $lang['contesting_exchange_type_other'] = 'Diğer'; +$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; +$lang['contesting_exchange_serial_s'] = 'Serial (S)'; +$lang['contesting_exchange_serial_r'] = 'Serial (R)'; +$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; +$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; $lang['contesting_contest_name'] = 'Yarışma İsmi'; @@ -16,3 +26,7 @@ $lang['contesting_btn_save_qso'] = 'QSO\'yu kaydet'; $lang['contesting_title_callsign_suggestions'] = 'Çağrı Kodu Önerileri'; $lang['contesting_title_contest_logbook'] = 'Yarışma kayıt defteri'; + +$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; + + diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php index aaa54a6c..4a6026af 100644 --- a/application/views/contesting/index.php +++ b/application/views/contesting/index.php @@ -12,12 +12,12 @@
@@ -31,7 +31,7 @@ - +
' required>
@@ -112,7 +112,7 @@ @@ -122,7 +122,7 @@ @@ -132,7 +132,7 @@ @@ -142,7 +142,7 @@ @@ -165,7 +165,7 @@
- +
@@ -198,10 +198,10 @@ - Serial (S) - Serial (R) - Gridsquare - Vucc Gridsquare + + + + From e6db11f3b6fc0c0fa39b26728c974196a0d368b0 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 5 Oct 2023 00:24:55 +0200 Subject: [PATCH 03/21] "Contests" doubled --- application/views/contesting/add.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php index e62b9596..b9758576 100644 --- a/application/views/contesting/add.php +++ b/application/views/contesting/add.php @@ -11,9 +11,6 @@

-
- Contests -

Using the contest list, you can control which Contests are shown when logging QSOs in a contest. From 4781a13921fa4e4cfce22f08ffebfcf9fb279d06 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 5 Oct 2023 01:14:07 +0200 Subject: [PATCH 04/21] Added all _lang files to autoloader --- application/config/autoload.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/application/config/autoload.php b/application/config/autoload.php index dc34d5fb..693e6b06 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -98,16 +98,19 @@ $autoload['config'] = array('cloudlog', 'bands', 'lotw'); $autoload['language'] = array( 'account', + 'admin', 'contesting', 'eqsl', + 'filter', 'general_words', + 'gridsquares', 'lotw', 'menu', 'notes', + 'options', 'qslcard', 'qso', - 'gridsquares', - 'filter' + 'statistics' ); /* From e1345fb0bbe3d7a5f6b856fc5d1cf1782a8e470d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 5 Oct 2023 01:14:28 +0200 Subject: [PATCH 05/21] Multilang Contest Menu --- application/views/contesting/add.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php index b9758576..b23582c4 100644 --- a/application/views/contesting/add.php +++ b/application/views/contesting/add.php @@ -13,10 +13,10 @@

- Using the contest list, you can control which Contests are shown when logging QSOs in a contest. +

- Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected. +

From b2708ef7c22757fe95935f2bd740ad8d2b586dea Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 5 Oct 2023 01:14:56 +0200 Subject: [PATCH 06/21] Added Contest Menu Translations --- application/language/bulgarian/admin_lang.php | 11 ++++++++++- .../language/chinese_simplified/admin_lang.php | 11 ++++++++++- application/language/czech/admin_lang.php | 11 ++++++++++- application/language/dutch/admin_lang.php | 11 ++++++++++- application/language/english/admin_lang.php | 11 ++++++++++- application/language/finnish/admin_lang.php | 11 ++++++++++- application/language/french/admin_lang.php | 11 ++++++++++- application/language/german/admin_lang.php | 11 ++++++++++- application/language/greek/admin_lang.php | 11 ++++++++++- application/language/italian/admin_lang.php | 11 ++++++++++- application/language/polish/admin_lang.php | 11 ++++++++++- application/language/russian/admin_lang.php | 11 ++++++++++- application/language/spanish/admin_lang.php | 11 ++++++++++- application/language/swedish/admin_lang.php | 11 ++++++++++- application/language/turkish/admin_lang.php | 11 ++++++++++- 15 files changed, 150 insertions(+), 15 deletions(-) diff --git a/application/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php index 265a3b30..64bc7ff1 100644 --- a/application/language/bulgarian/admin_lang.php +++ b/application/language/bulgarian/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index e3710420..edb7e168 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = '设置'; $lang['admin_create_user'] = '创建用户'; $lang['admin_delete'] = '删除用户'; $lang['admin_edit'] = '编辑用户'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php index 0f9edef4..17786f2d 100644 --- a/application/language/czech/admin_lang.php +++ b/application/language/czech/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Možnosti'; $lang['admin_create_user'] = 'Vytvořit uživatele'; $lang['admin_delete'] = 'Smazat'; $lang['admin_edit'] = 'Upravit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php index ff02a8e7..a63c5aae 100644 --- a/application/language/dutch/admin_lang.php +++ b/application/language/dutch/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index eff1d9ce..56aaba7a 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php index 40ee8671..27f7bb94 100644 --- a/application/language/finnish/admin_lang.php +++ b/application/language/finnish/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Valinnat'; $lang['admin_create_user'] = 'Luo käyttäjä'; $lang['admin_delete'] = 'Poista'; $lang['admin_edit'] = 'Muokkaa'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index 25aee688..d8a86e62 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Creation d\'un utilisateur'; $lang['admin_delete'] = 'Supprimer'; $lang['admin_edit'] = 'Editer'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index 93e56c38..d0a9edef 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Optionen'; $lang['admin_create_user'] = 'Benutzer anlegen'; $lang['admin_delete'] = 'Löschen'; $lang['admin_edit'] = 'Editieren'; -$lang['admin_user_accounts'] = 'Benutzerkonten'; \ No newline at end of file +$lang['admin_user_accounts'] = 'Benutzerkonten'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Mit dieser Contest-Liste kannst du steuern, welche Contests im Contest-Logging Fenster angezeigt werden.'; +$lang['admin_contest_menu_line_2'] = 'Aktivierte Contests können im Contest-Logging Fenster ausgewählt werden, wohingegen deaktivierte ausgeblendet und somit auch nicht auswählbar gemacht werden.'; + + diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php index eff1d9ce..56aaba7a 100644 --- a/application/language/greek/admin_lang.php +++ b/application/language/greek/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php index eff1d9ce..56aaba7a 100644 --- a/application/language/italian/admin_lang.php +++ b/application/language/italian/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php index eff1d9ce..56aaba7a 100644 --- a/application/language/polish/admin_lang.php +++ b/application/language/polish/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php index 09442107..33338aec 100644 --- a/application/language/russian/admin_lang.php +++ b/application/language/russian/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Опции'; $lang['admin_create_user'] = 'Создать пользователя'; $lang['admin_delete'] = 'Удалить'; $lang['admin_edit'] = 'Редактировать'; -$lang['admin_user_accounts'] = 'Аккаунты пользователей'; \ No newline at end of file +$lang['admin_user_accounts'] = 'Аккаунты пользователей'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php index eff1d9ce..56aaba7a 100644 --- a/application/language/spanish/admin_lang.php +++ b/application/language/spanish/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php index 7dba1415..894e506c 100644 --- a/application/language/swedish/admin_lang.php +++ b/application/language/swedish/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Alternativ'; $lang['admin_create_user'] = 'Skapa användare'; $lang['admin_delete'] = 'Radera'; $lang['admin_edit'] = 'Redigera'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index c6f57767..1c0e207a 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -16,4 +16,13 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file +$lang['admin_user_accounts'] = 'User Accounts'; + + + +// Contest Menu + +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; + + From 3f3586c428e80b569e7b30bcc7e59c09da843396 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 5 Oct 2023 19:00:55 +0200 Subject: [PATCH 07/21] Pretty Code --- application/views/contesting/add.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php index b23582c4..840b205f 100644 --- a/application/views/contesting/add.php +++ b/application/views/contesting/add.php @@ -13,10 +13,10 @@

- +

- +

From 096a4cde001155267b7858f1d10b6b096ec9c100 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 5 Oct 2023 22:01:03 +0200 Subject: [PATCH 08/21] Multilang Support for Admin Contest Menu --- application/language/bulgarian/admin_lang.php | 18 ++++++++++++++++-- .../language/chinese_simplified/admin_lang.php | 14 ++++++++++++++ application/language/czech/admin_lang.php | 14 ++++++++++++++ application/language/dutch/admin_lang.php | 14 ++++++++++++++ application/language/english/admin_lang.php | 14 ++++++++++++++ application/language/finnish/admin_lang.php | 14 ++++++++++++++ application/language/french/admin_lang.php | 14 ++++++++++++++ application/language/german/admin_lang.php | 14 ++++++++++++++ application/language/greek/admin_lang.php | 14 ++++++++++++++ application/language/italian/admin_lang.php | 14 ++++++++++++++ application/language/polish/admin_lang.php | 14 ++++++++++++++ application/language/russian/admin_lang.php | 14 ++++++++++++++ application/language/spanish/admin_lang.php | 14 ++++++++++++++ application/language/swedish/admin_lang.php | 14 ++++++++++++++ application/language/turkish/admin_lang.php | 14 ++++++++++++++ 15 files changed, 212 insertions(+), 2 deletions(-) diff --git a/application/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php index 64bc7ff1..79c93112 100644 --- a/application/language/bulgarian/admin_lang.php +++ b/application/language/bulgarian/admin_lang.php @@ -22,7 +22,21 @@ $lang['admin_user_accounts'] = 'User Accounts'; // Contest Menu -$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; -$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; +$lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index edb7e168..bfd4f8ab 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php index 17786f2d..284cf8b5 100644 --- a/application/language/czech/admin_lang.php +++ b/application/language/czech/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php index a63c5aae..680b988b 100644 --- a/application/language/dutch/admin_lang.php +++ b/application/language/dutch/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index 56aaba7a..6a40c925 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php index 27f7bb94..8bbb15e4 100644 --- a/application/language/finnish/admin_lang.php +++ b/application/language/finnish/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index d8a86e62..8abc517e 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index d0a9edef..7760c0f9 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'Benutzerkonten'; $lang['admin_contest_menu_line_1'] = 'Mit dieser Contest-Liste kannst du steuern, welche Contests im Contest-Logging Fenster angezeigt werden.'; $lang['admin_contest_menu_line_2'] = 'Aktivierte Contests können im Contest-Logging Fenster ausgewählt werden, wohingegen deaktivierte ausgeblendet und somit auch nicht auswählbar gemacht werden.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Aktiv'; +$lang['admin_contest_menu_n_active'] = 'Nicht Aktiv'; +$lang['admin_contest_menu_activate'] = 'Aktiviere'; +$lang['admin_contest_menu_deactivate'] = 'Deaktiviere'; +$lang['admin_contest_add_contest'] = 'Erstelle einen Contest'; +$lang["admin_contest_create"] = "Erstellen"; +$lang['admin_contest_all_active'] = 'Aktiviere Alle'; +$lang['admin_contest_all_deactive'] = 'Deaktiviere Alle'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Der Name des Contest'; +$lang['admin_contest_name_of_adif'] = 'Der Name des Contest in ADIF Spezifikation'; diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php index 56aaba7a..6a40c925 100644 --- a/application/language/greek/admin_lang.php +++ b/application/language/greek/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php index 56aaba7a..6a40c925 100644 --- a/application/language/italian/admin_lang.php +++ b/application/language/italian/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php index 56aaba7a..6a40c925 100644 --- a/application/language/polish/admin_lang.php +++ b/application/language/polish/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php index 33338aec..0386e4ba 100644 --- a/application/language/russian/admin_lang.php +++ b/application/language/russian/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'Аккаунты пользователей'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php index 56aaba7a..6a40c925 100644 --- a/application/language/spanish/admin_lang.php +++ b/application/language/spanish/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php index 894e506c..d45c2dc0 100644 --- a/application/language/swedish/admin_lang.php +++ b/application/language/swedish/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index 1c0e207a..288df992 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -24,5 +24,19 @@ $lang['admin_user_accounts'] = 'User Accounts'; $lang['admin_contest_menu_line_1'] = 'Using the contest list, you can control which Contests are shown when logging QSOs in a contest.'; $lang['admin_contest_menu_line_2'] = 'Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected.'; +$lang['admin_contest_menu_name'] = 'Name'; +$lang['admin_contest_menu_adif'] = 'ADIF Name'; +$lang['admin_contest_menu_active'] = 'Active'; +$lang['admin_contest_menu_n_active'] = 'Not Active'; +$lang['admin_contest_menu_activate'] = 'Activate'; +$lang['admin_contest_menu_deactivate'] = 'Deactivate'; +$lang['admin_contest_add_contest'] = 'Add a Contest'; +$lang["admin_contest_create"] = "Create"; +$lang['admin_contest_all_active'] = 'Activate All'; +$lang['admin_contest_all_deactive'] = 'Deactivate All'; + +$lang['admin_contest_name_adif'] = 'Contest ADIF Name'; +$lang['admin_contest_name_of_contest'] = 'Name of the Contest'; +$lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; From f06e62ddfb54a697107fcc55f874829b10099d0d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 5 Oct 2023 22:02:26 +0200 Subject: [PATCH 09/21] Multilang Support for Admin Contest Menu --- application/views/contesting/add.php | 22 +++++++++++----------- application/views/contesting/create.php | 10 +++++----- assets/js/sections/contestingnames.js | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php index 840b205f..10c9a46b 100644 --- a/application/views/contesting/add.php +++ b/application/views/contesting/add.php @@ -22,9 +22,9 @@
- - - + + + @@ -35,19 +35,19 @@ - + @@ -57,9 +57,9 @@

- - - + + +

diff --git a/application/views/contesting/create.php b/application/views/contesting/create.php index 4a0bd5ee..2a89db38 100644 --- a/application/views/contesting/create.php +++ b/application/views/contesting/create.php @@ -21,18 +21,18 @@
- + - Name of Contest +
- + - Name of Contest in ADIF-specification +
- + diff --git a/assets/js/sections/contestingnames.js b/assets/js/sections/contestingnames.js index 88bc63f6..cd5bff49 100644 --- a/assets/js/sections/contestingnames.js +++ b/assets/js/sections/contestingnames.js @@ -68,8 +68,8 @@ function deactivateContest(contestid) { type: 'post', data: { 'id': contestid }, success: function (html) { - $(".contest_" + contestid).text('not active'); - $('.btn_' + contestid).html('Activate'); + $(`.contest_${contestid}`).text(""); + $('.btn_' + contestid).html(""); $('.btn_' + contestid).attr('onclick', 'activateContest(' + contestid + ')') } }); @@ -81,8 +81,8 @@ function activateContest(contestid) { type: 'post', data: { 'id': contestid }, success: function (html) { - $('.contest_' + contestid).text('active'); - $('.btn_' + contestid).html('Deactivate'); + $('.contest_' + contestid).text(""); + $('.btn_' + contestid).html(""); $('.btn_' + contestid).attr('onclick', 'deactivateContest(' + contestid + ')') } }); From 0bf88faad94a53bd52fa201bbbed68c673b74d22 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 6 Oct 2023 09:26:34 +0200 Subject: [PATCH 10/21] Multilang Active/Deactivate Contest List --- application/views/contesting/add.php | 6 ++++++ assets/js/sections/contestingnames.js | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php index 10c9a46b..0c28c328 100644 --- a/application/views/contesting/add.php +++ b/application/views/contesting/add.php @@ -35,6 +35,12 @@ +
NameAdif modeActive
'>'> Deactivate"; + echo ""; } else { - echo ""; + echo ""; };?> - " class="btn btn-outline-primary btn-sm"> Edit + " class="btn btn-outline-primary btn-sm"> - Delete +
'> "); - $('.btn_' + contestid).html(""); + $(`.contest_${contestid}`).text(lang_admin_contest_menu_n_active); + $('.btn_' + contestid).html(lang_admin_contest_menu_activate); $('.btn_' + contestid).attr('onclick', 'activateContest(' + contestid + ')') } }); @@ -81,8 +81,8 @@ function activateContest(contestid) { type: 'post', data: { 'id': contestid }, success: function (html) { - $('.contest_' + contestid).text(""); - $('.btn_' + contestid).html(""); + $('.contest_' + contestid).text(lang_admin_contest_menu_active); + $('.btn_' + contestid).html(lang_admin_contest_menu_deactivate); $('.btn_' + contestid).attr('onclick', 'deactivateContest(' + contestid + ')') } }); From 4514beacfc5ff30f01fd82ed480d1b6364855e5f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 6 Oct 2023 09:32:33 +0200 Subject: [PATCH 11/21] German Translation --- application/language/german/contesting_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/german/contesting_lang.php b/application/language/german/contesting_lang.php index 127e32a8..f2151eed 100644 --- a/application/language/german/contesting_lang.php +++ b/application/language/german/contesting_lang.php @@ -19,7 +19,7 @@ $lang['contesting_exchange_serial_r'] = 'Nummer (R)'; $lang['contesting_exchange_gridsquare_s'] = 'Planquadrat (S)'; $lang['contesting_exchange_gridsquare_r'] = 'Planquadrat (R)'; -$lang['contesting_contest_name'] = 'Contest-Name'; +$lang['contesting_contest_name'] = 'Contest Name'; $lang['contesting_btn_reset_qso'] = 'Setze QSO zurück'; $lang['contesting_btn_save_qso'] = 'Speichere QSO'; From e9a80c980d0a7f7f1f9aa0b93cbc8521bcd83873 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 6 Oct 2023 10:29:48 +0200 Subject: [PATCH 12/21] Added "Close" Translation --- application/language/bulgarian/admin_lang.php | 1 + application/language/chinese_simplified/admin_lang.php | 1 + application/language/czech/admin_lang.php | 1 + application/language/dutch/admin_lang.php | 1 + application/language/english/admin_lang.php | 1 + application/language/finnish/admin_lang.php | 1 + application/language/french/admin_lang.php | 1 + application/language/german/admin_lang.php | 1 + application/language/greek/admin_lang.php | 1 + application/language/italian/admin_lang.php | 1 + application/language/polish/admin_lang.php | 1 + application/language/russian/admin_lang.php | 1 + application/language/spanish/admin_lang.php | 1 + application/language/swedish/admin_lang.php | 1 + application/language/turkish/admin_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php index 79c93112..964dd59e 100644 --- a/application/language/bulgarian/admin_lang.php +++ b/application/language/bulgarian/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index bfd4f8ab..7a65aa57 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = '设置'; $lang['admin_create_user'] = '创建用户'; $lang['admin_delete'] = '删除用户'; $lang['admin_edit'] = '编辑用户'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php index 284cf8b5..6fcfb325 100644 --- a/application/language/czech/admin_lang.php +++ b/application/language/czech/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Možnosti'; $lang['admin_create_user'] = 'Vytvořit uživatele'; $lang['admin_delete'] = 'Smazat'; $lang['admin_edit'] = 'Upravit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php index 680b988b..164c0188 100644 --- a/application/language/dutch/admin_lang.php +++ b/application/language/dutch/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index 6a40c925..042d60fa 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php index 8bbb15e4..e37b324a 100644 --- a/application/language/finnish/admin_lang.php +++ b/application/language/finnish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Valinnat'; $lang['admin_create_user'] = 'Luo käyttäjä'; $lang['admin_delete'] = 'Poista'; $lang['admin_edit'] = 'Muokkaa'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index 8abc517e..368ae069 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Creation d\'un utilisateur'; $lang['admin_delete'] = 'Supprimer'; $lang['admin_edit'] = 'Editer'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index 7760c0f9..cc9312ef 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Optionen'; $lang['admin_create_user'] = 'Benutzer anlegen'; $lang['admin_delete'] = 'Löschen'; $lang['admin_edit'] = 'Editieren'; +$lang['admin_close'] = 'Schliessen'; $lang['admin_user_accounts'] = 'Benutzerkonten'; diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php index 6a40c925..042d60fa 100644 --- a/application/language/greek/admin_lang.php +++ b/application/language/greek/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php index 6a40c925..042d60fa 100644 --- a/application/language/italian/admin_lang.php +++ b/application/language/italian/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php index 6a40c925..042d60fa 100644 --- a/application/language/polish/admin_lang.php +++ b/application/language/polish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php index 0386e4ba..fc7756ae 100644 --- a/application/language/russian/admin_lang.php +++ b/application/language/russian/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Опции'; $lang['admin_create_user'] = 'Создать пользователя'; $lang['admin_delete'] = 'Удалить'; $lang['admin_edit'] = 'Редактировать'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'Аккаунты пользователей'; diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php index 6a40c925..042d60fa 100644 --- a/application/language/spanish/admin_lang.php +++ b/application/language/spanish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php index d45c2dc0..314f4dcd 100644 --- a/application/language/swedish/admin_lang.php +++ b/application/language/swedish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Alternativ'; $lang['admin_create_user'] = 'Skapa användare'; $lang['admin_delete'] = 'Radera'; $lang['admin_edit'] = 'Redigera'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index 288df992..7f6fc2c8 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; From 5202f20ebfa7229d464e351123325ffcd1e934a6 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 6 Oct 2023 10:30:32 +0200 Subject: [PATCH 13/21] "Add Contest" Translation --- application/views/contesting/add.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php index 0c28c328..18c1fd30 100644 --- a/application/views/contesting/add.php +++ b/application/views/contesting/add.php @@ -63,6 +63,10 @@

+ From e8c5c33206e3df5155e6c0b89417a20423ac302d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 6 Oct 2023 10:31:05 +0200 Subject: [PATCH 14/21] "Add Contest" Translation --- assets/js/sections/contestingnames.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/sections/contestingnames.js b/assets/js/sections/contestingnames.js index f99a6fb3..3b800e5a 100644 --- a/assets/js/sections/contestingnames.js +++ b/assets/js/sections/contestingnames.js @@ -30,13 +30,13 @@ function createContestDialog() { type: 'post', success: function (html) { BootstrapDialog.show({ - title: 'Add Contest', + title: lang_admin_contest_add_contest, size: BootstrapDialog.SIZE_WIDE, cssClass: 'create-contest-dialog', nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } From 65c9f5e9fb93cd3e34dac6f5f8b3ec24f7de7746 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 6 Oct 2023 10:48:01 +0200 Subject: [PATCH 15/21] Contest Translations --- application/controllers/Contesting.php | 2 +- application/language/bulgarian/admin_lang.php | 3 +++ .../chinese_simplified/admin_lang.php | 3 +++ application/language/czech/admin_lang.php | 3 +++ application/language/dutch/admin_lang.php | 3 +++ application/language/english/admin_lang.php | 3 +++ application/language/finnish/admin_lang.php | 3 +++ application/language/french/admin_lang.php | 3 +++ application/language/german/admin_lang.php | 3 +++ application/language/greek/admin_lang.php | 3 +++ application/language/italian/admin_lang.php | 3 +++ application/language/polish/admin_lang.php | 3 +++ application/language/russian/admin_lang.php | 3 +++ application/language/spanish/admin_lang.php | 3 +++ application/language/swedish/admin_lang.php | 3 +++ application/language/turkish/admin_lang.php | 3 +++ application/views/contesting/edit.php | 26 ++++++++++--------- 17 files changed, 60 insertions(+), 13 deletions(-) diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php index e32a87a5..64718f23 100644 --- a/application/controllers/Contesting.php +++ b/application/controllers/Contesting.php @@ -114,7 +114,7 @@ class Contesting extends CI_Controller { $data['contest'] = $this->Contesting_model->contest($item_id_clean); - $data['page_title'] = "Edit Contest"; + $data['page_title'] = lang('admin_contest_edit_update_contest'); $this->form_validation->set_rules('name', 'Contest Name', 'required'); $this->form_validation->set_rules('adifname', 'Adif Contest Name', 'required'); diff --git a/application/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php index 964dd59e..bf2ec87f 100644 --- a/application/language/bulgarian/admin_lang.php +++ b/application/language/bulgarian/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index 7a65aa57..7163b951 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = '设置'; $lang['admin_create_user'] = '创建用户'; $lang['admin_delete'] = '删除用户'; $lang['admin_edit'] = '编辑用户'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php index 6fcfb325..26e6c50d 100644 --- a/application/language/czech/admin_lang.php +++ b/application/language/czech/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Možnosti'; $lang['admin_create_user'] = 'Vytvořit uživatele'; $lang['admin_delete'] = 'Smazat'; $lang['admin_edit'] = 'Upravit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php index 164c0188..e2cadcfd 100644 --- a/application/language/dutch/admin_lang.php +++ b/application/language/dutch/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index 042d60fa..3f6e9824 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php index e37b324a..d66806c7 100644 --- a/application/language/finnish/admin_lang.php +++ b/application/language/finnish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Valinnat'; $lang['admin_create_user'] = 'Luo käyttäjä'; $lang['admin_delete'] = 'Poista'; $lang['admin_edit'] = 'Muokkaa'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index 368ae069..1a34ed35 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Creation d\'un utilisateur'; $lang['admin_delete'] = 'Supprimer'; $lang['admin_edit'] = 'Editer'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index cc9312ef..2a5155ed 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Optionen'; $lang['admin_create_user'] = 'Benutzer anlegen'; $lang['admin_delete'] = 'Löschen'; $lang['admin_edit'] = 'Editieren'; +$lang['admin_save'] = 'Speichern'; $lang['admin_close'] = 'Schliessen'; $lang['admin_user_accounts'] = 'Benutzerkonten'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deaktiviere Alle'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Der Name des Contest'; $lang['admin_contest_name_of_adif'] = 'Der Name des Contest in ADIF Spezifikation'; +$lang['admin_contest_edit_active_hint'] = 'Wähle "Aktiv" um den Contest in der Contest-Liste anzuzeigen'; +$lang['admin_contest_edit_update_contest'] = 'Aktualisiere Contest'; diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php index 042d60fa..3f6e9824 100644 --- a/application/language/greek/admin_lang.php +++ b/application/language/greek/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php index 042d60fa..3f6e9824 100644 --- a/application/language/italian/admin_lang.php +++ b/application/language/italian/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php index 042d60fa..3f6e9824 100644 --- a/application/language/polish/admin_lang.php +++ b/application/language/polish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php index fc7756ae..6b051124 100644 --- a/application/language/russian/admin_lang.php +++ b/application/language/russian/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Опции'; $lang['admin_create_user'] = 'Создать пользователя'; $lang['admin_delete'] = 'Удалить'; $lang['admin_edit'] = 'Редактировать'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'Аккаунты пользователей'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php index 042d60fa..3f6e9824 100644 --- a/application/language/spanish/admin_lang.php +++ b/application/language/spanish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php index 314f4dcd..718f4c93 100644 --- a/application/language/swedish/admin_lang.php +++ b/application/language/swedish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Alternativ'; $lang['admin_create_user'] = 'Skapa användare'; $lang['admin_delete'] = 'Radera'; $lang['admin_edit'] = 'Redigera'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index 7f6fc2c8..99ee05e6 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -16,6 +16,7 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; @@ -40,4 +41,6 @@ $lang['admin_contest_all_deactive'] = 'Deactivate All'; $lang['admin_contest_name_adif'] = 'Contest ADIF Name'; $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; +$lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; +$lang['admin_contest_edit_update_contest'] = 'Update Contest'; diff --git a/application/views/contesting/edit.php b/application/views/contesting/edit.php index dfe967b1..d70a920c 100644 --- a/application/views/contesting/edit.php +++ b/application/views/contesting/edit.php @@ -28,29 +28,31 @@

- + name; } ?>" required> - Name of Contest +
- + adifname; } ?>"> - Name of Contest in ADIF-specification +
- + - Set to active if to be listed in Contest-list + + + +
- +
From ae949e3b2f4482c793c00e81804afa154e5c4634 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 6 Oct 2023 13:14:54 +0200 Subject: [PATCH 16/21] Contest Controller Adjustments --- application/controllers/Contesting.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php index 64718f23..87343ae5 100644 --- a/application/controllers/Contesting.php +++ b/application/controllers/Contesting.php @@ -80,7 +80,7 @@ class Contesting extends CI_Controller { $this->load->library('form_validation'); $this->form_validation->set_rules('name', 'Contest Name', 'required'); - $this->form_validation->set_rules('adifname', 'Contest Adif Name', 'required'); + $this->form_validation->set_rules('adifname', 'Adif Contest Name', 'required'); if ($this->form_validation->run() == FALSE) { @@ -106,9 +106,8 @@ class Contesting extends CI_Controller { } public function edit($id) { - $this->load->library('form_validation'); - $this->load->model('Contesting_model'); + $this->load->library('form_validation'); $item_id_clean = $this->security->xss_clean($id); From cdb025c53eadfd07e70527c63c277c6d93b8f1b5 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 6 Oct 2023 22:17:08 +0200 Subject: [PATCH 17/21] Contest Translation --- application/language/bulgarian/admin_lang.php | 4 ++++ .../language/chinese_simplified/admin_lang.php | 4 ++++ application/language/czech/admin_lang.php | 4 ++++ application/language/dutch/admin_lang.php | 4 ++++ application/language/english/admin_lang.php | 4 ++++ application/language/finnish/admin_lang.php | 4 ++++ application/language/french/admin_lang.php | 4 ++++ application/language/german/admin_lang.php | 4 ++++ application/language/greek/admin_lang.php | 4 ++++ application/language/italian/admin_lang.php | 4 ++++ application/language/polish/admin_lang.php | 4 ++++ application/language/russian/admin_lang.php | 4 ++++ application/language/spanish/admin_lang.php | 4 ++++ application/language/swedish/admin_lang.php | 4 ++++ application/language/turkish/admin_lang.php | 4 ++++ application/views/contesting/add.php | 6 ++++++ assets/js/sections/contestingnames.js | 12 ++++++------ 17 files changed, 72 insertions(+), 6 deletions(-) diff --git a/application/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php index bf2ec87f..77f0753e 100644 --- a/application/language/bulgarian/admin_lang.php +++ b/application/language/bulgarian/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Edit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index 7163b951..d1d1c136 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = '编辑用户'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php index 26e6c50d..1baea86e 100644 --- a/application/language/czech/admin_lang.php +++ b/application/language/czech/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Upravit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php index e2cadcfd..6b161da8 100644 --- a/application/language/dutch/admin_lang.php +++ b/application/language/dutch/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Edit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index 3f6e9824..b42ab400 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Edit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php index d66806c7..0bb47c66 100644 --- a/application/language/finnish/admin_lang.php +++ b/application/language/finnish/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Muokkaa'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index 1a34ed35..54dff9ec 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Editer'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index 2a5155ed..1b909cb2 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Editieren'; $lang['admin_save'] = 'Speichern'; $lang['admin_close'] = 'Schliessen'; $lang['admin_user_accounts'] = 'Benutzerkonten'; +$lang['admin_danger'] = 'ACHTUNG!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Der Name des Contest'; $lang['admin_contest_name_of_adif'] = 'Der Name des Contest in ADIF Spezifikation'; $lang['admin_contest_edit_active_hint'] = 'Wähle "Aktiv" um den Contest in der Contest-Liste anzuzeigen'; $lang['admin_contest_edit_update_contest'] = 'Aktualisiere Contest'; +$lang['admin_contest_deletion_warning'] = 'Warnung! Bist du sicher den folgenden Contest zu löschen: '; +$lang['admin_contest_active_all_warning'] = 'Warnung! Bist du sicher, dass du ALLE Contests aktivieren willst?'; +$lang['admin_contest_deactive_all_warning'] = 'Warnung! Bist du sicher, dass du ALLE Contests deaktivieren willst?'; diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php index 3f6e9824..b42ab400 100644 --- a/application/language/greek/admin_lang.php +++ b/application/language/greek/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Edit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php index 3f6e9824..b42ab400 100644 --- a/application/language/italian/admin_lang.php +++ b/application/language/italian/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Edit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php index 3f6e9824..b42ab400 100644 --- a/application/language/polish/admin_lang.php +++ b/application/language/polish/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Edit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php index 6b051124..436ab179 100644 --- a/application/language/russian/admin_lang.php +++ b/application/language/russian/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Редактировать'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'Аккаунты пользователей'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php index 3f6e9824..b42ab400 100644 --- a/application/language/spanish/admin_lang.php +++ b/application/language/spanish/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Edit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php index 718f4c93..6c2f2796 100644 --- a/application/language/swedish/admin_lang.php +++ b/application/language/swedish/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Redigera'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index 99ee05e6..99232911 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -19,6 +19,7 @@ $lang['admin_edit'] = 'Edit'; $lang['admin_save'] = 'Save'; $lang['admin_close'] = 'Close'; $lang['admin_user_accounts'] = 'User Accounts'; +$lang['admin_danger'] = 'DANGER!'; @@ -43,4 +44,7 @@ $lang['admin_contest_name_of_contest'] = 'Name of the Contest'; $lang['admin_contest_name_of_adif'] = 'Name of Contest in ADIF-specification'; $lang['admin_contest_edit_active_hint'] = 'Set to active if to be listed in Contest-list'; $lang['admin_contest_edit_update_contest'] = 'Update Contest'; +$lang['admin_contest_deletion_warning'] = 'Warning! Are you sure you want to delete the following contest: '; +$lang['admin_contest_active_all_warning'] = 'Warning! Are you sure you want to activate all contests?'; +$lang['admin_contest_deactive_all_warning'] = 'Warning! Are you sure you want to deactivate all contests?'; diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php index 18c1fd30..4665c50e 100644 --- a/application/views/contesting/add.php +++ b/application/views/contesting/add.php @@ -50,6 +50,12 @@ };?> 		+ " class="btn btn-outline-primary btn-sm"> diff --git a/assets/js/sections/contestingnames.js b/assets/js/sections/contestingnames.js index 3b800e5a..d39b76d9 100644 --- a/assets/js/sections/contestingnames.js +++ b/assets/js/sections/contestingnames.js @@ -90,8 +90,8 @@ function activateContest(contestid) { function deleteContest(id, contest) { BootstrapDialog.confirm({ - title: 'DANGER', - message: 'Warning! Are you sure you want to delete the following contest: ' + contest + '?', + title: lang_admin_danger, + message: lang_admin_contest_deletion_warning + contest + '?', type: BootstrapDialog.TYPE_DANGER, closable: true, draggable: true, @@ -115,8 +115,8 @@ function deleteContest(id, contest) { function activateAllContests() { BootstrapDialog.confirm({ - title: 'DANGER', - message: 'Warning! Are you sure you want to activate all contests?', + title: lang_admin_danger, + message: lang_admin_contest_active_all_warning, type: BootstrapDialog.TYPE_DANGER, closable: true, draggable: true, @@ -137,8 +137,8 @@ function activateAllContests() { function deactivateAllContests() { BootstrapDialog.confirm({ - title: 'DANGER', - message: 'Warning! Are you sure you want to deactivate all contests?', + title: lang_admin_danger, + message: lang_admin_contest_deactive_all_warning, type: BootstrapDialog.TYPE_DANGER, closable: true, draggable: true, From 501afb2e9f9e143a8d379638d63ef7182ec96ffc Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 7 Oct 2023 01:42:07 +0200 Subject: [PATCH 18/21] "QSO Data" Multilang --- application/views/interface_assets/footer.php | 1 + assets/js/sections/common.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 377f1c21..44445e3c 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1793,6 +1793,7 @@ $(document).ready(function(){ message: html, onshown: function(dialog) { var qsoid = $("#qsoid").text(); + var lang_general_word_qso_data = '', $(".editButton").html(''); var lat = $("#lat").text(); var long = $("#long").text(); diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 6125652f..8461239f 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -124,7 +124,7 @@ function qso_edit(id) { }, success: function(html) { BootstrapDialog.show({ - title: '', + title: lang_general_word_qso_data, cssClass: 'edit-dialog', size: BootstrapDialog.SIZE_WIDE, nl2br: false, @@ -148,7 +148,7 @@ function qso_edit(id) { //$('#stationCntyInput')[0].selectize.destroy(); $("#stationCntyInputEdit").val(""); } - }); + }); $('#locator').change(function(){ if ($(this).val().length >= 4) { From 69b1876b6eceb057879bf051a072308558a11600 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 08:55:45 +0200 Subject: [PATCH 19/21] php/js correction --- application/views/distances/index.php | 4 +++- assets/js/sections/distances.js | 2 +- assets/js/sections/gridmap.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/application/views/distances/index.php b/application/views/distances/index.php index 2925346e..91bc1638 100644 --- a/application/views/distances/index.php +++ b/application/views/distances/index.php @@ -3,7 +3,9 @@

- +
diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index c4e67109..a15f1635 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -144,7 +144,7 @@ function getDistanceQsos(distance) { }, success: function (html) { BootstrapDialog.show({ - title: '', + title: lang_general_word_qso_data, size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-dialog', nl2br: false, diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index a349d407..2abd226c 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -123,7 +123,7 @@ function spawnGridsquareModal(loc_4char) { data: ajax_data, success: function (html) { BootstrapDialog.show({ - title: '', + title: lang_general_word_qso_data, cssClass: 'qso-dialog', size: BootstrapDialog.SIZE_WIDE, nl2br: false, From 067717e9ea0c8783fefb36e0775043128584e498 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 08:57:27 +0200 Subject: [PATCH 20/21] Back to origin --- assets/js/sections/contestingnames.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/contestingnames.js b/assets/js/sections/contestingnames.js index d39b76d9..ffdfa7f9 100644 --- a/assets/js/sections/contestingnames.js +++ b/assets/js/sections/contestingnames.js @@ -68,7 +68,7 @@ function deactivateContest(contestid) { type: 'post', data: { 'id': contestid }, success: function (html) { - $(`.contest_${contestid}`).text(lang_admin_contest_menu_n_active); + $(".contest_" + contestid).text(lang_admin_contest_menu_n_active); $('.btn_' + contestid).html(lang_admin_contest_menu_activate); $('.btn_' + contestid).attr('onclick', 'activateContest(' + contestid + ')') } From 2921a91671c11bcb14f6659dcfd56e7a4c0d6c5a Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 10:41:24 +0200 Subject: [PATCH 21/21] Repaired js in footer.php --- application/views/interface_assets/footer.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 44445e3c..d5ac95d3 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -11,6 +11,12 @@ var my_call = "session->userdata('user_callsign'); ?>".toUpperCase(); + @@ -1786,14 +1792,13 @@ $(document).ready(function(){ type: 'post', success: function(html) { BootstrapDialog.show({ - title: '', + title: lang_general_word_qso_data, cssClass: 'qso-dialog', size: BootstrapDialog.SIZE_WIDE, nl2br: false, message: html, onshown: function(dialog) { var qsoid = $("#qsoid").text(); - var lang_general_word_qso_data = '', $(".editButton").html(''); var lat = $("#lat").text(); var long = $("#long").text(); @@ -2084,7 +2089,7 @@ $(document).ready(function(){ }, success: function(html) { BootstrapDialog.show({ - title: '', + title: lang_general_word_qso_data, size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-was-dialog', nl2br: false, @@ -2150,7 +2155,7 @@ $(document).ready(function(){ }, success: function(html) { BootstrapDialog.show({ - title: '', + title: lang_general_word_qso_data, size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-was-dialog', nl2br: false, @@ -2380,7 +2385,7 @@ function viewEqsl(picture, callsign) { }, success: function (html) { BootstrapDialog.show({ - title: '', + title: lang_general_word_qso_data, size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-dialog', nl2br: false, @@ -2425,7 +2430,7 @@ function viewEqsl(picture, callsign) { }, success: function (html) { var dialog = new BootstrapDialog({ - title: '', + title: lang_general_word_qso_data, size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-dialog', nl2br: false, @@ -2705,7 +2710,7 @@ function viewEqsl(picture, callsign) { data: {'State': state, 'County': county }, success: function(html) { BootstrapDialog.show({ - title: '', + title: lang_general_word_qso_data, size: BootstrapDialog.SIZE_WIDE, cssClass: 'qso-counties-dialog', nl2br: false,