From 47518a95e146e9edc5bd555c850206b86c5f2ea1 Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Sun, 15 Sep 2024 18:20:56 +0300 Subject: [PATCH 1/5] Rename user defines from capitalized underscored format "BINDING_PHRASE" to "Binding phrase" to make it more user friendly --- src/i18n/locales/en/messages.json | 27 +++++++++++++++++++++ src/ui/components/UserDefinesList/index.tsx | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/i18n/locales/en/messages.json b/src/i18n/locales/en/messages.json index 44b80d02..d980c9b5 100644 --- a/src/i18n/locales/en/messages.json +++ b/src/i18n/locales/en/messages.json @@ -105,6 +105,33 @@ "Settings": "Settings", "Support": "Support" }, + "UserDefineKey": { + "AUTO_WIFI_ON_INTERVAL": "Wi-Fi start timeout", + "BINDING_PHRASE": "Binding phrase", + "DEVICE_NAME": "Device name", + "DISABLE_ALL_BEEPS": "Disable all beeps", + "DISABLE_STARTUP_BEEP": "Disable startup beep", + "HOME_WIFI_PASSWORD": "Wi-Fi password", + "HOME_WIFI_SSID": "Wi-Fi name (SSID)", + "JUST_BEEP_ONCE": "Just beep once", + "LOCK_ON_FIRST_CONNECTION": "Lock on first connection", + "MY_STARTUP_MELODY": "My startup melody", + "RCVR_INVERT_TX": "Invert receiver TX pin", + "RCVR_UART_BAUD": "Receiver BAUD rate", + "REGULATORY_DOMAIN_AU_433": "433 MHz Australia", + "REGULATORY_DOMAIN_AU_915": "915 MHz Australia", + "REGULATORY_DOMAIN_EU_433": "433 MHz Europe", + "REGULATORY_DOMAIN_EU_868": "868 MHz Europe", + "REGULATORY_DOMAIN_EU_CE_2400": "2.4 GHz LBT", + "REGULATORY_DOMAIN_FCC_915": "915 MHz FCC", + "REGULATORY_DOMAIN_IN_866": "868 MHz India", + "REGULATORY_DOMAIN_ISM_2400": "2.4 GHz ISM", + "RX_AS_TX": "Use Receiver as TX module", + "TLM_REPORT_INTERVAL_MS": "Telemetry report interval (ms)", + "UART_INVERTED": "Invert UART", + "UNLOCK_HIGHER_POWER": "Unlock higher power", + "USE_R9MM_R9MINI_SBUS": "Use R9MM/R9Mini SBUS" + }, "UserDefineDescription": { "RegulatoryDomain915": "Consult LoRaWAN Frequency Plans and Regulations for a regulatory domain to use in your location.", "Wiki": "Check our Wiki page for latest definition.", diff --git a/src/ui/components/UserDefinesList/index.tsx b/src/ui/components/UserDefinesList/index.tsx index 5ef6117b..ea9e0da0 100644 --- a/src/ui/components/UserDefinesList/index.tsx +++ b/src/ui/components/UserDefinesList/index.tsx @@ -117,7 +117,7 @@ const UserDefinesList: FunctionComponent = (props) => { disableRipple /> - {item.key} + {t(`UserDefineKey.${item.key}`)} From d4c796d3ac48aaba95f494e6273d3ec14695c822 Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Sun, 15 Sep 2024 18:22:29 +0300 Subject: [PATCH 2/5] BAUD -> baud --- src/i18n/locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/en/messages.json b/src/i18n/locales/en/messages.json index d980c9b5..8d0634cc 100644 --- a/src/i18n/locales/en/messages.json +++ b/src/i18n/locales/en/messages.json @@ -117,7 +117,7 @@ "LOCK_ON_FIRST_CONNECTION": "Lock on first connection", "MY_STARTUP_MELODY": "My startup melody", "RCVR_INVERT_TX": "Invert receiver TX pin", - "RCVR_UART_BAUD": "Receiver BAUD rate", + "RCVR_UART_BAUD": "Receiver baud rate", "REGULATORY_DOMAIN_AU_433": "433 MHz Australia", "REGULATORY_DOMAIN_AU_915": "915 MHz Australia", "REGULATORY_DOMAIN_EU_433": "433 MHz Europe", From 3e5b38cce8c7499b42cf3def1fad3d7411a8c170 Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Mon, 16 Sep 2024 23:04:54 +0300 Subject: [PATCH 3/5] Clarify wifi timeout unit --- src/i18n/locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/en/messages.json b/src/i18n/locales/en/messages.json index 8d0634cc..059dd30d 100644 --- a/src/i18n/locales/en/messages.json +++ b/src/i18n/locales/en/messages.json @@ -106,7 +106,7 @@ "Support": "Support" }, "UserDefineKey": { - "AUTO_WIFI_ON_INTERVAL": "Wi-Fi start timeout", + "AUTO_WIFI_ON_INTERVAL": "Wi-Fi start timeout (seconds)", "BINDING_PHRASE": "Binding phrase", "DEVICE_NAME": "Device name", "DISABLE_ALL_BEEPS": "Disable all beeps", From f8377a461fba1e865408f35ce5310ff6b022da66 Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Mon, 16 Sep 2024 23:29:07 +0300 Subject: [PATCH 4/5] Improve messages --- src/i18n/locales/en/messages.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/i18n/locales/en/messages.json b/src/i18n/locales/en/messages.json index 059dd30d..1d1eabee 100644 --- a/src/i18n/locales/en/messages.json +++ b/src/i18n/locales/en/messages.json @@ -106,15 +106,15 @@ "Support": "Support" }, "UserDefineKey": { - "AUTO_WIFI_ON_INTERVAL": "Wi-Fi start timeout (seconds)", + "AUTO_WIFI_ON_INTERVAL": "Wi-Fi startup delay (in seconds)", "BINDING_PHRASE": "Binding phrase", "DEVICE_NAME": "Device name", - "DISABLE_ALL_BEEPS": "Disable all beeps", + "DISABLE_ALL_BEEPS": "Mute all beeps", "DISABLE_STARTUP_BEEP": "Disable startup beep", "HOME_WIFI_PASSWORD": "Wi-Fi password", "HOME_WIFI_SSID": "Wi-Fi name (SSID)", - "JUST_BEEP_ONCE": "Just beep once", - "LOCK_ON_FIRST_CONNECTION": "Lock on first connection", + "JUST_BEEP_ONCE": "Single beep only", + "LOCK_ON_FIRST_CONNECTION": "Lock after first connection", "MY_STARTUP_MELODY": "My startup melody", "RCVR_INVERT_TX": "Invert receiver TX pin", "RCVR_UART_BAUD": "Receiver baud rate", @@ -122,15 +122,15 @@ "REGULATORY_DOMAIN_AU_915": "915 MHz Australia", "REGULATORY_DOMAIN_EU_433": "433 MHz Europe", "REGULATORY_DOMAIN_EU_868": "868 MHz Europe", - "REGULATORY_DOMAIN_EU_CE_2400": "2.4 GHz LBT", "REGULATORY_DOMAIN_FCC_915": "915 MHz FCC", "REGULATORY_DOMAIN_IN_866": "868 MHz India", - "REGULATORY_DOMAIN_ISM_2400": "2.4 GHz ISM", - "RX_AS_TX": "Use Receiver as TX module", - "TLM_REPORT_INTERVAL_MS": "Telemetry report interval (ms)", + "REGULATORY_DOMAIN_EU_CE_2400": "2.4 GHz LBT (Listen Before Talk)", + "REGULATORY_DOMAIN_ISM_2400": "2.4 GHz ISM (Standard)", + "RX_AS_TX": "Use receiver as a transmitter (TX) module", + "TLM_REPORT_INTERVAL_MS": "Telemetry reporting interval (ms)", "UART_INVERTED": "Invert UART", - "UNLOCK_HIGHER_POWER": "Unlock higher power", - "USE_R9MM_R9MINI_SBUS": "Use R9MM/R9Mini SBUS" + "UNLOCK_HIGHER_POWER": "Unlock higher power output", + "USE_R9MM_R9MINI_SBUS": "Enable R9MM/R9Mini SBUS" }, "UserDefineDescription": { "RegulatoryDomain915": "Consult LoRaWAN Frequency Plans and Regulations for a regulatory domain to use in your location.", From b47001aa3482ad6573c6c08d7820c5833f5cabc7 Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Mon, 16 Sep 2024 23:43:39 +0300 Subject: [PATCH 5/5] Improve descriptions --- src/i18n/locales/en/messages.json | 11 +++++++++++ src/ui/components/FlashingMethodOptions/index.tsx | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/i18n/locales/en/messages.json b/src/i18n/locales/en/messages.json index 1d1eabee..c180b465 100644 --- a/src/i18n/locales/en/messages.json +++ b/src/i18n/locales/en/messages.json @@ -105,6 +105,17 @@ "Settings": "Settings", "Support": "Support" }, + "FlashingMethod": { + "BetaflightPassthrough": "Betaflight Passthrough", + "DFU": "DFU (Device Firmware Upgrade)", + "EdgeTxPassthrough": "EdgeTX Passthrough", + "Passthrough": "Passthrough", + "STLink": "STLink", + "Stock_BL": "Stock Bootloader", + "UART": "UART (Serial)", + "WIFI": "Wi-Fi", + "Zip": "Zip" + }, "UserDefineKey": { "AUTO_WIFI_ON_INTERVAL": "Wi-Fi startup delay (in seconds)", "BINDING_PHRASE": "Binding phrase", diff --git a/src/ui/components/FlashingMethodOptions/index.tsx b/src/ui/components/FlashingMethodOptions/index.tsx index ad55897e..a57ae7c2 100644 --- a/src/ui/components/FlashingMethodOptions/index.tsx +++ b/src/ui/components/FlashingMethodOptions/index.tsx @@ -80,7 +80,7 @@ const FlashingMethodOptions: FunctionComponent = ( <> {!targetMapping.flashingMethod ? targetMapping.name - : targetMapping.flashingMethod} + : t(`FlashingMethod.${targetMapping.flashingMethod}`)} {targetMapping.flashingMethod !== null && (