From f2f864a21899e9a7989436b3caff84ef26f346b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Mel=C3=ADk?= Date: Tue, 24 Dec 2024 08:55:11 +0100 Subject: [PATCH 1/2] Fix CAT radio alert UI in case it displays just some part of the optional information --- application/views/interface_assets/footer.php | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 969af12f4..fd7c8c487 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1238,24 +1238,28 @@ $($('#callsign')).on('keypress',function(e) { } } else { $(".radio_timeout_error" ).remove(); - text = 'TX: ' + data.frequency_formatted; + separator = ''; + text = '' + separator + 'TX: ' + data.frequency_formatted; if(data.mode != null) { - text = text+''+data.mode; + text = text + separator + data.mode; } if(data.power != null && data.power != 0) { - text = text+''+data.power+' W'; + text = text + separator + data.power+' W'; } - ptext = ''; + complementary_info = [] if(data.prop_mode != null && data.prop_mode != '') { - ptext = ptext + data.prop_mode; if (data.prop_mode == 'SAT') { - ptext = ptext + ' ' + data.satname; - } + complementary_info.push(data.prop_mode + ' ' + data.satname); + } else { + complementary_info.push(data.prop_mode); + } } if(data.frequency_rx != null && data.frequency_rx != 0) { - ptext = ptext + 'RX: ' + data.frequency_rx_formatted; + complementary_info.push('RX: ' + data.frequency_rx_formatted); } - if( ptext != '') { text = text + '(' + ptext + ')';} + if( complementary_info.length > 0) { + text = text + separator + '(' + complementary_info.join(separator) + ')'; + } if (! $('#radio_cat_state').length) { $('#radio_status').prepend(''); } else { From 380f3707f6bf5810dbd0de5af2980b4949f33d34 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 24 Dec 2024 09:04:47 +0000 Subject: [PATCH 2/2] po/mo updates --- .../locale/bg_BG/LC_MESSAGES/messages.po | 60 +++++++++---------- application/locale/bs/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/cnr/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/cs_CZ/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/de_DE/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/el_GR/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/es_ES/LC_MESSAGES/messages.po | 60 +++++++++---------- application/locale/et/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/fi_FI/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/fr_FR/LC_MESSAGES/messages.po | 60 +++++++++---------- application/locale/hr/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/it_IT/LC_MESSAGES/messages.po | 60 +++++++++---------- application/locale/lt/LC_MESSAGES/messages.po | 60 +++++++++---------- application/locale/lv/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/nl_NL/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/pl_PL/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/pt_PT/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/ru_RU/LC_MESSAGES/messages.po | 60 +++++++++---------- application/locale/sq/LC_MESSAGES/messages.po | 60 +++++++++---------- application/locale/sr/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/sv_SE/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/tr_TR/LC_MESSAGES/messages.po | 60 +++++++++---------- .../locale/zh_CN/LC_MESSAGES/messages.po | 60 +++++++++---------- assets/lang_src/messages.pot | 60 +++++++++---------- 24 files changed, 720 insertions(+), 720 deletions(-) diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 2cd9444ec..bac5567ba 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-12-24 05:03+0000\n" +"POT-Creation-Date: 2024-12-24 09:04+0000\n" "PO-Revision-Date: 2024-11-01 08:53+0000\n" "Last-Translator: Plamen Panteleev \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Estonian \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Croatian \n" "Language-Team: Italian \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified Han script) \n" "Language-Team: LANGUAGE \n" @@ -1936,10 +1936,10 @@ msgstr "" #: application/controllers/Radio.php:107 #: application/controllers/Stationsetup.php:372 #: application/views/api/help.php:61 application/views/contesting/add.php:62 -#: application/views/interface_assets/footer.php:2379 -#: application/views/interface_assets/footer.php:2397 -#: application/views/interface_assets/footer.php:2418 -#: application/views/interface_assets/footer.php:2436 +#: application/views/interface_assets/footer.php:2383 +#: application/views/interface_assets/footer.php:2401 +#: application/views/interface_assets/footer.php:2422 +#: application/views/interface_assets/footer.php:2440 #: application/views/labels/index.php:48 application/views/labels/index.php:84 #: application/views/logbookadvanced/index.php:603 #: application/views/lotw_views/index.php:111 @@ -2808,8 +2808,8 @@ msgstr "" #: application/views/gridmap/index.php:41 #: application/views/gridmap/index.php:70 #: application/views/gridmap/index.php:83 -#: application/views/interface_assets/footer.php:1490 -#: application/views/interface_assets/footer.php:1629 +#: application/views/interface_assets/footer.php:1494 +#: application/views/interface_assets/footer.php:1633 #: application/views/kml/index.php:21 application/views/kml/index.php:33 #: application/views/kml/index.php:49 application/views/kml/index.php:67 #: application/views/kml/index.php:79 @@ -3602,7 +3602,7 @@ msgstr "" #: application/views/adif/import.php:172 #: application/views/interface_assets/footer.php:33 #: application/views/interface_assets/footer.php:513 -#: application/views/interface_assets/footer.php:2175 +#: application/views/interface_assets/footer.php:2179 msgid "DANGER" msgstr "" @@ -4159,7 +4159,7 @@ msgstr "" #: application/views/awards/cq/index.php:56 #: application/views/awards/itu/index.php:56 #: application/views/awards/wac/index.php:44 -#: application/views/interface_assets/footer.php:2154 +#: application/views/interface_assets/footer.php:2158 #: application/views/qso/edit_ajax.php:403 #: application/views/view_log/qso.php:25 msgid "QSL Card" @@ -7145,10 +7145,10 @@ msgid "QSL Date" msgstr "" #: application/views/eqslcard/index.php:60 -#: application/views/interface_assets/footer.php:2380 -#: application/views/interface_assets/footer.php:2398 -#: application/views/interface_assets/footer.php:2419 -#: application/views/interface_assets/footer.php:2437 +#: application/views/interface_assets/footer.php:2384 +#: application/views/interface_assets/footer.php:2402 +#: application/views/interface_assets/footer.php:2423 +#: application/views/interface_assets/footer.php:2441 #: application/views/qslcard/index.php:66 #: application/views/view_log/qso.php:729 msgid "View" @@ -7417,57 +7417,57 @@ msgstr "" msgid "You're not logged in. Please %slogin%s" msgstr "" -#: application/views/interface_assets/footer.php:1417 #: application/views/interface_assets/footer.php:1421 -#: application/views/interface_assets/footer.php:1424 -#: application/views/interface_assets/footer.php:1561 +#: application/views/interface_assets/footer.php:1425 +#: application/views/interface_assets/footer.php:1428 #: application/views/interface_assets/footer.php:1565 -#: application/views/interface_assets/footer.php:1568 +#: application/views/interface_assets/footer.php:1569 +#: application/views/interface_assets/footer.php:1572 msgid "grid square" msgstr "" -#: application/views/interface_assets/footer.php:1424 -#: application/views/interface_assets/footer.php:1568 +#: application/views/interface_assets/footer.php:1428 +#: application/views/interface_assets/footer.php:1572 msgid "Total count" msgstr "" -#: application/views/interface_assets/footer.php:2156 +#: application/views/interface_assets/footer.php:2160 msgid "QSL Card for " msgstr "" -#: application/views/interface_assets/footer.php:2176 +#: application/views/interface_assets/footer.php:2180 msgid "Warning! Are you sure you want to delete this QSL card?" msgstr "" -#: application/views/interface_assets/footer.php:2216 +#: application/views/interface_assets/footer.php:2220 #: application/views/view_log/qso.php:42 msgid "eQSL Card" msgstr "" -#: application/views/interface_assets/footer.php:2218 +#: application/views/interface_assets/footer.php:2222 msgid "eQSL Card for " msgstr "" -#: application/views/interface_assets/footer.php:2391 -#: application/views/interface_assets/footer.php:2430 +#: application/views/interface_assets/footer.php:2395 +#: application/views/interface_assets/footer.php:2434 #: application/views/view_log/qso.php:719 msgid "QSL image file" msgstr "" -#: application/views/interface_assets/footer.php:2410 +#: application/views/interface_assets/footer.php:2414 msgid "Front QSL Card:" msgstr "" -#: application/views/interface_assets/footer.php:2448 +#: application/views/interface_assets/footer.php:2452 msgid "Back QSL Card:" msgstr "" -#: application/views/interface_assets/footer.php:2459 -#: application/views/interface_assets/footer.php:2484 +#: application/views/interface_assets/footer.php:2463 +#: application/views/interface_assets/footer.php:2488 msgid "Add additional QSOs to a QSL Card" msgstr "" -#: application/views/interface_assets/footer.php:2495 +#: application/views/interface_assets/footer.php:2499 msgid "Something went wrong. Please try again!" msgstr ""