Skip to content

Commit

Permalink
Merge pull request #71 from hmrc/PLATUI-706_content_tweaks
Browse files Browse the repository at this point in the history
PLATUI-706: Content tweaks
  • Loading branch information
matthewmascord committed Sep 10, 2020
2 parents 29b2496 + 18243d9 commit 5711c8a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
8 changes: 4 additions & 4 deletions conf/messages
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ introduction.heading=Accessibility statement for {0} service
introduction.lede=This accessibility statement explains how accessible this service is, what to do if you have difficulty using it, and how to report accessibility problems with the service.
introduction.scope.part1='This service is part of the wider GOV.UK website. There is a '
introduction.scope.part2=separate accessibility statement for the main GOV.UK website.
introduction.service-name=This page only contains information about the {0} Service, available at {1}.
introduction.service-name=This page only contains information about the {0} service, available at {1}.

## Using the service
using-service.heading=Using this service
Expand All @@ -26,8 +26,8 @@ using-service.bullet3=get from the start of the service to the end using just a
using-service.bullet4=get from the start of the service to the end using speech recognition software
using-service.bullet5=listen to the service using a screen reader (including the most recent versions of JAWS, NVDA and VoiceOver)
using-service.simple-text=We have also made the text in the service as simple as possible to understand.
using-service.making-device-easier.part1=AbilityNet
using-service.making-device-easier.part2=has advice on making your device easier to use if you have a disability.
using-service.making-device-easier.part1=AbilityNet has advice
using-service.making-device-easier.part2=' on making your device easier to use if you have a disability.'

## Accessibility
accessibility.heading=How accessible this service is
Expand Down Expand Up @@ -83,7 +83,7 @@ technical.non-compliance.automated.test-by=The service will also book a full acc
## Testing
testing.heading=How we tested this service
testing.last-tested=The service was last tested on {0} and was checked for compliance with WCAG 2.1 AA.
testing.last-tested.automated=The service was last tested on {0} using automated testing tools and was checked for compliance with WCAG 2.1 AA.
testing.last-tested.automated=The service was last tested on {0} using automated tools and was checked for compliance with WCAG 2.1 AA.
testing.details.part1=The service was built using parts that were tested by the
testing.details.part2=Digital Accessibility Centre
testing.details.part3=. The full service was tested by HMRC and included disabled users.
Expand Down
6 changes: 3 additions & 3 deletions conf/messages.cy
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ using-service.bullet3=mynd o ddechrau’r gwasanaeth i’r diwedd gan ddefnyddio
using-service.bullet4=mynd o ddechrau’r gwasanaeth i’r diwedd gan ddefnyddio meddalwedd adnabod lleferydd
using-service.bullet5=gwrando ar y gwasanaeth drwy ddefnyddio darllenydd sgrin (gan gynnwys y fersiynau diweddaraf o JAWS, NVDA a VoiceOver)
using-service.simple-text=Rydym hefyd wedi sicrhau bod y testun a ddefnyddir yn y gwasanaeth mor syml â phosibl i’w ddeall.
using-service.making-device-easier.part1=Mae gan AbilityNet
using-service.making-device-easier.part2=' gyngor ar wneud eich dyfais yn haws i’w defnyddio os oes gennych anabledd.'
using-service.making-device-easier.part1=Mae gan AbilityNet gyngor
using-service.making-device-easier.part2=' ar wneud eich dyfais yn haws i’w defnyddio os oes gennych anabledd.'
## Accessibility
accessibility.heading=Pa mor hygyrch yw’r gwasanaeth hwn
Expand Down Expand Up @@ -80,7 +80,7 @@ technical.non-compliance.automated.test-by=Bydd y gwasanaeth hefyd yn trefnu arc
## Testing
testing.heading=Sut gwnaethom brofi’r gwasanaeth hwn
testing.last-tested=Cafodd y gwasanaeth ei brofi ddiwethaf ar {0} a gwiriwyd ei fod yn cydymffurfio â safon ‘AA’ Canllawiau Hygyrchedd Cynnwys y We, fersiwn 2.1.
testing.last-tested.automated=Cafodd y gwasanaeth ei brofi ddiwethaf ar {0} gan ddefnyddio offerynnau profi awtomataidd a gwiriwyd ei fod yn cydymffurfio â safon ‘AA’ Canllawiau Hygyrchedd Cynnwys y We, fersiwn 2.1.
testing.last-tested.automated=Cafodd y gwasanaeth ei brofi ddiwethaf ar {0} gan ddefnyddio offerynnau awtomataidd a gwiriwyd ei fod yn cydymffurfio â safon ‘AA’ Canllawiau Hygyrchedd Cynnwys y We, fersiwn 2.1.
testing.details.part1='Adeiladwyd y gwasanaeth gan ddefnyddio rhannau a brofwyd gan y Ganolfan Hygyrchedd Digidol '
testing.details.part2=(Digital Accessibility Centre).
testing.details.part3=Profwyd y gwasanaeth llawn gan CThEM, ac roedd y gwaith o brofi’r gwasanaeth yn cynnwys defnyddwyr anabl.
Expand Down
13 changes: 8 additions & 5 deletions test/unit/views/StatementPageSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class StatementPageSpec extends WordSpec with Matchers {
val statementPageHtml = statementPage(fullyAccessibleServiceStatement, None, isWelshTranslationAvailable = false)

contentAsString(statementPageHtml) should include(
"""<p class="govuk-body">This page only contains information about the fully accessible service name Service, available at https://www.tax.service.gov.uk/fully-accessible.""")
"""<p class="govuk-body">This page only contains information about the fully accessible service name service, available at https://www.tax.service.gov.uk/fully-accessible.""")
}

"return HTML containing the expected using service information with service description" in new Setup {
Expand Down Expand Up @@ -193,11 +193,14 @@ class StatementPageSpec extends WordSpec with Matchers {
contentAsString(statementPageHtml) should include(
"""<h4 class="govuk-heading-s">Non-compliance with the accessibility regulations</h4>""")

contentAsString(statementPageHtml) should include("""First milestone to be fixed. We plan to fix this compliance issue by 15 January 2022.""")
contentAsString(statementPageHtml) should include(
"""First milestone to be fixed. We plan to fix this compliance issue by 15 January 2022.""")

contentAsString(statementPageHtml) should include("""Second milestone we&#x27;ll look at. We plan to fix this compliance issue by 20 June 2022.""")
contentAsString(statementPageHtml) should include(
"""Second milestone we&#x27;ll look at. We plan to fix this compliance issue by 20 June 2022.""")

contentAsString(statementPageHtml) should include("""Then we&#x27;ll get to this third milestone. We plan to fix this compliance issue by 02 September 2022.""")
contentAsString(statementPageHtml) should include(
"""Then we&#x27;ll get to this third milestone. We plan to fix this compliance issue by 02 September 2022.""")
}

"return HTML containing a language toggle" in new Setup {
Expand Down Expand Up @@ -279,7 +282,7 @@ class StatementPageSpec extends WordSpec with Matchers {
statementPage(automatedTestingServiceStatement, None, isWelshTranslationAvailable = false)

contentAsString(statementPageHtml) should include(
"""<p class="govuk-body">The service was last tested on 21 April 2019 using automated testing tools and was checked for compliance with WCAG 2.1 AA.</p>""")
"""<p class="govuk-body">The service was last tested on 21 April 2019 using automated tools and was checked for compliance with WCAG 2.1 AA.</p>""")
}

"return HTML with the date for carrying out a full assessment" in new Setup {
Expand Down

0 comments on commit 5711c8a

Please sign in to comment.