Skip to content

Commit

Permalink
Fix: #62 Better error msg
Browse files Browse the repository at this point in the history
  • Loading branch information
JackGruber committed Dec 3, 2023
1 parent 12910d8 commit e7ac39e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## not released

- Fix: #61 On Jex backup, do not overwrite already exported notebooks if the notebooks name differs only in special characters
- Fix: #62 Better error message if the Joplin profile directory is set as backup path

## v1.3.3 (2023-07-08)

Expand Down
3 changes: 3 additions & 0 deletions src/Backup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,9 @@ class Backup {

if (path.normalize(profileDir) === this.backupBasePath) {
this.backupBasePath = null;
await this.showError(
i18n.__("error.backupPathJoplinDir", path.normalize(profileDir))
);
}
}

Expand Down
1 change: 1 addition & 0 deletions src/locales/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"error.Backup": "Backup Fehler für %s: %s",
"error.fileCopy": "Fehler beim kopieren von Datei/Ordner in %s: %s",
"error.deleteFile": "Fehler beim löschen von Datei/Ordner in %s: %s",
"error.backupPathJoplinDir": "Als Sicherungs Pfad wurde das Joplin profile Verzeichniss (%s) ohne Unterordner ausgewählt, dies ist nicht erlaubt!",
"command.createBackup": "Backup erstellen",
"error.BackupSetNotSupportedChars": "Der Name des Backup-Sets enthält nicht zulässige Zeichen ( %s )!",
"error.passwordDoubleQuotes": "Das Passwort enthält \" (Doppelte Anführungszeichen), diese sind wegen eines Bugs nicht erlaubt. Der Passwortschutz für die Backups wurde deaktivert!"
Expand Down
1 change: 1 addition & 0 deletions src/locales/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"error.Backup": "Backup error for %s: %s",
"error.fileCopy": "Error on file/folder copy in %s: %s",
"error.deleteFile": "Error on file/folder delete in %s: %s",
"error.backupPathJoplinDir": "The backup path is the Joplin profile directory (%s) without subfolders, this is not allowed!",
"command.createBackup": "Create backup",
"error.BackupSetNotSupportedChars": "Backup set name does contain not allowed characters ( %s )!",
"error.passwordDoubleQuotes": "Password contains \" (double quotes), these are not allowed because of a bug. Password protection for the backup is deactivated!"
Expand Down

0 comments on commit e7ac39e

Please sign in to comment.