From b444b403d738a8671557f0a1dedbb5440885dbdf Mon Sep 17 00:00:00 2001 From: Thijs Kinkhorst Date: Mon, 16 Oct 2023 15:22:21 +0200 Subject: [PATCH] Consistentify

usage in error messages An error message is now wrapped in

tags if there are multiple paragraphs, not otherwise. This was done inconsistently before. It does not impact the display of said messages. --- .../View/Feedback/metadata-entity-not-found.html.twig | 2 +- .../View/Feedback/missing-required-fields.html.twig | 2 ++ .../View/Feedback/no-authentication-request-received.html.twig | 2 +- .../View/IdentityProvider/perform-request-access.html.twig | 2 +- .../View/Feedback/metadata-entity-not-found.html.twig | 2 +- .../View/Feedback/missing-required-fields.html.twig | 2 ++ .../View/Feedback/no-authentication-request-received.html.twig | 2 +- .../View/Feedback/received-error-status-code.html.twig | 2 +- .../View/Feedback/unknown-requesterid-in-authnrequest.html.twig | 2 +- 9 files changed, 11 insertions(+), 7 deletions(-) diff --git a/theme/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig index 8c5d038aa2..1f73878194 100644 --- a/theme/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig +++ b/theme/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig @@ -5,4 +5,4 @@ {% block title %}{{ parent() }}{% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}

{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}

{% endblock %} +{% block errorMessage %}{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}{% endblock %} diff --git a/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig index 3fe466c4cf..f070a9c8b5 100644 --- a/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig +++ b/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig @@ -6,6 +6,7 @@ {% block pageHeading %}{{ pageTitle }}{% endblock %} {% block errorMessage %} +

{% if withIdpName and withSpName %} {{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']}) }} {% elseif withIdpName %} @@ -15,6 +16,7 @@ {% else %} {{ 'error_missing_required_fields_desc_no_name'|trans }} {% endif %} +