Skip to content

Commit

Permalink
Merge pull request #257 from gopasspw/update-setup-message
Browse files Browse the repository at this point in the history
Update setup errors and help message
  • Loading branch information
Pharb authored Oct 4, 2024
2 parents 5b69c1c + 9018e82 commit f87e0c4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion web-extension/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
"description": "Error when another basic authentication popup is already open"
},
"correctlySetup": {
"message": "Ist Gopass für Gopass Bridge eingerichtet? Bei Aktualisierung auf Gopass v1.10 oder neuer muss das gopass-jsonapi Setup erneut ausgeführt werden.",
"message": "Die Gopass Integration für diesen Browser ist wahrscheinlich nicht installiert. Bitte `gopass-jsonapi configure` ausführen.",
"description": "Error when gopassbridge is not correctly setup"
}
}
2 changes: 1 addition & 1 deletion web-extension/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
"description": "Error when another basic authentication popup is already open"
},
"correctlySetup": {
"message": "Is your browser correctly set up for gopass? If you are upgrading to gopass v1.10 or newer you need to re-run the gopass-jsonapi setup command.",
"message": "Your browser's integration with gopass is probably not set up. Please run `gopass-jsonapi configure`.",
"description": "Error when gopassbridge is not correctly setup"
}
}
3 changes: 2 additions & 1 deletion web-extension/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
let spinnerTimeout;
const SETUP_URL = 'https://github.com/gopasspw/gopass/blob/master/docs/setup.md#filling-in-passwords-from-browser';
const SETUP_ERRORS = [
'Access to the specified native messaging host is forbidden',
'Access to the specified native messaging host is forbidden', // Chrome: extension ID not in allowed_origins
'Attempt to postMessage on disconnected port',
'Specified native messaging host not found',
'Native host has exited', // Chrome: gopass-jsonapi not found or other error in gopass_wrapper.sh
'Error when communicating with the native messaging host', // Chrome: gopass v1.10 returns invalid message
'An unexpected error occurred', // Firefox: gopass-jsonapi not found or other error in gopass_wrapper.sh
'Native application tried to send a message', // Firefox: gopass v1.10 returns invalid message
'No such native application', // Firefox: gopass-jsonapi not configured
];

function armSpinnerTimeout() {
Expand Down

0 comments on commit f87e0c4

Please sign in to comment.