Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translate Failsafe Stage 1 options, improve explanation of function "Time in stage 1" #3565

Merged
merged 5 commits into from
Sep 15, 2023
Merged

Translate Failsafe Stage 1 options, improve explanation of function "Time in stage 1" #3565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5893ebf
translate Stage 1 options
HThuren Sep 4, 2023
859192c
small bug
HThuren Sep 4, 2023
098c7e8
small bug
HThuren Sep 4, 2023
8242be7
Changed message and help text
HThuren Sep 6, 2023
27a9189
Update messages.json
HThuren Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 15 additions & 27 deletions locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,6 @@
"stm32UnprotectInitFailed": {
"message": "Failed to initiate unprotect routine"
},

"noConfigurationReceived": {
"message": "No configuration received within <span class=\"message-negative\">10 seconds</span>, communication <span class=\"message-negative\">failed</span>"
},
Expand Down Expand Up @@ -532,7 +531,6 @@
"reportProblemsDialogACC_NEEDS_CALIBRATION": {
"message": "<strong>the accelerometer is enabled but it is not calibrated</strong>.<br>If you plan to use the accelerometer, please follow the instructions for '$t(initialSetupButtonCalibrateAccel.message)' on the '$t(tabSetup.message)' tab. If any function that requires the accelerometer (auto level modes, GPS rescue, ...) is enabled, arming of the craft will be disabled until the accelerometer has been calibrated.<br>If you are not planning on using the accelerometer it is recommended that you disable it in '$t(configurationSystem.message)' on the '$t(tabConfiguration.message)' tab."
},

"infoVersionOs": {
"message" : "OS: <strong>{{operatingSystem}}</strong>",
"description": "Message that appears in the GUI log panel indicating operating system"
Expand Down Expand Up @@ -583,7 +581,6 @@
"tabSwitchWaitForOperation": {
"message": "You <span class=\"message-negative\">can't</span> do this right now, please wait for current operation to finish ..."
},

"tabSwitchUpgradeRequired": {
"message": "You need to <strong>upgrade</strong> your firmware to the latest version of Betaflight before you can use the $1 tab."
},
Expand Down Expand Up @@ -629,14 +626,12 @@
"versionLabelConfigurator": {
"message": "Configurator"
},

"notifications_app_just_updated_to_version": {
"message": "Application just updated to version: $1"
},
"notifications_click_here_to_start_app": {
"message": "Click here to start the application"
},

"statusbar_port_utilization": {
"message": "Port utilization:",
"description": "Port utilization text shown in the status bar"
Expand Down Expand Up @@ -665,7 +660,6 @@
"message": "CPU Load:",
"description": "CPU load text shown in the status bar"
},

"dfu_connect_message": {
"message": "Please use the Firmware Flasher to access DFU devices"
},
Expand All @@ -681,15 +675,12 @@
"dfu_error_image_size": {
"message": "<span class=\"message-negative\">Error</span>: Supplied image is larger then flash available on the chip! Image: $1 KiB, limit = $2 KiB"
},

"eeprom_saved_ok": {
"message": "EEPROM <span class=\"message-positive\">saved</span>"
},

"defaultWelcomeIntro": {
"message": "Welcome to <strong>Betaflight - Configurator</strong>, a utility designed to simplify updating, configuring and tuning of your flight controller."
},

"defaultWelcomeHead": {
"message": "Hardware"
},
Expand Down Expand Up @@ -4557,7 +4548,7 @@
"message": "Maximum length"
},
"failsafeChannelFallbackSettingsTitle": {
"message": "Channel Fallback Settings"
"message": "Stage 1 - Channel Fallback Settings"
},
"failsafeChannelFallbackSettingsHelp": {
"message": "These settings are applied to invalid individual AUX channels or to all channels when entering stage 1. <strong>Note:</strong> values are saved in steps of 25usec, so small changes disappear"
Expand All @@ -4568,14 +4559,26 @@
"failsafeChannelFallbackSettingsHold": {
"message": "<strong>Hold</strong> means maintain the last good value received. <strong>Set</strong> means the value given here will be used"
},
"failsafeChannelFallbackSettingsValueAuto": {
"message": "Auto",
"description": "Text for Auto option"
},
"failsafeChannelFallbackSettingsValueHold": {
"message": "Hold",
"description": "Text for Hold option"
},
"failsafeChannelFallbackSettingsValueSet": {
"message": "Set",
"description": "Text for Set option"
},
"failsafeStageTwoSettingsTitle": {
"message": "Stage 2 - Settings"
},
"failsafeDelayItem": {
"message": "Guard time for stage 2 activation after signal lost [seconds]"
"message": "Period of time in Stage 1 failsafe after signal loss [seconds]"
},
"failsafeDelayHelp": {
"message": "Time for stage 1 to wait for recovery"
"message": "Set the period of time in Stage 1 failsafe after signal loss. If the delay time expires without return of signal, Stage 2 failsafe will start"
},
"failsafeThrottleLowItem": {
"message": "Failsafe Throttle Low Delay [seconds]"
Expand Down Expand Up @@ -4604,7 +4607,6 @@
"failsafeProcedureItemSelect4": {
"message": "GPS Rescue"
},

"failsafeGpsRescueItemAltitudeMode": {
"message": "Altitude mode"
},
Expand Down Expand Up @@ -4693,7 +4695,6 @@
"failsafeGpsRescueItemSanityChecksFSOnly": {
"message": "Failsafe only"
},

"failsafeKillSwitchItem": {
"message": "Failsafe Kill Switch (setup Failsafe in Modes Tab)"
},
Expand Down Expand Up @@ -4880,8 +4881,6 @@
"powerVoltageId85": {
"message": "Cell 6"
},


"powerVoltageScale": {
"message": "Scale"
},
Expand All @@ -4891,7 +4890,6 @@
"powerVoltageMultiplier": {
"message": "Multiplier Value"
},

"powerAmperageHead": {
"message": "Amperage Meter"
},
Expand Down Expand Up @@ -4952,7 +4950,6 @@
"powerMahValue": {
"message": "$1 mAh"
},

"powerAmperageScale": {
"message": "Scale [1/10th mV/A]"
},
Expand All @@ -4965,7 +4962,6 @@
"powerAmperageCalibratedScale": {
"message": "Calibrated Amperage Scale:"
},

"powerBatteryHead": {
"message": "Battery"
},
Expand Down Expand Up @@ -5167,14 +5163,12 @@
"osdSetupCameraConnected": {
"message": "Camera Connected"
},

"osdSetupResetText": {
"message": "Reset OSD to default"
},
"osdSetupButtonReset": {
"message": "Reset Settings"
},

"osdTextElementMainBattVoltage": {
"message": "Battery voltage",
"description": "One of the elements of the OSD"
Expand Down Expand Up @@ -5854,7 +5848,6 @@
"osdDescElementUnknown" : {
"message": "Unknown element (details to be added in a future release)"
},

"osdTextStatMaxSpeed": {
"message": "Speed maximum",
"description": "One of the statistics that can be shown at the end of the flight in the OSD"
Expand Down Expand Up @@ -6072,7 +6065,6 @@
"osdDescStatUnknown": {
"message": "Unknown statistic (details to be added in a future release)"
},

"osdDescribeFontVersion1": {
"message": "Font version: 1 (Betaflight 4.0 or older)"
},
Expand All @@ -6082,7 +6074,6 @@
"osdDescribeFontVersionCUSTOM": {
"message": "Font version: user provided"
},

"osdTimerSource": {
"message": "Source:"
},
Expand Down Expand Up @@ -6141,7 +6132,6 @@
"message": "Altitude",
"description": "Text of the altitude alarm"
},

"osdWarningTextArmingDisabled": {
"message": "Arming disabled",
"description": "One of the warnings that can be selected to be shown in the OSD"
Expand Down Expand Up @@ -6305,7 +6295,6 @@
"osdButtonSaved": {
"message": "Saved"
},

"vtxHelp": {
"message": "Here you can configure the values for your Video Transmitter (VTX). You can view and change the transmission values, including the VTX Tables, if the flight controller and the VTX support it.<br>To set up your VTX use the following steps:<br>1. Go to <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://betaflight.com/docs/wiki/archive/VTX-tables\">this</a> page;<br>2. Find the appropriate VTX configuration file for your country and your VTX model and download it;<br>3. Click '$t(vtxButtonLoadFile.message)' below, select the VTX configuration file, load it;<br>4. Verify that the settings are correct;<br>5. Click '$t(vtxButtonSave.message)' to store the VTX settings on the flight controller.<br>6. Optionally click '$t(vtxButtonSaveLua.message)' to save a lua configuration file you can use with the betaflight lua scripts (See more <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://github.com/betaflight/betaflight-tx-lua-scripts/\">here</a>.)",
"description": "Introduction message in the VTX tab"
Expand Down Expand Up @@ -6594,7 +6583,6 @@
"message": "{{version}} unlocked",
"description": "Indicates if SA device is unlocked"
},

"mainHelpArmed": {
"message": "Motor Arming"
},
Expand Down
13 changes: 7 additions & 6 deletions src/js/tabs/failsafe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ failsafe.initialize = function (callback) {
</div>\
<div class="cf_tip channelsetting" title="${i18n.getMessage("failsafeChannelFallbackSettingsAuto")}">\
<select class="aux_set" id="${i}">\
<option value="0">Auto</option>\
<option value="1">Hold</option>\
<option value="2">Set</option>\
<option value="0">${i18n.getMessage("failsafeChannelFallbackSettingsValueAuto")}</option>\
<option value="1">${i18n.getMessage("failsafeChannelFallbackSettingsValueHold")}</option>\
<option value="2">${i18n.getMessage("failsafeChannelFallbackSettingsValueSet")}</option>\
</select>\
</div>\
<div class="auxiliary"><input type="number" name="aux_value" min="750" max="2250" step="25" id="${i}"/></div>\
Expand All @@ -167,8 +167,8 @@ failsafe.initialize = function (callback) {
</div>\
<div class="cf_tip channelsetting" title="${i18n.getMessage("failsafeChannelFallbackSettingsHold")}">\
<select class="aux_set" id="${i}">\
<option value="1">Hold</option>\
<option value="2">Set</option>\
<option value="1">${i18n.getMessage("failsafeChannelFallbackSettingsValueHold")}</option>\
<option value="2">${i18n.getMessage("failsafeChannelFallbackSettingsValueSet")}</option>\
</select>\
</div>\
<div class="auxiliary"><input type="number" name="aux_value" min="750" max="2250" step="25" id="${i}"/></div>\
Expand Down Expand Up @@ -258,7 +258,8 @@ failsafe.initialize = function (callback) {
}

// Sort the element, if need to group, do it by lexical sort, ie. by naming of (the translated) selection text
$('#failsafeSwitchSelect').sortSelect();
// Stage1 on top
$('#failsafeSwitchSelect').sortSelect(i18n.getMessage("failsafeSwitchOptionStage1"));

// `failsafe_kill_switch` has been renamed to `failsafe_switch_mode`.
// It is backwards compatible with `failsafe_kill_switch`
Expand Down