diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json index 5daf88ed..aac3b045 100644 --- a/app/scripts/locales/base.json +++ b/app/scripts/locales/base.json @@ -417,6 +417,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", diff --git a/app/scripts/locales/de-DE.json b/app/scripts/locales/de-DE.json index 76d25ca1..267c009b 100644 --- a/app/scripts/locales/de-DE.json +++ b/app/scripts/locales/de-DE.json @@ -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." -} \ No newline at end of file +} diff --git a/app/scripts/locales/fr-FR.json b/app/scripts/locales/fr-FR.json index 8859d8e0..f038843b 100644 --- a/app/scripts/locales/fr-FR.json +++ b/app/scripts/locales/fr-FR.json @@ -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." -} \ No newline at end of file +} diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js index 4bfc92bb..05bfd933 100644 --- a/app/scripts/views/settings/settings-file-view.js +++ b/app/scripts/views/settings/settings-file-view.js @@ -512,10 +512,22 @@ const SettingsFileView = Backbone.View.extend({ this.backupInProgress = false; backupButton.text(Locale.setFileBackupNow); if (err) { + let title = '' + let description = '' + if (err.hasOwnProperty('code') && err.code === 'EISDIR') { + title = Locale.setFileBackupErrorIsDir; + description = Locale.setFileBackupErrorIsDirDescription; + } else { + title = Locale.setFileBackupError; + description = Locale.setFileBackupErrorDescription; + } Alerts.error({ - title: Locale.setFileBackupError, - body: Locale.setFileBackupErrorDescription + '' - }); + title: title, + body: description + + '' + }) } }); });