keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1058 from dploeger/issue-869 

Better error message, when backup path is a directory and not a file
This commit is contained in:
antelle 2019-01-03 19:20:44 +01:00 committed by GitHub
parent 3ee3ca89a4 363ff309e6
commit 0b7187d98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/locales/base.json
View File

@ -421,6 +421,8 @@
"setFileBackupNowWorking": "Working...",
"setFileBackupError": "Backup error",
"setFileBackupErrorDescription": "Error writing backup file",
"setFileBackupErrorIsDir": "Backup path invalid",
"setFileBackupErrorIsDirDescription": "The backup path seems to point to a directory. Please specify a filename inside a directory instead.",
"setFileBackupOnSave": "Every time I save the file",
"setFileBackupDaily": "Daily",
"setFileBackupWeekly": "Weekly",

4
app/scripts/locales/de-DE.json
View File

@ -426,6 +426,8 @@
"setFileBackupNowWorking": "Sichern...",
"setFileBackupError": "Sicherungsfehler",
"setFileBackupErrorDescription": "Fehler beim Schreiben der Sicherungsdatei",
"setFileBackupErrorIsDir": "Sicherungspfad ungültig",
"setFileBackupErrorIsDirDescription": "Der Sicherungspfad scheint ein Verzeichnis zu sein. Bitte geben Sie stattdessen eine Datei in einem Verzeichnis an.",
"setFileBackupOnSave": "Immer, wenn die Datei gespeichert wird",
"setFileBackupDaily": "Täglich",
"setFileBackupWeekly": "Wöchentlich",
@ -542,4 +544,4 @@
"launcherFileFilter": "KeePass-Dateien",
"authPopupRequired": "Pop-Ups blockiert",
"authPopupRequiredBody": "Bitte erlauben Sie Pop-Ups für diese App in Ihrem Browser."
}
}

4
app/scripts/locales/fr-FR.json
View File

@ -426,6 +426,8 @@
"setFileBackupNowWorking": "En cours...",
"setFileBackupError": "Erreur sauvegarde",
"setFileBackupErrorDescription": "Erreur à l'écriture du fichier",
"setFileBackupErrorIsDir": "Chemin de sauvegarde invalide",
"setFileBackupErrorIsDirDescription": "Le chemin de sauvegarde semble pointer vers un répertoire. Au lieu de cela, spécifiez un nom de fichier dans un répertoire.",
"setFileBackupOnSave": "A chaque fois que je sauvegarde",
"setFileBackupDaily": "Quotidien",
"setFileBackupWeekly": "Chaque semaine",
@ -542,4 +544,4 @@
"launcherFileFilter": "Fichiers Keepass",
"authPopupRequired": "Les pop-up sont blockés",
"authPopupRequiredBody": "Merci d'autoriser les pop-up pour cet appli dans votre navigateur."
}
}

3
app/scripts/storage/storage-file.js
View File

@ -63,6 +63,9 @@ const StorageFile = StorageBase.extend({
const ts = this.logger.ts();
const onError = e => {
if (e.hasOwnProperty('code') && e.code === 'EISDIR') {
e.isDir = true;
}
this.logger.error('Error writing local file', path, e);
if (callback) {
callback(e);

16
app/scripts/views/settings/settings-file-view.js
View File

@ -512,9 +512,21 @@ const SettingsFileView = Backbone.View.extend({
this.backupInProgress = false;
backupButton.text(Locale.setFileBackupNow);
if (err) {
let title = '';
let description = '';
if (err.isDir) {
title = Locale.setFileBackupErrorIsDir;
description = Locale.setFileBackupErrorIsDirDescription;
} else {
title = Locale.setFileBackupError;
description = Locale.setFileBackupErrorDescription;
}
Alerts.error({
title: Locale.setFileBackupError,
body: Locale.setFileBackupErrorDescription + '<pre class="modal__pre">' + _.escape(err.toString()) + '</pre>'
title: title,
body: description +
'<pre class="modal__pre">' +
_.escape(err.toString()) +
'</pre>'
});
}
});