diff options
| author | Miguel Angel Mulero Martinez <migmul@gmail.com> | 2018-01-25 17:15:58 +0300 |
|---|---|---|
| committer | Miguel Angel Mulero Martinez <migmul@gmail.com> | 2018-01-28 15:39:23 +0300 |
| commit | c467f59f1d22d222e3b7876fa1b4c3dc252e60bf (patch) | |
| tree | bac14988e1c43f6705e433faebc0824647f20578 /assets | |
| parent | fa3401c07c114b5563fbf1bdd585fd2a4deec724 (diff) | |
Language user selectable in app
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/linux/betaflight-configurator-english.desktop | 7 | ||||
| -rw-r--r-- | assets/windows/installer.nsi | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/assets/linux/betaflight-configurator-english.desktop b/assets/linux/betaflight-configurator-english.desktop deleted file mode 100644 index 05fd15ec..00000000 --- a/assets/linux/betaflight-configurator-english.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Betaflight Configurator (English) -Comment=Crossplatform configuration tool for the Betaflight flight control system -Exec=bash -c "LANGUAGE=en /opt/betaflight/betaflight-configurator/betaflight-configurator" -Icon=/opt/betaflight/betaflight-configurator/icon/bf_icon_english_128.png -Terminal=false -Type=Application diff --git a/assets/windows/installer.nsi b/assets/windows/installer.nsi index 1a6c874f..4f736e5e 100644 --- a/assets/windows/installer.nsi +++ b/assets/windows/installer.nsi @@ -119,6 +119,9 @@ Section ${EndIf}
${EndIf}
+ # the english shortcut is not installed in actual versions, remove the deletion in a future release
+ Delete "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\${APP_NAME} (English).lnk"
+
# if the registry entries did not exist, we ignore the errors
ClearErrors
@@ -140,7 +143,6 @@ Section # create shortcuts in the start menu and on the desktop
CreateDirectory "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}"
CreateShortCut "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\${APP_NAME}.lnk" "$INSTDIR\${FILE_NAME_EXECUTABLE}"
- CreateShortCut "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\${APP_NAME} (English).lnk" "$INSTDIR\${FILE_NAME_EXECUTABLE}" "--lang=en"
CreateShortCut "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\${FILE_NAME_UNINSTALLER}"
CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${FILE_NAME_EXECUTABLE}"
@@ -184,6 +186,7 @@ Section "Uninstall" RMDir "$INSTDIR"
# delete the shortcuts
+ # the english shortcut is not installed in actual versions, remove the deletion in a future release
Delete "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\${APP_NAME}.lnk"
Delete "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\${APP_NAME} (English).lnk"
Delete "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\Uninstall ${APP_NAME}.lnk"
|