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

Update French translation and fix a few mistakes in code

Browse Source
This commit is contained in:
Laurent Cozic
2021-08-19 10:36:04 +01:00
parent b257d620b7
commit ea99099b48
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/lib/services/synchronizer/MigrationHandler.ts
View File

@@ -73,9 +73,9 @@ export default class MigrationHandler extends BaseService {
if (remoteInfo.version) {
if (remoteInfo.version > supportedSyncTargetVersion) {
throw new JoplinError(sprintf('Sync version of the target (%d) is greater than the version supported by the client (%d). Please upgrade your client.', remoteInfo.version, supportedSyncTargetVersion), 'outdatedClient');
throw new JoplinError(sprintf('Sync version of the target (%d) is greater than the version supported by the app (%d). Please upgrade your app.', remoteInfo.version, supportedSyncTargetVersion), 'outdatedClient');
} else if (remoteInfo.version < supportedSyncTargetVersion) {
throw new JoplinError(sprintf('Sync version of the target (%d) is lower than the version supported by the client (%d). Please upgrade the sync target.', remoteInfo.version, supportedSyncTargetVersion), 'outdatedSyncTarget');
throw new JoplinError(sprintf('Sync version of the target (%d) is lower than the version supported by the app (%d). Please upgrade the sync target.', remoteInfo.version, supportedSyncTargetVersion), 'outdatedSyncTarget');
}
}
}
@@ -85,7 +85,7 @@ export default class MigrationHandler extends BaseService {
const syncTargetInfo = await this.fetchSyncTargetInfo();
if (syncTargetInfo.version > supportedSyncTargetVersion) {
throw new JoplinError(sprintf('Sync version of the target (%d) is greater than the version supported by the client (%d). Please upgrade your client.', syncTargetInfo.version, supportedSyncTargetVersion), 'outdatedClient');
throw new JoplinError(sprintf('Sync version of the target (%d) is greater than the version supported by the app (%d). Please upgrade your app.', syncTargetInfo.version, supportedSyncTargetVersion), 'outdatedClient');
}
// if (supportedSyncTargetVersion !== migrations.length - 1) {