From cca8ca60c64dc827d08054196e7585abe38ca3df Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 24 Oct 2023 17:42:53 +0200 Subject: [PATCH 1/9] added general language for map views --- application/views/interface_assets/footer.php | 4 ++++ assets/js/sections/cqmap.js | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index a20ebe770..ebb178e11 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -18,6 +18,10 @@ var lang_general_word_qso_data = ""; var lang_general_word_danger = ""; var lang_qso_delete_warning = ""; + var lang_general_word_colors = ""; + var lang_general_word_confirmed = ""; + var lang_general_word_worked_not_confirmed = ""; + var lang_general_word_not_worked = ""; diff --git a/assets/js/sections/cqmap.js b/assets/js/sections/cqmap.js index dba3eed40..3cae92f19 100644 --- a/assets/js/sections/cqmap.js +++ b/assets/js/sections/cqmap.js @@ -176,10 +176,10 @@ function load_cq_map2(data) { legend.onAdd = function(map) { var div = L.DomUtil.create("div", "legend"); - div.innerHTML += "

Colors

"; - div.innerHTML += 'Confirmed ('+confirmed+')
'; - div.innerHTML += 'Worked not confirmed ('+workednotconfirmed+')
'; - div.innerHTML += 'Not worked ('+notworked+')
'; + div.innerHTML += "

" + lang_general_word_colors + "

"; + div.innerHTML += "" + lang_general_word_confirmed + " (" + confirmed + ")
"; + div.innerHTML += "" + lang_general_word_worked_not_confirmed + " (" + workednotconfirmed + ")
"; + div.innerHTML += "" + lang_general_word_not_worked + " (" + notworked + ")
"; return div; }; From e7e0e5b1cff07be8031f5760137bd52ff8f7a29d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 24 Oct 2023 17:43:18 +0200 Subject: [PATCH 2/9] several translations --- .../language/bulgarian/awards_lang.php | 12 +++++++++ .../language/bulgarian/general_words_lang.php | 5 ++++ .../chinese_simplified/awards_lang.php | 12 +++++++++ .../chinese_simplified/general_words_lang.php | 5 ++++ application/language/czech/awards_lang.php | 12 +++++++++ .../language/czech/general_words_lang.php | 5 ++++ application/language/dutch/awards_lang.php | 12 +++++++++ .../language/dutch/general_words_lang.php | 5 ++++ application/language/english/awards_lang.php | 12 +++++++++ .../language/english/general_words_lang.php | 5 ++++ application/language/finnish/awards_lang.php | 12 +++++++++ .../language/finnish/general_words_lang.php | 5 ++++ application/language/french/awards_lang.php | 12 +++++++++ .../language/french/general_words_lang.php | 5 ++++ application/language/german/awards_lang.php | 26 ++++++++++++++----- .../language/german/general_words_lang.php | 5 ++++ application/language/german/menu_lang.php | 2 +- application/language/greek/awards_lang.php | 12 +++++++++ .../language/greek/general_words_lang.php | 5 ++++ application/language/italian/awards_lang.php | 12 +++++++++ .../language/italian/general_words_lang.php | 5 ++++ application/language/polish/awards_lang.php | 12 +++++++++ .../language/polish/general_words_lang.php | 5 ++++ application/language/russian/awards_lang.php | 12 +++++++++ .../language/russian/general_words_lang.php | 5 ++++ application/language/spanish/awards_lang.php | 12 +++++++++ .../language/spanish/general_words_lang.php | 5 ++++ application/language/swedish/awards_lang.php | 12 +++++++++ .../language/swedish/general_words_lang.php | 5 ++++ application/language/turkish/awards_lang.php | 12 +++++++++ .../language/turkish/general_words_lang.php | 5 ++++ 31 files changed, 263 insertions(+), 8 deletions(-) diff --git a/application/language/bulgarian/awards_lang.php b/application/language/bulgarian/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/bulgarian/awards_lang.php +++ b/application/language/bulgarian/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 77ea1a5d6..97987ff39 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Общо'; $lang['general_word_year'] = 'Година'; $lang['general_word_month'] = 'Месец'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Работени'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Потвърдени'; $lang['general_word_needed'] = 'Необходими'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Изпратени'; $lang['general_word_received'] = 'Получени'; $lang['general_word_requested'] = 'Заявени'; $lang['general_word_queued'] = 'Queued'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Invalid (Ignore)'; $lang['general_word_qslcard'] = 'QSL катичка'; $lang['general_word_qslcard_management'] = 'Управление на QSL'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Локатор'; diff --git a/application/language/chinese_simplified/awards_lang.php b/application/language/chinese_simplified/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/chinese_simplified/awards_lang.php +++ b/application/language/chinese_simplified/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 677794520..4c9123f7a 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = '总计'; $lang['general_word_year'] = '年'; $lang['general_word_month'] = '月'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = '已通联'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = '已确认'; $lang['general_word_needed'] = '待通联'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = '已发送'; $lang['general_word_received'] = '已收到'; $lang['general_word_requested'] = '已请求'; $lang['general_word_queued'] = '已排队'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = '无效(忽略)'; $lang['general_word_qslcard'] = 'QSL 卡片'; $lang['general_word_qslcard_management'] = 'QSL 管理'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = '信号交换 (发)'; $lang['gen_hamradio_exchange_rcvd_short'] = '信号交换 (收)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = '定位器'; diff --git a/application/language/czech/awards_lang.php b/application/language/czech/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/czech/awards_lang.php +++ b/application/language/czech/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index 3368940c2..12740f7b8 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Celkem'; $lang['general_word_year'] = 'Rok'; $lang['general_word_month'] = 'Měsíc'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Spojeno'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Potvrzeno'; $lang['general_word_needed'] = 'Potřebuje se'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Odesláno'; $lang['general_word_received'] = 'Přijato'; $lang['general_word_requested'] = 'Vyžádáno'; $lang['general_word_queued'] = 'Ve frontě'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Neplatné (Ignorováno)'; $lang['general_word_qslcard'] = 'QSL karta'; $lang['general_word_qslcard_management'] = 'Správa QSL'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Výměna (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Výměna (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Lokátor'; diff --git a/application/language/dutch/awards_lang.php b/application/language/dutch/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/dutch/awards_lang.php +++ b/application/language/dutch/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 75da87750..0b52154e5 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Totaal'; $lang['general_word_year'] = 'Jaar'; $lang['general_word_month'] = 'Maand'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Gewerkt'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Bevestigd'; $lang['general_word_needed'] = 'Nodig'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Sent'; $lang['general_word_received'] = 'Ontvangen'; $lang['general_word_requested'] = 'Aangevraagd'; $lang['general_word_queued'] = 'Queued'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Invalid (Ignore)'; $lang['general_word_qslcard'] = 'QSL Card'; $lang['general_word_qslcard_management'] = 'QSL Management'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Verz (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Ontv (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locator'; diff --git a/application/language/english/awards_lang.php b/application/language/english/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/english/awards_lang.php +++ b/application/language/english/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 78b8121fc..19f6155da 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Total'; $lang['general_word_year'] = 'Year'; $lang['general_word_month'] = 'Month'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Worked'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Confirmed'; $lang['general_word_needed'] = 'Needed'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Sent'; $lang['general_word_received'] = 'Received'; $lang['general_word_requested'] = 'Requested'; $lang['general_word_queued'] = 'Queued'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Invalid (Ignore)'; $lang['general_word_qslcard'] = 'QSL Card'; $lang['general_word_qslcard_management'] = 'QSL Management'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locator'; diff --git a/application/language/finnish/awards_lang.php b/application/language/finnish/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/finnish/awards_lang.php +++ b/application/language/finnish/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index a51ffab80..1430d65c8 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Yhteensä'; $lang['general_word_year'] = 'Vuosi'; $lang['general_word_month'] = 'Kuukausi'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Workittu'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Kuitattu'; $lang['general_word_needed'] = 'Tarvittu'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Lähetetyt'; $lang['general_word_received'] = 'Vastaanotetut'; $lang['general_word_requested'] = 'Pyydetyt'; $lang['general_word_queued'] = 'Queued'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Virheellinen (Ohita)'; $lang['general_word_qslcard'] = 'QSL-kortti'; $lang['general_word_qslcard_management'] = 'QSL-manageri'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Lokaattori'; diff --git a/application/language/french/awards_lang.php b/application/language/french/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/french/awards_lang.php +++ b/application/language/french/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 2faf4f5c1..cefcb7aa5 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Total'; $lang['general_word_year'] = 'Année'; $lang['general_word_month'] = 'Mois'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Réalisés'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Confirmés'; $lang['general_word_needed'] = 'Demandés'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Envoyées'; $lang['general_word_received'] = 'Reçues'; $lang['general_word_requested'] = 'Demandées'; $lang['general_word_queued'] = 'Queued'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Invalid (Ignore)'; $lang['general_word_qslcard'] = 'QSL Card'; $lang['general_word_qslcard_management'] = 'QSL Management'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locator'; diff --git a/application/language/german/awards_lang.php b/application/language/german/awards_lang.php index 09e0bcb57..8c70fe176 100644 --- a/application/language/german/awards_lang.php +++ b/application/language/german/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('Direkter Skriptzugriff nicht erlaubt'); $lang['awards_info_button'] = "Diplom Info"; +$lang['awards_show_worked'] = "Zeige gearbeitete"; +$lang['awards_show_confirmed'] = "Zeige bestätigte"; +$lang['awards_show_not_worked'] = "Zeige nicht gearbeitete"; +$lang['awards_show_cq_map'] = "Zeige CQ Zonen Karte"; +$lang['awards_summary'] = "Zusammenfassung"; +$lang['awards_total'] = "Gesamt"; +$lang['awards_total_worked'] = "Gesamt gearbeitet"; +$lang['awards_total_confirmed'] = "Gesamt bestätigt"; + + +$lang['awards_cq_page_title'] = "Diplome - CQ Magazin WAZ"; + /* ___________________________________________________________________________________________ @@ -11,7 +23,7 @@ ________________________________________________________________________________ */ $lang['awards_cq_description_ln1'] = "CQ Magazine WAZ Diplom"; -$lang['awards_cq_description_ln2'] = "Das CQ Magazine befindet sich in den USA und ist eines der beliebtesten Amateurfunkmagazine der Welt. Das Magazin erschien erstmals im Januar 1945 und konzentriert sich auf Auszeichnungen und die praktischen Aspekte des Amateurfunks."; +$lang['awards_cq_description_ln2'] = "Das CQ Magazine befindet sich in den USA und ist eines der beliebtesten Amateurfunkmagazine der Welt. Das Magazin erschien erstmals im Januar 1945 und konzentriert sich auf Diplome und die praktischen Aspekte des Amateurfunks."; $lang['awards_cq_description_ln3'] = "Der WAZ Award steht für 'Worked All Zones' und erfordert Kontakte zu allen 40 CQ-Zonen sowie die entsprechende QSL Bestätigung."; $lang['awards_cq_description_ln4'] = "Sie finden alle Informationen und Regeln auf der Website des CQ Magazine."; @@ -72,8 +84,8 @@ ________________________________________________________________________________ $lang['awards_pota_description_ln1'] = "POTA Diplome"; $lang['awards_pota_description_ln2'] = "Parks on the Air® (POTA) startete Anfang 2017, als das 'National Parks on the Air' - Special Event des ARRL endete. Eine Gruppe von Freiwilligen wollte den Spaß über das einjährige Ereignis hinaus fortsetzen, und so wurde POTA geboren."; -$lang['awards_pota_description_ln3'] = "POTA funktioniert ähnlich wie SOTA, mit Aktivatoren und Jägern. Für die Auszeichnungen gibt es verschiedene Kategorien, die auf der Anzahl der Parks, geografischen Gebieten und mehr basieren."; -$lang['awards_pota_description_ln4'] = "Für weitere Informationen zu den verfügbaren Auszeichnungen und Kategorien besuchen Sie bitte die Parks on the Air®-Website."; +$lang['awards_pota_description_ln3'] = "POTA funktioniert ähnlich wie SOTA, mit Aktivatoren und Jägern. Für die Diplome gibt es verschiedene Kategorien, die auf der Anzahl der Parks, geografischen Gebieten und mehr basieren."; +$lang['awards_pota_description_ln4'] = "Für weitere Informationen zu den verfügbaren Diplome und Kategorien besuchen Sie bitte die Parks on the Air®-Website."; /* @@ -83,8 +95,8 @@ ________________________________________________________________________________ */ $lang['awards_sig_description_ln1'] = "SIG-Information"; -$lang['awards_sig_description_ln2'] = "Die SIG- oder Signature-Kategorie ermöglicht die Verwendung beliebiger 'Diplom-Identifikationen' für Auszeichnungen, die nicht in Cloudlog implementiert sind."; -$lang['awards_sig_description_ln3'] = "Der Grund dafür ist, dass das gängige ADIF-Format nur wenige dedizierte Felder für bestimmte Auszeichnungen bietet. SIG ermöglicht es dennoch, alle anderen Arten von Signaturmarkierungen zu verwenden und auszuwerten."; +$lang['awards_sig_description_ln2'] = "Die SIG- oder Signature-Kategorie ermöglicht die Verwendung beliebiger 'Diplom-Identifikationen' für Diplome, die nicht in Cloudlog implementiert sind."; +$lang['awards_sig_description_ln3'] = "Der Grund dafür ist, dass das gängige ADIF-Format nur wenige dedizierte Felder für bestimmte Diplome bietet. SIG ermöglicht es dennoch, alle anderen Arten von Signaturmarkierungen zu verwenden und auszuwerten."; $lang['awards_sig_description_ln4'] = "Im QSO-Verarbeitung finden Sie zwei Felder: 'SIG' enthält die tatsächliche Markierung, die auch in der Auswertung der Auszeichnung sichtbar ist, und 'SIG INFO', das eine Beschreibung der Signatur enthält. Beide Felder sind frei anpassbar."; @@ -109,7 +121,7 @@ ________________________________________________________________________________ $lang['awards_counties_description_ln1'] = "US County Diplom"; $lang['awards_counties_description_ln2'] = "Das US Counties Diplom (USA-CA) der Vereinigten Staaten von Amerika, gesponsert von CQ Magazine, wird für bestätigte Funkkontakte mit einer festgelegten Anzahl von US-Counties unter Regeln und Bedingungen verliehen, die Sie hier finden können."; $lang['awards_counties_description_ln3'] = "USA-CA steht allen lizenzierten Funkamateuren weltweit zur Verfügung und wird an Einzelpersonen für alle gemachten County-Kontakte verliehen, unabhängig von den verwendeten Rufzeichen, Stationsorten oder Daten."; -$lang['awards_counties_description_ln4'] = "Spezielle USA-CA-Auszeichnungen stehen auch für SWLs auf der Grundlage des Gehörten zur Verfügung."; +$lang['awards_counties_description_ln4'] = "Spezielle USA-CA-Diplome stehen auch für SWLs auf der Grundlage des Gehörten zur Verfügung."; /* @@ -120,7 +132,7 @@ ________________________________________________________________________________ $lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Diplom"; $lang['awards_us_gridmaster_description_ln2'] = "Der GridMaster Award ist die renommierteste AMSAT-Auszeichnung, die erstmals 2014 von der Star Comm Group eingeführt wurde. Sie steht allen Funkamateuren weltweit zur Verfügung, die es schaffen, alle 488 Planquadrate in den USA via Satellit zu arbeiten und für jeden Kontakt QSL-Bestätigungen vorlegen können."; -$lang['awards_us_gridmaster_description_ln3'] = "Offizielle Informationen von der Website: Es muss eine Zweiwegekommunikation über Amateurfunksatellit mit jedem Gitter hergestellt werden. Es ist keine Mindest-Signalreport erforderlich. Die Kontakte müssen vom selben Standort aus erfolgen oder von Standorten aus, die nicht mehr als 200 Kilometer voneinander entfernt sind. Die Aussage des Antragstellers in der Auszeichnungsanwendung dient als Bestätigung der Einhaltung der Abstandsregel. Personen können mehrere GridMaster-Auszeichnungen beantragen und erhalten, wenn sie von einem anderen Standort aus erreicht werden, der sich in einem anderen 200-Kilometer-Kreis befindet."; +$lang['awards_us_gridmaster_description_ln3'] = "Offizielle Informationen von der Website: Es muss eine Zweiwegekommunikation über Amateurfunksatellit mit jedem Gitter hergestellt werden. Es ist keine Mindest-Signalreport erforderlich. Die Kontakte müssen vom selben Standort aus erfolgen oder von Standorten aus, die nicht mehr als 200 Kilometer voneinander entfernt sind. Die Aussage des Antragstellers in der Auszeichnungsanwendung dient als Bestätigung der Einhaltung der Abstandsregel. Personen können mehrere GridMaster-Diplome beantragen und erhalten, wenn sie von einem anderen Standort aus erreicht werden, der sich in einem anderen 200-Kilometer-Kreis befindet."; $lang['awards_us_gridmaster_description_ln4'] = "Diese Karte zeigt nur QSOs, die über SAT gearbeitet wurden."; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 27a6c1e05..a1baa9f7e 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Gesamt'; $lang['general_word_year'] = 'Jahr'; $lang['general_word_month'] = 'Monat'; +$lang['general_word_colors'] = "Farben"; $lang['general_word_worked'] = 'Gearbeitet'; +$lang['general_word_worked_not_confirmed'] = "Gearbeitet, nicht bestätigt"; +$lang['general_word_not_worked'] = "Nicht gearbeitet"; $lang['general_word_confirmed'] = 'Bestätigt'; $lang['general_word_needed'] = 'Benötigt'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Gesendet'; $lang['general_word_received'] = 'Erhalten'; $lang['general_word_requested'] = 'Angefordert'; $lang['general_word_queued'] = 'In Warteschlange'; +$lang['general_word_table'] = "Tabelle"; $lang['general_word_invalid_ignore'] = 'Ungültig (Ignorieren)'; $lang['general_word_qslcard'] = 'QSL Karte'; $lang['general_word_qslcard_management'] = 'QSL Verwaltung'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'Mein Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Typ"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locator'; diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 7d91eaf0a..5dea75dd8 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -33,7 +33,7 @@ $lang['menu_timeplotter'] = 'Zeitplotter'; $lang['menu_custom_maps'] = 'Benutzerdefinierte Karte'; $lang['menu_continents'] = 'Kontinente'; -$lang['menu_awards'] = 'Auszeichnungen'; +$lang['menu_awards'] = 'Diplome'; $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; diff --git a/application/language/greek/awards_lang.php b/application/language/greek/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/greek/awards_lang.php +++ b/application/language/greek/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 8e906f19f..a0f6f0367 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Σύνολο'; $lang['general_word_year'] = 'Ετος'; $lang['general_word_month'] = 'Μήνας'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Worked'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Επιβεβαιωμένο'; $lang['general_word_needed'] = 'Απαιτείται'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Απεσταλμένα'; $lang['general_word_received'] = 'Ελήφθη'; $lang['general_word_requested'] = 'Έχει ζητηθεί'; $lang['general_word_queued'] = 'Σε ουρά'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Μη έγκυρο (Αγνόησή)'; $lang['general_word_qslcard'] = 'Κάρτa QSL'; $lang['general_word_qslcard_management'] = 'QSL Management'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Τοποθετών'; diff --git a/application/language/italian/awards_lang.php b/application/language/italian/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/italian/awards_lang.php +++ b/application/language/italian/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 6e81b3a02..e6df26f75 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Totale'; $lang['general_word_year'] = 'Anno'; $lang['general_word_month'] = 'Mese'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Lavorato'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Confermato'; $lang['general_word_needed'] = 'Necessario'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Inviata'; $lang['general_word_received'] = 'Ricevuta'; $lang['general_word_requested'] = 'Richiesta'; $lang['general_word_queued'] = 'In coda'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Invalido (Ignora)'; $lang['general_word_qslcard'] = 'Cartolina QSL'; $lang['general_word_qslcard_management'] = 'Gestione QSL'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Scambio (I)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Scambio (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locatore'; diff --git a/application/language/polish/awards_lang.php b/application/language/polish/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/polish/awards_lang.php +++ b/application/language/polish/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index eff46bfef..fa5eb2481 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Suma'; $lang['general_word_year'] = 'Rok'; $lang['general_word_month'] = 'Miesiąc'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Pracowane'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Potwierdzone'; $lang['general_word_needed'] = 'Wymagane'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Wysłane'; $lang['general_word_received'] = 'Odebrane'; $lang['general_word_requested'] = 'Poproszone'; $lang['general_word_queued'] = 'Queued'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Invalid (Ignore)'; $lang['general_word_qslcard'] = 'Karta QSL'; $lang['general_word_qslcard_management'] = 'Zarządzanie kartami'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Wymiana (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Wymiana (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Lokator'; diff --git a/application/language/russian/awards_lang.php b/application/language/russian/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/russian/awards_lang.php +++ b/application/language/russian/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index 90fcbbcca..65c2bd703 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Всего'; $lang['general_word_year'] = 'Год'; $lang['general_word_month'] = 'Месяц'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Сработано'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Подтверждено'; $lang['general_word_needed'] = 'Необходимо'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Отправлено'; $lang['general_word_received'] = 'Принято'; $lang['general_word_requested'] = 'Запрошено'; $lang['general_word_queued'] = 'В очереди'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Некорректно (Игнорировать)'; $lang['general_word_qslcard'] = 'QSL карточка'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_refs'] = 'Refs'; $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; diff --git a/application/language/spanish/awards_lang.php b/application/language/spanish/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/spanish/awards_lang.php +++ b/application/language/spanish/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 7dec0cc26..169f47349 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Total'; $lang['general_word_year'] = 'Año'; $lang['general_word_month'] = 'Mes'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Realizados'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Confirmados'; $lang['general_word_needed'] = 'Solicitadas'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Enviado'; $lang['general_word_received'] = 'Recibido'; $lang['general_word_requested'] = 'Solicitadas'; $lang['general_word_queued'] = 'Queued'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Invalid (Ignore)'; $lang['general_word_qslcard'] = 'Tarjeta QSL'; $lang['general_word_qslcard_management'] = 'Gestión de QSL'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Intercambio (Env)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Intercambio (Recib)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Localizador'; diff --git a/application/language/swedish/awards_lang.php b/application/language/swedish/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/swedish/awards_lang.php +++ b/application/language/swedish/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index b97046f80..5efc70044 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Totalt'; $lang['general_word_year'] = 'I år'; $lang['general_word_month'] = 'Denna månad'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Körda'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Bekräftade'; $lang['general_word_needed'] = 'Behövs'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Skickad'; $lang['general_word_received'] = 'Mottagen'; $lang['general_word_requested'] = 'Begärd'; $lang['general_word_queued'] = 'Köad'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Invalid (Ignore)'; $lang['general_word_qslcard'] = 'QSL-kort'; $lang['general_word_qslcard_management'] = 'QSL Management'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Lokator'; diff --git a/application/language/turkish/awards_lang.php b/application/language/turkish/awards_lang.php index d010cb3f9..611ee0164 100644 --- a/application/language/turkish/awards_lang.php +++ b/application/language/turkish/awards_lang.php @@ -3,6 +3,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['awards_info_button'] = "Award Info"; +$lang['awards_show_worked'] = "Show worked"; +$lang['awards_show_confirmed'] = "Show confirmed"; +$lang['awards_show_not_worked'] = "Show not worked"; +$lang['awards_show_cq_map'] = "Show CQ Zone Map"; +$lang['awards_summary'] = "Summary"; +$lang['awards_total'] = "Total"; +$lang['awards_total_worked'] = "Total worked"; +$lang['awards_total_confirmed'] = "Total confirmed"; + + +$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ"; + /* ___________________________________________________________________________________________ diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 44c4834f6..d23b6749b 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Toplam'; $lang['general_word_year'] = 'Yıl'; $lang['general_word_month'] = 'Ay'; +$lang['general_word_colors'] = "Colors"; $lang['general_word_worked'] = 'Çalışılanlar'; +$lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; +$lang['general_word_not_worked'] = "Not worked"; $lang['general_word_confirmed'] = 'Onaylanan'; $lang['general_word_needed'] = 'İstenenler'; @@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Gönderilen'; $lang['general_word_received'] = 'Gelen'; $lang['general_word_requested'] = 'İstenen'; $lang['general_word_queued'] = 'Sıralanan'; +$lang['general_word_table'] = "Table"; $lang['general_word_invalid_ignore'] = 'Geçersiz (Yok say)'; $lang['general_word_qslcard'] = 'QSL Kartı'; $lang['general_word_qslcard_management'] = 'QSL Yönetimi'; @@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (G)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (A)'; $lang['gen_hamradio_qsl'] = 'QSL'; +$lang['gen_hamradio_qsltype'] = "QSL Type"; $lang['gen_hamradio_qslvia'] = 'QSL via'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Konum kodu'; From 01a5009b3c5ec3e0be24cc849d963974af77601b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 24 Oct 2023 17:44:07 +0200 Subject: [PATCH 3/9] Multilanguage Support --- application/views/awards/cq/index.php | 61 ++++++++++++++------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index ee4a6ccb8..e273b923c 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -2,6 +2,7 @@ #cqmap { height: calc(100vh - 430px) !important; max-height: 900px !important; + margin-bottom: 30px !important; } /*Legend specific*/ .legend { @@ -43,7 +44,7 @@ var lang_award_info_ln3 = ""; var lang_award_info_ln4 = ""; -

+

@@ -52,46 +53,46 @@
-
Worked / Confirmed
+
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
-
QSL Type
+
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('eqsl')) echo ' checked="checked"'; ?> > - +
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -126,10 +127,10 @@
- - + + + ?>
@@ -138,10 +139,10 @@
@@ -154,17 +155,17 @@
-
+
+ echo " + - '; + "; foreach($bands as $band) { echo ''; } @@ -180,28 +181,28 @@ } echo ''; } - echo '
#CQ Zone" . lang('gen_hamradio_cq_zone') . "' . $band . '
-

Summary

+ echo " +

" . lang('awards_summary') . "

- +
- '; + "; foreach($bands as $band) { echo ''; } - echo ' + echo " - '; + "; foreach ($cq_summary['worked'] as $dxcc) { // Fills the table with the data echo ''; } - echo ' - '; + echo " + "; foreach ($cq_summary['confirmed'] as $dxcc) { // Fills the table with the data echo ''; } From 116d0ea2e13e133ce65047129491c405429f0e51 Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 04:53:03 +0000 Subject: [PATCH 4/9] Added sorting like printing and callbook-lookup to Label-List --- application/models/Qslprint_model.php | 16 ++++++++++++++-- application/views/qslprint/qslprint.php | 3 ++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/application/models/Qslprint_model.php b/application/models/Qslprint_model.php index 548696067..cd8878bf8 100644 --- a/application/models/Qslprint_model.php +++ b/application/models/Qslprint_model.php @@ -79,7 +79,13 @@ class Qslprint_model extends CI_Model { // always filter user. this ensures that even if the station_id is from another user no inaccesible QSOs will be returned $this->db->where('station_profile.user_id', $this->session->userdata('user_id')); $this->db->where_in('COL_QSL_SENT', array('R', 'Q')); - $this->db->order_by("COL_TIME_ON", "DESC"); + $this->db->order_by("COL_DXCC", "ASC"); + $this->db->order_by("COL_CALL", "ASC"); + $this->db->order_by("COL_SAT_NAME", "ASC"); + $this->db->order_by("COL_SAT_MODE", "ASC"); + $this->db->order_by("COL_BAND_RX", "ASC"); + $this->db->order_by("COL_TIME_ON", "ASC"); + $this->db->order_by("COL_MODE", "ASC"); $query = $this->db->get($this->config->item('table_name')); return $query; @@ -133,7 +139,13 @@ class Qslprint_model extends CI_Model { $this->db->where('station_profile.user_id', $this->session->userdata('user_id')); $this->db->where('COL_CALL like "%'.$callsign.'%"'); $this->db->where('coalesce(COL_QSL_SENT, "") not in ("R", "Q")'); - $this->db->order_by("COL_TIME_ON", "DESC"); + $this->db->order_by("COL_DXCC", "ASC"); + $this->db->order_by("COL_CALL", "ASC"); + $this->db->order_by("COL_SAT_NAME", "ASC"); + $this->db->order_by("COL_SAT_MODE", "ASC"); + $this->db->order_by("COL_BAND_RX", "ASC"); + $this->db->order_by("COL_TIME_ON", "ASC"); + $this->db->order_by("COL_MODE", "ASC"); $query = $this->db->get($this->config->item('table_name')); return $query; diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index a9dbd0f9b..1af5b3a1c 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -43,7 +43,8 @@ if ($qsos->result() != NULL) { foreach ($qsos->result() as $qsl) { echo ''; echo ''; - echo ''; + ?>' . $qsl->COL_CALL . ''; echo ''; echo ''; echo ''; From 424a1e38c94ed4c2a212537215bc27dbe6e77a4a Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 04:54:46 +0000 Subject: [PATCH 5/9] Removed commtened "Backup-Line" --- application/views/qslprint/qslprint.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index 1af5b3a1c..e9d42747c 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -44,7 +44,6 @@ if ($qsos->result() != NULL) { echo ''; echo ''; ?>' . $qsl->COL_CALL . ''; echo ''; echo ''; echo ''; From 47b090b283e9e79f6bf1dc4a62213d98d6173fe2 Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 05:36:46 +0000 Subject: [PATCH 6/9] Add Detailview to QSLPrint-View --- application/views/qslprint/qslprint.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index e9d42747c..d1c495891 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -13,6 +13,7 @@ if (empty($station_id)) { } if ($qsos->result() != NULL) { + echo '
'; echo '
' . $band . 'Total
" . lang('awards_total') . "
Total worked
" . lang('awards_total_worked') . "' . $dxcc . '
Total confirmed
" . lang('awards_total_confirmed') . "' . $dxcc . '
' . $qsl->COL_CALL . 'COL_CALL)); ?> Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '
COL_CALL)); ?> Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '
@@ -43,7 +44,7 @@ if ($qsos->result() != NULL) { foreach ($qsos->result() as $qsl) { echo ''; echo ''; - ?>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; echo ''; echo ''; @@ -56,7 +57,7 @@ if ($qsos->result() != NULL) { echo ''; echo ''; } - echo '
COL_CALL)); ?> Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.ccCOL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?>Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '
'; + echo '
'; ?>

From f9e1b4b2b73a8d4421f8642de3033678381f8bcc Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 05:44:46 +0000 Subject: [PATCH 7/9] Fixed MapBug at QSO-Detail --- application/views/qslprint/qslprint.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index d1c495891..bfe0b63e5 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -44,7 +44,7 @@ if ($qsos->result() != NULL) { foreach ($qsos->result() as $qsl) { echo ''; echo '

'; - ?>COL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?>Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.ccCOL_CALL)); ?>Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo ''; From 9c286d8a0d69df9f92dbf7c4be46b629552b2f76 Mon Sep 17 00:00:00 2001 From: int2001 Date: Thu, 26 Oct 2023 05:30:25 +0000 Subject: [PATCH 8/9] Fixes Bug where cookie_samesite wasn't set --- system/libraries/Session/Session_driver.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php index d65c1381e..5ceb18b38 100644 --- a/system/libraries/Session/Session_driver.php +++ b/system/libraries/Session/Session_driver.php @@ -150,6 +150,12 @@ abstract class CI_Session_driver implements SessionHandlerInterface { return; } + if (isset($this->_config['cookie_samesite'])) { + $css=$this->_config['cookie_samesite']; + } else { + $css=TRUE; + } + return setcookie( $this->_config['cookie_name'], '', @@ -159,7 +165,7 @@ abstract class CI_Session_driver implements SessionHandlerInterface { 'domain' => $this->_config['cookie_domain'], 'secure' => $this->_config['cookie_secure'], 'httponly' => TRUE, - 'samesite' => $this->_config['cookie_samesite'] + 'samesite' => $css ) ); } From 664c819c598727d3b5b1f160ab2fcffaf5108ee9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 10:24:30 +0200 Subject: [PATCH 9/9] fixed css mistake --- application/views/awards/cq/index.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index e273b923c..d4f0051f2 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -1,8 +1,7 @@