From b3aece8f3ee64f8f203a6fd81bb1ef0b3b5a6b46 Mon Sep 17 00:00:00 2001 From: Rashad Mughal Date: Thu, 11 Mar 2021 10:42:19 +0000 Subject: [PATCH 1/2] GYE-2403: Update library to service design guidelines for language toggle. --- project/PlayCrossCompilation.scala | 4 ++-- src/main/resources/messages | 4 +++- src/main/resources/messages.cy | 4 +++- .../scala/views/language_selection.scala.html | 23 +++++++++++-------- .../scala/views/LanguageSelectionSpec.scala | 11 ++++----- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/project/PlayCrossCompilation.scala b/project/PlayCrossCompilation.scala index b14c121..76819ad 100644 --- a/project/PlayCrossCompilation.scala +++ b/project/PlayCrossCompilation.scala @@ -1,4 +1,4 @@ import uk.gov.hmrc.playcrosscompilation.AbstractPlayCrossCompilation -import uk.gov.hmrc.playcrosscompilation.PlayVersion.Play26 +import uk.gov.hmrc.playcrosscompilation.PlayVersion.Play27 -object PlayCrossCompilation extends AbstractPlayCrossCompilation(defaultPlayVersion = Play26) \ No newline at end of file +object PlayCrossCompilation extends AbstractPlayCrossCompilation(defaultPlayVersion = Play27) \ No newline at end of file diff --git a/src/main/resources/messages b/src/main/resources/messages index fefa917..a96cab3 100644 --- a/src/main/resources/messages +++ b/src/main/resources/messages @@ -1,4 +1,6 @@ language.to=to language.month=month language.day.singular=day -language.day.plural=days \ No newline at end of file +language.day.plural=days +language.toggle.hidden.english=Change language to English +language.toggle.hidden.cymraeg=Newid yr iaith ir Gymraeg \ No newline at end of file diff --git a/src/main/resources/messages.cy b/src/main/resources/messages.cy index 6a95fa2..37b9c50 100644 --- a/src/main/resources/messages.cy +++ b/src/main/resources/messages.cy @@ -1,4 +1,6 @@ language.to=i language.month=mis language.day.singular=diwrnod -language.day.plural=diwrnod \ No newline at end of file +language.day.plural=diwrnod +language.toggle.hidden.english=Change language to English +language.toggle.hidden.cymraeg=Newid yr iaith ir Gymraeg \ No newline at end of file diff --git a/src/main/scala/views/language_selection.scala.html b/src/main/scala/views/language_selection.scala.html index defdc7a..4de3d27 100644 --- a/src/main/scala/views/language_selection.scala.html +++ b/src/main/scala/views/language_selection.scala.html @@ -18,21 +18,24 @@ @(langMap: Map[String, Lang], langToCall: String => Call, customClass: Option[String] = None, appName: Option[String] = None)(implicit messages: Messages) -

- +

diff --git a/src/test/scala/views/LanguageSelectionSpec.scala b/src/test/scala/views/LanguageSelectionSpec.scala index 9b0bcf9..1b73198 100644 --- a/src/test/scala/views/LanguageSelectionSpec.scala +++ b/src/test/scala/views/LanguageSelectionSpec.scala @@ -56,8 +56,7 @@ class LanguageSelectionSpec extends PlaySpec with GuiceOneAppPerSuite { "show correct current language message when current language is English" in { val html = views.html.language_selection.render(languageMap, langToUrl, None, None, messagesEnglish) contentType(html) must be("text/html") - contentAsString(html) must include("English") - contentAsString(html) must not include ">English<" + contentAsString(html) must include("English") } "give a link to switch to English when current language is Welsh" in { @@ -70,14 +69,13 @@ class LanguageSelectionSpec extends PlaySpec with GuiceOneAppPerSuite { "show correct current language message when current language is Welsh" in { val html = views.html.language_selection.render(languageMap, langToUrl, None, None, messagesWelsh) contentType(html) must be("text/html") - contentAsString(html) must include("Cymraeg") - contentAsString(html) must not include ">Cymraeg<" + contentAsString(html) must include("Cymraeg") } "show a custom class if it is set" in { val html = views.html.language_selection.render(languageMap, langToUrl, Some("float--right"), None, messagesWelsh) contentType(html) must be("text/html") - contentAsString(html) must include("class=\"float--right\"") + contentAsString(html) must include("class=\"float--right") } "show a data-journey-click attribute for GA if it is set and language is Welsh" in { @@ -101,8 +99,7 @@ class LanguageSelectionSpec extends PlaySpec with GuiceOneAppPerSuite { val html = views.html.language_selection.render(mockLanguageMap, langToUrl, None, None, messagesSpanish) contentType(html) must be("text/html") - contentAsString(html) must include("Español") - contentAsString(html) must not include ">Español<" + contentAsString(html) must include("Español") } } } From 84bbdc9a4c1b13565637000e25e10586fbe55ecf Mon Sep 17 00:00:00 2001 From: Rashad Mughal Date: Wed, 28 Apr 2021 11:12:44 +0100 Subject: [PATCH 2/2] Added translation for aria label --- src/main/resources/messages | 3 ++- src/main/resources/messages.cy | 3 ++- src/main/scala/views/language_selection.scala.html | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/resources/messages b/src/main/resources/messages index a96cab3..9906e89 100644 --- a/src/main/resources/messages +++ b/src/main/resources/messages @@ -3,4 +3,5 @@ language.month=month language.day.singular=day language.day.plural=days language.toggle.hidden.english=Change language to English -language.toggle.hidden.cymraeg=Newid yr iaith ir Gymraeg \ No newline at end of file +language.toggle.hidden.cymraeg=Newid yr iaith ir Gymraeg +language.toggle.aria.label=Language switcher \ No newline at end of file diff --git a/src/main/resources/messages.cy b/src/main/resources/messages.cy index 37b9c50..abc4978 100644 --- a/src/main/resources/messages.cy +++ b/src/main/resources/messages.cy @@ -3,4 +3,5 @@ language.month=mis language.day.singular=diwrnod language.day.plural=diwrnod language.toggle.hidden.english=Change language to English -language.toggle.hidden.cymraeg=Newid yr iaith ir Gymraeg \ No newline at end of file +language.toggle.hidden.cymraeg=Newid yr iaith ir Gymraeg +language.toggle.aria.label=Switcher iaith \ No newline at end of file diff --git a/src/main/scala/views/language_selection.scala.html b/src/main/scala/views/language_selection.scala.html index 4de3d27..60e9ff9 100644 --- a/src/main/scala/views/language_selection.scala.html +++ b/src/main/scala/views/language_selection.scala.html @@ -18,7 +18,7 @@ @(langMap: Map[String, Lang], langToCall: String => Call, customClass: Option[String] = None, appName: Option[String] = None)(implicit messages: Messages) -