Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Weblate
2024-07-28 17:18:30 +00:00
parent fc7f39cbfa 1d13230c9a
commit b915e0f7ef
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/libraries/AdifHelper.php
View File

@@ -198,14 +198,23 @@ class AdifHelper {
$line .= $this->getAdifFieldLine("MY_STATE", $qso->state);
// We fill county only if it has a value and it's USA, Alaska or Hawaii. Other countrys are not supported at the moment due complex adif specs
if ($qso->station_cnty && ($qso->station_dxcc == '291' || $qso->station_dxcc == '006' || $qso->station_dxcc == '110')) {
$county = trim($qso->state) . "," . trim($qso->station_cnty);
} else {
$county = '';
}
// See: https://adif.org/314/ADIF_314.htm#Sponsor_Defined_Code_Format
if ($qso->station_cnty) {
switch ($qso->station_dxcc) {
case '6':
case '110':
case '291':
$county = trim($qso->state) . "," . trim($qso->station_cnty);
break;
default:
$county = trim($qso->station_cnty);
break;
}
} else {
$county = '';
}
$line .= $this->getAdifFieldLine("MY_CNTY", $county);
$line .= $this->getAdifFieldLine("MY_CNTY", $county);
$stationsSig = $qso->station_sig;
// If MY_SIG is WWFF or "" and there's a station_wwff set, use data from station_wwff

2
assets/lang_src/messages.pot
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-28 15:49+0000\n"
"POT-Creation-Date: 2024-07-28 17:18+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
install/includes/gettext/lang_src/installer.pot
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-28 15:49+0000\n"
"POT-Creation-Date: 2024-07-28 17:18+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"