From b0515881cdf70a5077cc0fce46e5b6952bcf7198 Mon Sep 17 00:00:00 2001 From: DJ3CE Date: Thu, 21 Dec 2023 09:22:56 +0100 Subject: [PATCH 01/33] Introduce new (internal) function for updating UI --- application/views/interface_assets/footer.php | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 70ffb28a..c046bd6d 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1373,6 +1373,23 @@ $(document).on('keypress',function(e) { +

@@ -9,7 +13,7 @@ echo '
'; echo ''; - echo ''; + echo ''; foreach ($result as $master) { echo ''; @@ -18,7 +22,7 @@ echo ''; echo ''; - echo ''; + echo ''; foreach ($result as $master) { echo ''; @@ -30,8 +34,8 @@ } ?> -

Longest streak with QSOs in the log

-

A maximum of the 10 longest streaks are shown!

+

+

Year' . lang('general_word_year') . '' . $master->Year . '
Days' . lang('general_word_days') . '' . $master->Days . '
'; echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; foreach ($streaks as $streak) { @@ -71,15 +75,15 @@ } ?> -

Current streak with QSOs in the log

+

Streak (continuous days with QSOs)Begin dateEnd date' . lang('statistics_dwq_streak_continuous_days') . '' . lang('general_word_startdate') . '' . lang('general_word_enddate') . '
'; echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; echo ''; @@ -94,14 +98,14 @@ } elseif (is_array($almostcurrentstreak)) { ?> -

If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!

+
Current streak (continuous days with QSOs)Begin dateEnd date' . lang('statistics_dwq_current_streak_continuous_days') . '' . lang('general_word_startdate') . '' . lang('general_word_enddate') . '
'; echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; echo ''; @@ -115,7 +119,7 @@ echo '
Current streak (continuous days with QSOs)Begin dateEnd date' . lang('statistics_dwq_current_streak_continuous_days') . '' . lang('general_word_startdate') . '' . lang('general_word_enddate') . '
'; } else { - echo ''; + echo ''; } ?>
diff --git a/assets/js/sections/dayswithqso.js b/assets/js/sections/dayswithqso.js index d0c890a3..e825a069 100644 --- a/assets/js/sections/dayswithqso.js +++ b/assets/js/sections/dayswithqso.js @@ -15,7 +15,7 @@ $.ajax({ data: { labels: labels, datasets: [{ - label: 'Days with QSOs', + label: lang_days_with_qso_short, data: dataDxcc, backgroundColor: 'rgba(54, 162, 235, 0.2)', borderColor: 'rgba(54, 162, 235, 1)', From a0e60dd37cacb6ab6b9903160e9c709ab2579dc4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 1 Jan 2024 14:47:45 +0100 Subject: [PATCH 28/33] days with qso translation --- .../language/bulgarian/general_words_lang.php | 2 ++ .../language/bulgarian/statistics_lang.php | 16 ++++++++++++++++ .../chinese_simplified/general_words_lang.php | 2 ++ .../chinese_simplified/statistics_lang.php | 16 ++++++++++++++++ .../language/czech/general_words_lang.php | 2 ++ application/language/czech/statistics_lang.php | 16 ++++++++++++++++ .../language/dutch/general_words_lang.php | 2 ++ application/language/dutch/statistics_lang.php | 16 ++++++++++++++++ .../language/english/general_words_lang.php | 2 ++ application/language/english/statistics_lang.php | 16 ++++++++++++++++ .../language/finnish/general_words_lang.php | 2 ++ application/language/finnish/statistics_lang.php | 16 ++++++++++++++++ .../language/french/general_words_lang.php | 2 ++ application/language/french/statistics_lang.php | 16 ++++++++++++++++ .../language/german/general_words_lang.php | 2 ++ application/language/german/statistics_lang.php | 16 ++++++++++++++++ .../language/greek/general_words_lang.php | 2 ++ application/language/greek/statistics_lang.php | 16 ++++++++++++++++ .../language/italian/general_words_lang.php | 2 ++ application/language/italian/statistics_lang.php | 16 ++++++++++++++++ .../language/polish/general_words_lang.php | 2 ++ application/language/polish/statistics_lang.php | 16 ++++++++++++++++ .../language/russian/general_words_lang.php | 2 ++ application/language/russian/statistics_lang.php | 16 ++++++++++++++++ .../language/spanish/general_words_lang.php | 2 ++ application/language/spanish/statistics_lang.php | 16 ++++++++++++++++ .../language/swedish/general_words_lang.php | 2 ++ application/language/swedish/statistics_lang.php | 16 ++++++++++++++++ .../language/turkish/general_words_lang.php | 2 ++ application/language/turkish/statistics_lang.php | 16 ++++++++++++++++ 30 files changed, 270 insertions(+) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 48ecdc09..0c261f5d 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'Град'; $lang['general_word_total'] = 'Общо'; $lang['general_word_year'] = 'Година'; $lang['general_word_month'] = 'Месец'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/bulgarian/statistics_lang.php b/application/language/bulgarian/statistics_lang.php index a92ce98c..97a2f0b9 100644 --- a/application/language/bulgarian/statistics_lang.php +++ b/application/language/bulgarian/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 6248f91e..13c8704b 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = '城市'; $lang['general_word_total'] = '总计'; $lang['general_word_year'] = '年'; $lang['general_word_month'] = '月'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "颜色"; $lang['general_word_light'] = "浅色/激光"; diff --git a/application/language/chinese_simplified/statistics_lang.php b/application/language/chinese_simplified/statistics_lang.php index 58607ee1..cc6f3633 100644 --- a/application/language/chinese_simplified/statistics_lang.php +++ b/application/language/chinese_simplified/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "和波段"; $lang['statistics_timeline'] = "时间线"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index 4615e07d..b55ed058 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'Město'; $lang['general_word_total'] = 'Celkem'; $lang['general_word_year'] = 'Rok'; $lang['general_word_month'] = 'Měsíc'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/czech/statistics_lang.php b/application/language/czech/statistics_lang.php index dabf58d4..f636a7d1 100644 --- a/application/language/czech/statistics_lang.php +++ b/application/language/czech/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index dfe9e6ab..276edee3 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'By'; $lang['general_word_total'] = 'Totaal'; $lang['general_word_year'] = 'Jaar'; $lang['general_word_month'] = 'Maand'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/dutch/statistics_lang.php b/application/language/dutch/statistics_lang.php index 4709463c..62bfe00d 100644 --- a/application/language/dutch/statistics_lang.php +++ b/application/language/dutch/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 93793b1d..8b780e57 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Total'; $lang['general_word_year'] = 'Year'; $lang['general_word_month'] = 'Month'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/english/statistics_lang.php b/application/language/english/statistics_lang.php index 50a90e0d..c995c0f2 100644 --- a/application/language/english/statistics_lang.php +++ b/application/language/english/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 07794d42..ad19d3d7 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Yhteensä'; $lang['general_word_year'] = 'Vuosi'; $lang['general_word_month'] = 'Kuukausi'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/finnish/statistics_lang.php b/application/language/finnish/statistics_lang.php index eb8feb45..c5b61102 100644 --- a/application/language/finnish/statistics_lang.php +++ b/application/language/finnish/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 37887ba3..c2507b69 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = "Ville"; $lang['general_word_total'] = "Total"; $lang['general_word_year'] = "Année"; $lang['general_word_month'] = "Mois"; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Couleurs"; $lang['general_word_light'] = "Lumière/Laser"; diff --git a/application/language/french/statistics_lang.php b/application/language/french/statistics_lang.php index 132f5e6c..c9631523 100644 --- a/application/language/french/statistics_lang.php +++ b/application/language/french/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "et bandes"; $lang['statistics_timeline'] = "Chronologie"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 3032fbfc..b746bb62 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'Stadt'; $lang['general_word_total'] = 'Gesamt'; $lang['general_word_year'] = 'Jahr'; $lang['general_word_month'] = 'Monat'; +$lang['general_word_day'] = "Tag"; +$lang['general_word_days'] = "Tage"; $lang['general_word_colors'] = "Farben"; $lang['general_word_light'] = "Licht/Laser"; diff --git a/application/language/german/statistics_lang.php b/application/language/german/statistics_lang.php index 376dfc3b..f91e0d98 100644 --- a/application/language/german/statistics_lang.php +++ b/application/language/german/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "und Band"; $lang['statistics_timeline'] = "Zeitleiste"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Anzahl der Tage mit QSOs pro Jahr"; +$lang['statistics_days_with_qso_short'] = "Tage mit QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Längste Serie mit QSOs im Logbuch"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "Es werden maximal die 10 längsten Serien angezeigt!"; +$lang['statistics_dwq_streak_continuous_days'] = "Serie (fortlaufende Tage mit QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Aktuelle Serie mit QSOs im Logbuch"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Aktuelle Serie (fortlaufende Tage mit QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "Wenn Sie heute ein QSO machen, können Sie Ihre Serie verlängern... Andernfalls wird Ihre aktuelle Serie unterbrochen!"; +$lang['statistics_dwq_no_current_streak'] = "Keine aktuelle Serie gefunden!"; + diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 32ee11e9..5e6fa2b0 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Σύνολο'; $lang['general_word_year'] = 'Ετος'; $lang['general_word_month'] = 'Μήνας'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/greek/statistics_lang.php b/application/language/greek/statistics_lang.php index 50a90e0d..c995c0f2 100644 --- a/application/language/greek/statistics_lang.php +++ b/application/language/greek/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 5c3a2527..2a3aefaa 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Totale'; $lang['general_word_year'] = 'Anno'; $lang['general_word_month'] = 'Mese'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/italian/statistics_lang.php b/application/language/italian/statistics_lang.php index 50a90e0d..c995c0f2 100644 --- a/application/language/italian/statistics_lang.php +++ b/application/language/italian/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index 142db493..560178fe 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Suma'; $lang['general_word_year'] = 'Rok'; $lang['general_word_month'] = 'Miesiąc'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/polish/statistics_lang.php b/application/language/polish/statistics_lang.php index 50a90e0d..c995c0f2 100644 --- a/application/language/polish/statistics_lang.php +++ b/application/language/polish/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index d0409c41..e0648572 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Всего'; $lang['general_word_year'] = 'Год'; $lang['general_word_month'] = 'Месяц'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Цвета"; $lang['general_word_light'] = "Свет/лазер"; diff --git a/application/language/russian/statistics_lang.php b/application/language/russian/statistics_lang.php index 46bc9a0c..2e9efab2 100644 --- a/application/language/russian/statistics_lang.php +++ b/application/language/russian/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "и диапазоне"; $lang['statistics_timeline'] = "Лента времени"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 68f081a2..20a5946f 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Total'; $lang['general_word_year'] = 'Año'; $lang['general_word_month'] = 'Mes'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/spanish/statistics_lang.php b/application/language/spanish/statistics_lang.php index 50a90e0d..c995c0f2 100644 --- a/application/language/spanish/statistics_lang.php +++ b/application/language/spanish/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index 0b72fa50..8dcda245 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_country'] = 'Land'; $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Totalt'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_year'] = 'I år'; $lang['general_word_month'] = 'Denna månad'; diff --git a/application/language/swedish/statistics_lang.php b/application/language/swedish/statistics_lang.php index cbc11921..05419132 100644 --- a/application/language/swedish/statistics_lang.php +++ b/application/language/swedish/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 56be209f..9904847b 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -47,6 +47,8 @@ $lang['general_word_city'] = 'City'; $lang['general_word_total'] = 'Toplam'; $lang['general_word_year'] = 'Yıl'; $lang['general_word_month'] = 'Ay'; +$lang['general_word_day'] = "Day"; +$lang['general_word_days'] = "Days"; $lang['general_word_colors'] = "Colors"; $lang['general_word_light'] = "Light/Laser"; diff --git a/application/language/turkish/statistics_lang.php b/application/language/turkish/statistics_lang.php index 50a90e0d..c995c0f2 100644 --- a/application/language/turkish/statistics_lang.php +++ b/application/language/turkish/statistics_lang.php @@ -42,3 +42,19 @@ $lang['statistics_distances_and_band'] = "and band"; $lang['statistics_timeline'] = "Timeline"; +/* +* +* Days with QSO +* +*/ + +$lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; +$lang['statistics_days_with_qso_short'] = "Days with QSOs"; +$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; +$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; +$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; +$lang['statistics_dwq_no_current_streak'] = "No current streak found!"; + From a12ffe87d45870889d94f5ee7b4727c142c5d658 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 1 Jan 2024 16:04:29 +0000 Subject: [PATCH 29/33] [Search] Only show if dxcc_name is provided --- application/views/search/result.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/views/search/result.php b/application/views/search/result.php index a7d62863..5f498361 100644 --- a/application/views/search/result.php +++ b/application/views/search/result.php @@ -22,10 +22,12 @@ + DXCC + Gridsquare From 28f19d03502e98a2191152419a402517b25d5951 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 1 Jan 2024 16:25:56 +0000 Subject: [PATCH 30/33] fixes issue where dxcc wasn't grabbed from callbook --- application/controllers/Logbook.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index bf57c479..054de873 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -833,6 +833,11 @@ class Logbook extends CI_Controller { $this->session->set_userdata('qrz_session_key', $qrz_session_key); $callsign['callsign'] = $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname')); } + if (isset($callsign['callsign']['dxcc'])) { + $this->load->model('logbook_model'); + $entity = $this->logbook_model->get_entity($callsign['callsign']['dxcc']); + $callsign['callsign']['dxcc_name'] = $entity['name']; + } } else if ($this->config->item('callbook') == "hamqth" && $this->config->item('hamqth_username') != null && $this->config->item('hamqth_password') != null) { // Load the HamQTH library $this->load->library('hamqth'); @@ -854,6 +859,11 @@ class Logbook extends CI_Controller { $this->load->model('logbook_model'); $callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band')); } + if (isset($callsign['callsign']['dxcc'])) { + $this->load->model('logbook_model'); + $entity = $this->logbook_model->get_entity($callsign['callsign']['dxcc']); + $callsign['callsign']['dxcc_name'] = $entity['name']; + } if (isset($callsign['callsign']['error'])) { $callsign['error'] = $callsign['callsign']['error']; } @@ -876,8 +886,8 @@ class Logbook extends CI_Controller { if (isset($callsign['callsign']['error'])) { $callsign['error'] = $callsign['callsign']['error']; } - $callsign['id'] = strtoupper($id); + $callsign['id'] = strtoupper($id); return $this->load->view('search/result', $callsign, true); } } From 4a126d5565048d377e7f2fa6a800827d69519db9 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 1 Jan 2024 16:40:45 +0000 Subject: [PATCH 31/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0eed61dd..6b17f34f 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,6 @@ Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K Cloudlog is supported by Patreon and donations via PayPal, thanks to the following people: -Paul (M0TZO), Tim (G4VXE), Paul (N8HM), Michelle (W5NYV), Mitchell (AD0HJ), Dan (M0TCB), Martin (DK3ML), Juan Carlos (EA5WA), Iain (M0PCB), Charlie (GM1TGY), Ondrej (OK1CDJ), Trystan (G0KAY), Oliver (DL6KBG), Volkmar Schirmer, Jordan (M0PIR), Thomas Ziegler, Mathis (DB9MAT), Ken (VE3HLS), Tyler (WL7T), Jeremy Taylor, Ben Kuhn, Eric Thresher, Michael Cullen, Juuso (OH1JW), Anthony Castiglia, Fernando Ramirez-Ferrer, Robert Dixon, Mark Percival, Julia (KV1V), Timo Tomasini, Ant (NU1U), Christopher Williams, Danny Barnes, Vic, Tom (M0LTE), smurphboy, Lars (SM0TGU), Theo (PD9DP), Stefan (SM0RGM). Peter (G0ABI), Lou (KI5FTY), Michael (DG3NAB), Dragan (4O4A), minorsecond, Emily (W7AYQ), Steve (M0SKM), Rob (M0VFC), Doug (WA6L), Petr (OK1PKR), Fabian (HB9HIL), Daniel (OK2VLK). +Paul (M0TZO), Tim (G4VXE), Paul (N8HM), Michelle (W5NYV), Mitchell (AD0HJ), Dan (M0TCB), Martin (DK3ML), Juan Carlos (EA5WA), Iain (M0PCB), Charlie (GM1TGY), Ondrej (OK1CDJ), Trystan (G0KAY), Oliver (DL6KBG), Volkmar Schirmer, Jordan (M0PIR), Thomas Ziegler, Mathis (DB9MAT), Ken (VE3HLS), Tyler (WL7T), Jeremy Taylor, Ben Kuhn, Eric Thresher, Michael Cullen, Juuso (OH1JW), Anthony Castiglia, Fernando Ramirez-Ferrer, Robert Dixon, Mark Percival, Julia (KV1V), Timo Tomasini, Ant (NU1U), Christopher Williams, Danny Barnes, Vic, Tom (M0LTE), smurphboy, Lars (SM0TGU), Theo (PD9DP), Stefan (SM0RGM). Peter (G0ABI), Lou (KI5FTY), Michael (DG3NAB), Dragan (4O4A), minorsecond, Emily (W7AYQ), Steve (M0SKM), Rob (M0VFC), Doug (WA6L), Petr (OK1PKR), Fabian (HB9HIL), Daniel (OK2VLK), John (M5JFS). If you'd like to donate to Cloudlog to help allow @magicbug spend less time doing commercial work and more time coding Cloudlog then you can donate via [PayPal](https://paypal.me/PGoodhall), [Github Sponsor](https://github.com/sponsors/magicbug) or become a [Patreon](https://www.patreon.com/2m0sql) From 1c85452be8e8ec4ce1070055e2237ea872252a7e Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 1 Jan 2024 17:34:18 +0000 Subject: [PATCH 32/33] Change HADES-D to SO-121 --- assets/json/satellite_data.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/json/satellite_data.json b/assets/json/satellite_data.json index 9ccd5a91..f77478cb 100644 --- a/assets/json/satellite_data.json +++ b/assets/json/satellite_data.json @@ -439,6 +439,18 @@ ] } }, + "SO-121":{ + "Modes":{ + "V/U":[ + { + "Uplink_Mode":"FM", + "Uplink_Freq":"145875000", + "Downlink_Mode":"FM", + "Downlink_Freq":"436666000" + } + ] + } + }, "TEVEL-1":{ "Modes":{ "V/U":[ @@ -559,18 +571,6 @@ ] } }, - "HADES-D":{ - "Modes":{ - "V/U":[ - { - "Uplink_Mode":"FM", - "Uplink_Freq":"145875000", - "Downlink_Mode":"FM", - "Downlink_Freq":"436666000" - } - ] - } - }, "INSPIRE-SAT 7":{ "Modes":{ "V/U":[ From 0387ad301ab22ed9a19a4cb5dced1714b24fa323 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 1 Jan 2024 17:43:57 +0000 Subject: [PATCH 33/33] Updated MIT licence copyright date to 2024 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 61abe68f..22b6a30c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Peter Goodhall +Copyright (c) 2024 Peter Goodhall Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal