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

Keep Joplin Server name for now

Browse Source
This commit is contained in:
Laurent Cozic
2021-06-02 09:56:24 +02:00
parent 42891e37a1
commit 1d2a3a97d2
4 changed files with 7 additions and 21 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 Cloud. Please check the Synchronisation options in the config screen. Full error was:\n\n%s', msg); return _('Could not connect to Joplin Server. 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 Cloud')} (Beta)`; return `${_('Joplin Server')} (Beta)`;
} }
public async isAuthenticated() { public async isAuthenticated() {

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

@@ -472,24 +472,10 @@ class Setting extends BaseModel {
return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer'); return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer');
}, },
public: true, public: true,
label: () => _('Joplin Cloud URL'), label: () => _('Joplin Server URL'),
description: () => emptyDirWarning, description: () => emptyDirWarning,
storage: SettingStorage.File, storage: SettingStorage.File,
}, },
// 'sync.9.directory': {
// value: 'Apps/Joplin',
// type: SettingItemType.String,
// section: 'sync',
// show: (settings: any) => {
// return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer');
// },
// filter: value => {
// return value ? ltrimSlashes(rtrimSlashes(value)) : '';
// },
// public: true,
// label: () => _('Joplin Cloud Directory'),
// storage: SettingStorage.File,
// },
'sync.9.username': { 'sync.9.username': {
value: '', value: '',
type: SettingItemType.String, type: SettingItemType.String,
@@ -498,7 +484,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 Cloud email'), label: () => _('Joplin Server email'),
storage: SettingStorage.File, storage: SettingStorage.File,
}, },
'sync.9.password': { 'sync.9.password': {
@@ -509,7 +495,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 Cloud password'), label: () => _('Joplin Server password'),
secure: true, secure: true,
}, },

4
packages/server/src/models/NotificationModel.ts
View File

@@ -18,7 +18,7 @@ interface NotificationType {
const notificationTypes: Record<string, NotificationType> = { const notificationTypes: Record<string, NotificationType> = {
[NotificationKey.ConfirmEmail]: { [NotificationKey.ConfirmEmail]: {
level: NotificationLevel.Normal, level: NotificationLevel.Normal,
message: 'Welcome to Joplin Cloud! An email has been sent to you containing an activation link to complete your registration.', message: 'Welcome to Joplin Server! An email has been sent to you containing an activation link to complete your registration.',
}, },
[NotificationKey.EmailConfirmed]: { [NotificationKey.EmailConfirmed]: {
level: NotificationLevel.Normal, level: NotificationLevel.Normal,
@@ -26,7 +26,7 @@ const notificationTypes: Record<string, NotificationType> = {
}, },
[NotificationKey.PasswordSet]: { [NotificationKey.PasswordSet]: {
level: NotificationLevel.Normal, level: NotificationLevel.Normal,
message: 'Welcome to Joplin Cloud! Your password has been set successfully.', message: 'Welcome to Joplin Server! Your password has been set successfully.',
}, },
[NotificationKey.UsingSqliteInProd]: { [NotificationKey.UsingSqliteInProd]: {
level: NotificationLevel.Important, level: NotificationLevel.Important,