piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Show degree symbol ° instead of @ (#2199)

Browse Source 
* fix: Use degree symbol instead of `@`
For temperature and degree units, @C, @F and @ were being shown, rather than °C, °F and °.

Also hoping this will also resolve the GPS sensor showing @ instead of ° as mentioned in #2163

* fix: B&W need prior `@` for degrees

* fix: `dBm` missing from some translations
This commit is contained in:
Peter Feerick
2022-09-14 12:28:48 +10:00
committed by GitHub
parent c7e77ccd36
commit d9c7cfae6f
14 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations/cn.h
+4
View File
@@ -183,7 +183,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM "公制",TR("英制","英制")
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/cz.h
+5 -1
View File
@@ -202,7 +202,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM TR("Metr.","Metrické"),TR("Imper.","Imperial")
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/da.h
+4
View File
@@ -183,7 +183,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM "Metrisk",TR("Imper.","Imperiel")
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/de.h
+5 -1
View File
@@ -186,7 +186,11 @@
#define LENGTH_UNIT_METR "m"
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM TR("Metrik","Metrisch"),TR("Imper.","Imperial")
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/en.h
+4 -1
View File
@@ -183,8 +183,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM "Metric",TR("Imper.","Imperial")
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/es.h
+5 -2
View File
@@ -184,8 +184,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM "Métrico","Imperial"
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/fi.h
+5 -2
View File
@@ -204,8 +204,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM "Metric",TR("Imper.","Imperial")
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/fr.h
+5 -2
View File
@@ -205,8 +205,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM TR("Métr.","Métriques"),TR("Impér.","Impériales")
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/it.h
+5 -2
View File
@@ -187,8 +187,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM TR("Metric","Metriche"),TR("Imper.","Imperiali")
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/nl.h
+5 -2
View File
@@ -186,8 +186,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM TR("Mtrsch","Metrisch"),"Engels"
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/pl.h
+5 -2
View File
@@ -183,8 +183,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM TR("Metr.","Metryczn"),TR("Imper.","Imperial")
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/pt.h
+5 -1
View File
@@ -181,7 +181,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM "Metric",TR("Imper.","Imperial")
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km"
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/se.h
+2 -2
View File
@@ -204,9 +204,9 @@
#define TR_VUNITSSYSTEM TR("Metr.","Metriska"),TR("Brit.","Brittiska")
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])
radio/src/translations/tw.h
+4 -1
View File
@@ -183,8 +183,11 @@
#define SPEED_UNIT_METR "kmh"
#define TR_VUNITSSYSTEM "公制",TR("英制","英制")
#if defined(COLORLCD)
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#else
#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm"
#endif
#define STR_V (STR_VTELEMUNIT[1])
#define STR_A (STR_VTELEMUNIT[2])