Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1286: Improve error message activation #1593

Merged
merged 4 commits into from
Sep 2, 2024
Merged

1286: Improve error message activation #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0259b64
1286: improve error message, remove error reporting
f1sh1918 Aug 26, 2024
83f64bb
Update frontend/assets/l10n/app_en.json
f1sh1918 Aug 28, 2024
5ae8e9b
Update frontend/assets/l10n/app_de.json
f1sh1918 Sep 2, 2024
0dcdf87
1286: removed qr code type from message
f1sh1918 Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/assets/l10n/app_de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"codeExpired": "Der eingescannte Code ist bereits am {{expirationDate}} abgelaufen.",
"codeInvalid": "Der Inhalt des eingescannten Codes kann nicht verstanden werden. Vermutlich handelt es sich um einen QR-Code, der nicht für diese App generiert wurde.",
"codeInvalidMissing": "Der Inhalt des eingescannten Codes ist unvollständig. (Fehlercode: {{missing}}Missing)",
"codeInvalidType": "Der eingescannte Code ist für diesen Vorgang nicht gültig. (Eingescannt: {{qrCodeType}})",
"codeInvalidType": "Der eingescannte Code ist nicht für die Aktivierung in der App vorgesehen. Bitte verwenden Sie den als Aktivierungscode ausgewiesenen QR-Code.",
"codeUnknownType": "Der eingescannte Code ist für diese Anwendung nicht gültig.",
"codeVerificationFailed": "Der eingescannte Code konnte vom Server nicht verifiziert werden.",
"codeActivationFailedConnection": "Der eingescannte Code konnte nicht aktiviert werden. Bitte stellen Sie sicher, dass eine Internetverbindung besteht und prüfen Sie erneut.",
Expand Down
2 changes: 1 addition & 1 deletion frontend/assets/l10n/app_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"codeExpired": "The scanned code has already expired on {{expirationDate}}.",
"codeInvalid": "The content of the scanned code cannot be understood. It is probably a QR code that was not generated for this app.",
"codeInvalidMissing": "The content of the scanned code is incomplete. (Error code: {{missing}}Missing)",
"codeInvalidType": "The scanned code is not valid for this operation. (Scanned: {{qrCodeType}})",
"codeInvalidType": "The scanned code is not intended for activation in the app. Please use the QR code shown as activation code.",
"codeUnknownType": "The scanned code is not valid for this application.",
"codeVerificationFailed": "The scanned code could not be verified by the server.",
"codeActivationFailedConnection": "The scanned code could not be activated. Please make sure you have an internet connection and try again.",
Expand Down
4 changes: 2 additions & 2 deletions frontend/lib/identification/activation_workflow/activation_code_scanner_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ class ActivationCodeScannerPage extends StatelessWidget {
await showError(t.identification.cardAlreadyActivated, null);
} on QrCodeFieldMissingException catch (e) {
await showError(t.identification.codeInvalidMissing(missing: e.missingFieldName), null);
} on QrCodeWrongTypeException catch (e) {
await showError(t.identification.codeInvalidType(qrCodeType: e.qrCodeType), null);
} on QrCodeWrongTypeException catch (_) {
await QrParsingErrorDialog.showErrorDialog(context, t.identification.codeInvalidType);
} on CardExpiredException catch (e) {
final expirationDate = DateFormat('dd.MM.yyyy').format(e.expiry);
await showError(t.identification.codeExpired(expirationDate: expirationDate), null);
Expand Down