self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Desktop: Rename Joplin Server to Joplin Cloud in UI

Browse Source
This commit is contained in:
Laurent Cozic
2021-05-25 12:16:57 +02:00
parent 68e79f1573
commit b20ab19f13
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/JoplinServerApi.ts
View File

@@ -77,7 +77,7 @@ export default class JoplinServerApi {
public static connectionErrorMessage(error: any) { public static connectionErrorMessage(error: any) {
const msg = error && error.message ? error.message : 'Unknown error'; const msg = error && error.message ? error.message : 'Unknown error';
return _('Could not connect to Joplin Server. Please check the Synchronisation options in the config screen. Full error was:\n\n%s', msg); return _('Could not connect to Joplin Cloud. Please check the Synchronisation options in the config screen. Full error was:\n\n%s', msg);
} }
private requestToCurl_(url: string, options: any) { private requestToCurl_(url: string, options: any) {

2
packages/lib/SyncTargetJoplinServer.ts
View File

@@ -27,7 +27,7 @@ export default class SyncTargetJoplinServer extends BaseSyncTarget {
} }
public static label() { public static label() {
return `${_('Joplin Server')} (Beta)`; return `${_('Joplin Cloud')} (Beta)`;
} }
public async isAuthenticated() { public async isAuthenticated() {

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

@@ -472,7 +472,7 @@ class Setting extends BaseModel {
return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer'); return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer');
}, },
public: true, public: true,
label: () => _('Joplin Server URL'), label: () => _('Joplin Cloud URL'),
description: () => emptyDirWarning, description: () => emptyDirWarning,
storage: SettingStorage.File, storage: SettingStorage.File,
}, },
@@ -487,7 +487,7 @@ class Setting extends BaseModel {
// return value ? ltrimSlashes(rtrimSlashes(value)) : ''; // return value ? ltrimSlashes(rtrimSlashes(value)) : '';
// }, // },
// public: true, // public: true,
// label: () => _('Joplin Server Directory'), // label: () => _('Joplin Cloud Directory'),
// storage: SettingStorage.File, // storage: SettingStorage.File,
// }, // },
'sync.9.username': { 'sync.9.username': {
@@ -498,7 +498,7 @@ class Setting extends BaseModel {
return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer'); return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer');
}, },
public: true, public: true,
label: () => _('Joplin Server email'), label: () => _('Joplin Cloud email'),
storage: SettingStorage.File, storage: SettingStorage.File,
}, },
'sync.9.password': { 'sync.9.password': {
@@ -509,7 +509,7 @@ class Setting extends BaseModel {
return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer'); return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer');
}, },
public: true, public: true,
label: () => _('Joplin Server password'), label: () => _('Joplin Cloud password'),
secure: true, secure: true,
}, },