mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-30 10:36:35 +02:00
Keep Joplin Server name for now
This commit is contained in:
parent
42891e37a1
commit
1d2a3a97d2
@ -77,7 +77,7 @@ export default class JoplinServerApi {
|
||||
|
||||
public static connectionErrorMessage(error: any) {
|
||||
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) {
|
||||
|
@ -27,7 +27,7 @@ export default class SyncTargetJoplinServer extends BaseSyncTarget {
|
||||
}
|
||||
|
||||
public static label() {
|
||||
return `${_('Joplin Cloud')} (Beta)`;
|
||||
return `${_('Joplin Server')} (Beta)`;
|
||||
}
|
||||
|
||||
public async isAuthenticated() {
|
||||
|
@ -472,24 +472,10 @@ class Setting extends BaseModel {
|
||||
return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer');
|
||||
},
|
||||
public: true,
|
||||
label: () => _('Joplin Cloud URL'),
|
||||
label: () => _('Joplin Server URL'),
|
||||
description: () => emptyDirWarning,
|
||||
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': {
|
||||
value: '',
|
||||
type: SettingItemType.String,
|
||||
@ -498,7 +484,7 @@ class Setting extends BaseModel {
|
||||
return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer');
|
||||
},
|
||||
public: true,
|
||||
label: () => _('Joplin Cloud email'),
|
||||
label: () => _('Joplin Server email'),
|
||||
storage: SettingStorage.File,
|
||||
},
|
||||
'sync.9.password': {
|
||||
@ -509,7 +495,7 @@ class Setting extends BaseModel {
|
||||
return settings['sync.target'] == SyncTargetRegistry.nameToId('joplinServer');
|
||||
},
|
||||
public: true,
|
||||
label: () => _('Joplin Cloud password'),
|
||||
label: () => _('Joplin Server password'),
|
||||
secure: true,
|
||||
},
|
||||
|
||||
|
@ -18,7 +18,7 @@ interface NotificationType {
|
||||
const notificationTypes: Record<string, NotificationType> = {
|
||||
[NotificationKey.ConfirmEmail]: {
|
||||
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]: {
|
||||
level: NotificationLevel.Normal,
|
||||
@ -26,7 +26,7 @@ const notificationTypes: Record<string, NotificationType> = {
|
||||
},
|
||||
[NotificationKey.PasswordSet]: {
|
||||
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]: {
|
||||
level: NotificationLevel.Important,
|
||||
|
Loading…
Reference in New Issue
Block a user