Merge branch 'main' into dev

sdr-enthusiasts · Jun 14, 2024 · fbe33d1 · fbe33d1
2 parents e7cf159 + 354f913
commit fbe33d1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/rootfs/opt/data/discord.template-de_DE b/rootfs/opt/data/discord.template-de_DE
@@ -65,7 +65,6 @@
                     "value": "##HEADING## ",
                     "inline": false
                 },
-                ##HASDIST--{
                     "name": "Entfernung vom Empfänger",
                     "value": "##DISTANCE## nm",
                     "inline": false

diff --git a/rootfs/opt/data/masto-l10n-en_US.db b/rootfs/opt/data/masto-l10n-en_US.db
@@ -37,4 +37,4 @@ MASTO_TERM[ISSEENON]="is seen on"
 MASTO_TERM[AGAIN]="Again:"
 MASTO_TERM[NEW2]="New:"
 MASTO_TERM[DIST_SINCE_LAST]="moved %.1f nm since last notification"
-MASTO_TERM[DISTANCE]="Distance from receiver"
+MASTO_TERM[DISTANCE]="Distance from receiver"
diff --git a/rootfs/usr/share/vesselalert/send_mastodon b/rootfs/usr/share/vesselalert/send_mastodon
@@ -103,7 +103,7 @@ if [[ -n "${VESSELS[$1:lat]}" ]] && [[ -n "${VESSELS[$1:lon]}" ]] && [[ -n "$LAT
     distance="$(bc -l <<< "scale=1; $(distance "${VESSELS[$1:lat]}" "${VESSELS[$1:lon]}" "$LAT" "$LON") / 1")"
     mast_str+="${MASTO_TERM[DISTANCE]}: $distance nm\n"
 fi
- 
+
 mast_str+="\n"
 
 mast_str+="${MASTO_TERM[SIGNAL]} #RSSI: $(printf "%.1f dBFS" "${VESSELS[$1:level]}")\n"