self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Desktop: Fix wording "Check for updates" in settings (#5832)

Browse Source
This commit is contained in:
Helmut K. C. Tessarek
2022-01-09 06:23:24 -05:00
committed by GitHub
parent 16148b2255
commit 3dfe43204d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/app-desktop/app.ts
View File

@@ -446,8 +446,9 @@ class Application extends BaseApplication {
await this.checkForLegacyTemplates(); await this.checkForLegacyTemplates();
// Note: Auto-update currently doesn't work in Linux: it downloads the update // Note: Auto-update is a misnomer in the code.
// but then doesn't install it on exit. // The code below only checks, if a new version is available.
// We only allow Windows and macOS users to automatically check for updates
if (shim.isWindows() || shim.isMac()) { if (shim.isWindows() || shim.isMac()) {
const runAutoUpdateCheck = () => { const runAutoUpdateCheck = () => {
if (Setting.value('autoUpdateEnabled')) { if (Setting.value('autoUpdateEnabled')) {

2
packages/lib/models/Setting.ts
View File

@@ -1190,7 +1190,7 @@ class Setting extends BaseModel {
}, },
autoUpdateEnabled: { value: true, type: SettingItemType.Bool, storage: SettingStorage.File, section: 'application', public: platform !== 'linux', appTypes: [AppType.Desktop], label: () => _('Automatically update the application') }, autoUpdateEnabled: { value: true, type: SettingItemType.Bool, storage: SettingStorage.File, section: 'application', public: platform !== 'linux', appTypes: [AppType.Desktop], label: () => _('Automatically check for updates') },
'autoUpdate.includePreReleases': { value: false, type: SettingItemType.Bool, section: 'application', storage: SettingStorage.File, public: true, appTypes: [AppType.Desktop], label: () => _('Get pre-releases when checking for updates'), description: () => _('See the pre-release page for more details: %s', 'https://joplinapp.org/prereleases') }, 'autoUpdate.includePreReleases': { value: false, type: SettingItemType.Bool, section: 'application', storage: SettingStorage.File, public: true, appTypes: [AppType.Desktop], label: () => _('Get pre-releases when checking for updates'), description: () => _('See the pre-release page for more details: %s', 'https://joplinapp.org/prereleases') },
'clipperServer.autoStart': { value: false, type: SettingItemType.Bool, storage: SettingStorage.File, public: false }, 'clipperServer.autoStart': { value: false, type: SettingItemType.Bool, storage: SettingStorage.File, public: false },
'sync.interval': { 'sync.interval': {