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

uml-2976 remove 'important' from dashboard message #2433

Merged
merged 4 commits into from
Nov 21, 2023
Merged

uml-2976 remove 'important' from dashboard message #2433

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
3fd0146
removed important
Lbagg1 Nov 15, 2023
a13ffcd
amended test files
Lbagg1 Nov 15, 2023
7a0f33e
Welsh translations updated
Lbagg1 Nov 21, 2023
51f3e86
Merge branch 'main' into uml-2976-remove-important-on-dashboard-message
Lbagg1 Nov 21, 2023
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 service-front/app/features/actor-dashboard.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Feature: The user is able to see correct information on their dashboard
@ui
Scenario: As a user I can see the message on instructions and preferences
Given I am on the dashboard page
Then I can see the message Important: This LPA has instructions and preferences.
Then I can see the message This LPA has instructions and preferences.

@ui
Scenario: As a user I can see the read more link in the message on instructions and preferences
Expand Down
2 changes: 1 addition & 1 deletion service-front/app/features/context/UI/LpaContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ public function iCanSeeReadMoreLink($readMoreLink): void
$this->ui->assertPageAddress('/lpa/dashboard');

$this->ui->assertPageContainsText(
'Important: This LPA has instructions and preferences. '
'This LPA has instructions and preferences. '
);

$session = $this->ui->getSession();
Expand Down
Binary file modified service-front/app/languages/cy/LC_MESSAGES/messages.mo
View file
Open in desktop
Binary file not shown.
24 changes: 20 additions & 4 deletions service-front/app/languages/cy/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2023-11-15T17:09:59+00:00\n"
"POT-Creation-Date: 2023-11-21T13:42:06+00:00\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -5165,15 +5165,15 @@ msgstr "Mae gan yr atwrneiaeth arhosol hon gyfarwyddiadau a/neu ddewisiadau"

#: src/Common/templates/partials/full-lpa-display.html.twig:52
msgid "This LPA has instructions and preferences"
msgstr "Mae gan yr atwrneiaeth arhosol hon gyfarwyddiadau a dewisiadau"
msgstr "Mae gan yr LPA hon gyfarwyddiadau neu ddymuniadau"

#: src/Common/templates/partials/full-lpa-display.html.twig:54
msgid "This LPA has preferences"
msgstr "Mae gan yr atwrneiaeth arhosol hon ddewisiadau"
msgstr "Mae gan yr LPA hon ddymuniadau"

#: src/Common/templates/partials/full-lpa-display.html.twig:56
msgid "This LPA has instructions"
msgstr "Mae gan yr atwrneiaeth arhosol hon gyfarwyddiadau"
msgstr "Mae gan yr LPA hon gyfarwyddiadau"

#: src/Common/templates/partials/full-lpa-display.html.twig:75
msgid ""
Expand Down Expand Up @@ -6516,6 +6516,22 @@ msgstr "Byddwn yn anfon eich allwedd cadarnhau cyfrif atoch drwy’r post."
msgid "Also known as"
msgstr "A elwir hefyd yn"

#: src/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig:3
msgid "This LPA has instructions.<br>"
msgstr "Mae gan yr LPA hon gyfarwyddiadau.<br>"

#: src/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig:21
msgid "This LPA has preferences.<br>"
msgstr "Mae gan yr LPA hon ddymuniadau.<br>"

#: src/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig:39
msgid "This LPA has instructions and preferences.<br>"
msgstr "Mae gan yr LPA hon gyfarwyddiadau neu ddymuniadau.<br>"

#: src/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig:57
msgid "This LPA has instructions and/or preferences.<br>"
msgstr "Mae gan yr LPA hon gyfarwyddiadau a/neu ddymuniadau.<br>"

#~ msgid ""
#~ "If the scanned image is not readable, organisations may ask to see the "
#~ "paper LPA so that they can find out what the instructions or preferences "
Expand Down
18 changes: 17 additions & 1 deletion service-front/app/languages/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Language: en_GB\n"
"POT-Creation-Date: 2023-11-15T17:09:59+00:00\n"
"POT-Creation-Date: 2023-11-21T13:42:06+00:00\n"
"X-Domain: messages\n"

#: src/Actor/templates/actor/activation-key-request-received.html.twig:12
Expand Down Expand Up @@ -4514,3 +4514,19 @@ msgstr ""
#: src/Common/templates/partials/lpa-summary-details/lpa-donor-details.html.twig:9
msgid "Also known as"
msgstr ""

#: src/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig:3
msgid "This LPA has instructions.<br>"
msgstr ""

#: src/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig:21
msgid "This LPA has preferences.<br>"
msgstr ""

#: src/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig:39
msgid "This LPA has instructions and preferences.<br>"
msgstr ""

#: src/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig:57
msgid "This LPA has instructions and/or preferences.<br>"
msgstr ""
8 changes: 4 additions & 4 deletions ...c/Actor/templates/actor/partials/lpa-instructions-preferences-important-message.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% if not is_donor_signature_date_too_old(lpa) and actorActive and lpa.applicationHasRestrictions and not lpa.applicationHasGuidance %}
<p class="govuk-body govuk-!-margin-bottom-1">
{% trans %}
<strong>Important: </strong>This LPA has instructions.<br>
Lbagg1 marked this conversation as resolved.
Show resolved Hide resolved
This LPA has instructions.<br>
{% endtrans %}
{% if not feature_enabled('instructions_and_preferences') %}
{% trans %}
Expand All @@ -19,7 +19,7 @@
{% if not is_donor_signature_date_too_old(lpa) and actorActive and lpa.applicationHasGuidance and not lpa.applicationHasRestrictions %}
<p class="govuk-body govuk-!-margin-bottom-1">
{% trans %}
<strong>Important: </strong>This LPA has preferences.<br>
This LPA has preferences.<br>
{% endtrans %}
{% if not feature_enabled('instructions_and_preferences') %}
{% trans %}
Expand All @@ -37,7 +37,7 @@
{% if not is_donor_signature_date_too_old(lpa) and actorActive and lpa.applicationHasRestrictions and lpa.applicationHasGuidance %}
<p class="govuk-body govuk-!-margin-bottom-1">
{% trans %}
<strong>Important: </strong>This LPA has instructions and preferences.<br>
This LPA has instructions and preferences.<br>
{% endtrans %}
{% if not feature_enabled('instructions_and_preferences') %}
{% trans %}
Expand All @@ -55,7 +55,7 @@
{% if actorActive and is_donor_signature_date_too_old(lpa) and (lpa.applicationHasRestrictions or lpa.applicationHasGuidance) %}
<p class="govuk-body govuk-!-margin-bottom-1">
{% trans %}
<strong>Important: </strong>This LPA has instructions and/or preferences.<br>
This LPA has instructions and/or preferences.<br>
{% endtrans %}
{% if not feature_enabled('instructions_and_preferences') %}
{% trans %}
Expand Down
Loading