Merge pull request #680 from ExpressLRS/rename-user-defines

Rename user define keys in the UI
ExpressLRS · Sep 16, 2024 · cfff093 · cfff093
2 parents 7a6c406 + b47001a
commit cfff093
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/src/i18n/locales/en/messages.json b/src/i18n/locales/en/messages.json
@@ -105,6 +105,44 @@
     "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",
+    "DEVICE_NAME": "Device name",
+    "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": "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",
+    "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_FCC_915": "915 MHz FCC",
+    "REGULATORY_DOMAIN_IN_866": "868 MHz India",
+    "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 output",
+    "USE_R9MM_R9MINI_SBUS": "Enable R9MM/R9Mini SBUS"
+  },
   "UserDefineDescription": {
     "RegulatoryDomain915": "Consult <LoRaWANLink>LoRaWAN Frequency Plans and Regulations</LoRaWANLink> for a regulatory domain to use in your location.",
     "Wiki": "Check our Wiki page for latest definition.",

diff --git a/src/ui/components/FlashingMethodOptions/index.tsx b/src/ui/components/FlashingMethodOptions/index.tsx
@@ -80,7 +80,7 @@ const FlashingMethodOptions: FunctionComponent<FlashingMethodsListProps> = (
         <>
           {!targetMapping.flashingMethod
             ? targetMapping.name
-            : targetMapping.flashingMethod}
+            : t(`FlashingMethod.${targetMapping.flashingMethod}`)}
           {targetMapping.flashingMethod !== null && (
             <FlashingMethodDescription
               flashingMethod={targetMapping.flashingMethod}

diff --git a/src/ui/components/UserDefinesList/index.tsx b/src/ui/components/UserDefinesList/index.tsx
@@ -117,7 +117,7 @@ const UserDefinesList: FunctionComponent<UserDefinesListProps> = (props) => {
                   disableRipple
                 />
               </ListItemIcon>
-              <ListItemText>{item.key}</ListItemText>
+              <ListItemText>{t(`UserDefineKey.${item.key}`)}</ListItemText>
               <ListItemSecondaryAction>
                 <UserDefineDescription userDefine={item.key} />
               </ListItemSecondaryAction>