Skip to content

Commit

Permalink
Merge pull request #2359 from govuk-one-login/AUT-3857/update-sign-in…
Browse files Browse the repository at this point in the history
…-content-for-lockout-scenarios

AUT-3857: Update strategic app content for password lockout
  • Loading branch information
gtvj authored Dec 12, 2024
2 parents bf41046 + d454b83 commit 50d0386
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 2 deletions.
7 changes: 7 additions & 0 deletions src/assets/scss/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,10 @@
border-bottom: 0;
}
}

.strategic-app-retry-options {
a:first-child {
display: inline-block;
@include govuk-responsive-margin(2, "bottom");
}
}
6 changes: 5 additions & 1 deletion src/components/enter-password/index-account-locked.njk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
<p class="govuk-body">{{'pages.accountLocked.bulletPointSection.title' | translate}}</p>
<ul class="govuk-list govuk-list--bullet">
<li><a href="/reset-password-request" class="govuk-link">{{'pages.accountLocked.bulletPointSection.first' | translate}}</a></li>
<li>{{'pages.accountLocked.bulletPointSection.second' | translate}}</li>
{% if strategicAppChannel === true %}
<li>{{'mobileAppPages.accountLocked.bulletPointSection.second' | translate}}</li>
{% else %}
<li>{{'pages.accountLocked.bulletPointSection.second' | translate}}</li>
{% endif %}
</ul>

{{ga4OnPageLoad({ nonce: scriptNonce, statusCode: "200", englishPageTitle: pageTitleName, taxonomyLevel1: taxonomyLevel1, taxonomyLevel2: taxonomyLevel2, contentId: "", loggedInStatus: false, dynamic: false })}}
Expand Down
10 changes: 9 additions & 1 deletion src/components/enter-password/index-sign-in-retry-blocked.njk
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,19 @@
<p class="govuk-body">{{'pages.signInRetryBlocked.paragraph' | translate}}</p>

<h2 class="govuk-heading-m">{{'pages.signInRetryBlocked.subHeader' | translate}}</h2>
{% if strategicAppChannel === true %}
<p class="govuk-body strategic-app-retry-options">
<a href="/reset-password-request" class="govuk-link">{{ 'mobileAppPages.signInRetryBlocked.whatCanYouDo.resetYourPassword' | translate }}</a>
<span class="govuk-visually-hidden">.</span><br>
{{ 'mobileAppPages.signInRetryBlocked.whatCanYouDo.waitAndTryAgain' | translate }}
</p>
{% else %}
<p class="govuk-body">{{'pages.signInRetryBlocked.bulletPointSection.title' | translate}}</p>
<ul class="govuk-list govuk-list--bullet">
<li><a href="/reset-password-request" class="govuk-link">{{'pages.signInRetryBlocked.bulletPointSection.first' | translate}}</a></li>
<li><a href="/reset-password-request" class="govuk-link">{{ 'pages.signInRetryBlocked.bulletPointSection.first' | translate }}</a></li>
<li>{{'pages.signInRetryBlocked.bulletPointSection.second' | translate}}</li>
</ul>
{% endif %}

{{ga4OnPageLoad({ nonce: scriptNonce, statusCode: "200", englishPageTitle: pageTitleName, taxonomyLevel1: taxonomyLevel1, taxonomyLevel2: taxonomyLevel2, contentId: "e020dd02-2f97-46f9-9b26-c98730c89d73", loggedInStatus: false, dynamic: false })}}
{% endblock %}
11 changes: 11 additions & 0 deletions src/locales/cy/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,17 @@
},
"accountCreated": {
"text": "Nawr parhewch i ddefnyddio’r ap."
},
"accountLocked": {
"bulletPointSection": {
"second": "arhoswch am 2 awr, yna rhowch gynnig arall"
}
},
"signInRetryBlocked": {
"whatCanYouDo": {
"resetYourPassword": "Ailosod eich cyfrinair",
"waitAndTryAgain": "Gallwch hefyd aros am 2 awr, yna rhowch gynnig arall."
}
}
},
"pages": {
Expand Down
11 changes: 11 additions & 0 deletions src/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,17 @@
},
"accountCreated": {
"text": "Now continue to use the app."
},
"accountLocked": {
"bulletPointSection": {
"second": "wait 2 hours, then try again"
}
},
"signInRetryBlocked": {
"whatCanYouDo": {
"resetYourPassword": "Reset your password",
"waitAndTryAgain": "You can also wait 2 hours, then try again."
}
}
},
"pages": {
Expand Down

0 comments on commit 50d0386

Please sign in to comment.