Merge pull request #13 from hmrc/PLATUI-345

PlatUI-345 Remove whitespace mismatch
hmrc · Jan 17, 2020 · 0900fae · 0900fae
2 parents 6afc136 + 987a740
commit 0900fae
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 26 deletions.
diff --git a/src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcAccountMenu.scala.html b/src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcAccountMenu.scala.html
@@ -43,13 +43,15 @@
     </li>
 
     <li>
-      <a href="@messages.href" class="hmrc-account-menu__link@if(messages.active) { hmrc-account-menu__link--active} else {}">
-          @language match {
-            case Cy => {Negeseuon}
-            case _ => {Messages}
+      <a href="@messages.href"
+        class="hmrc-account-menu__link@if(messages.active) { hmrc-account-menu__link--active} else {}">@defining(
+            language match {
+            case Cy => "Negeseuon"
+            case _ => "Messages"
+            }
+          ){msg =>
+                @msg@messages.messageCount.filter(_ > 0).map{x =>@hmrcNotificationBadge(NotificationBadge(x.toString))}.getOrElse{}</a>
           }
-          @messages.messageCount.filter(_ > 0).map{x => @hmrcNotificationBadge(NotificationBadge(x.toString))}.getOrElse{}
-      </a>
     </li>
 
     <li>

diff --git a/src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcNewTabLink.scala.html b/src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcNewTabLink.scala.html
@@ -18,12 +18,11 @@
 @import params._
 
 @if(!text.isEmpty) {
- <a class="@toClasses("govuk-link ", classList.getOrElse(""))" target="_blank" rel="noopener noreferrer" href="@href">
-  @text
-  @if(params.language.get == "en"){
-  (opens in a new window or tab)
+ <a class="@toClasses("govuk-link ", classList.getOrElse(""))" target="_blank" rel="noopener noreferrer" href="@href">@text@if(params.language.get == "en"){
+  (opens in a new window or tab)</a>
+ } else {
+    @if(params.language.get == "cy"){
+     (yn agor ffenestr neu dab newydd)</a>
+    } else {</a>}
  }
- @if(params.language.get == "cy"){
-  (yn agor ffenestr neu dab newydd)
- }</a>
 }
diff --git a/src/main/play-26/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcAccountMenu.scala.html b/src/main/play-26/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcAccountMenu.scala.html
@@ -45,13 +45,15 @@
     </li>
 
     <li>
-      <a href="@messages.href" class="hmrc-account-menu__link@if(messages.active) { hmrc-account-menu__link--active} else {}">
-          @language match {
-            case Cy => {Negeseuon}
-            case _ => {Messages}
+      <a href="@messages.href"
+        class="hmrc-account-menu__link@if(messages.active) { hmrc-account-menu__link--active} else {}">@defining(
+            language match {
+            case Cy => "Negeseuon"
+            case _ => "Messages"
+            }
+          ){msg =>
+                @msg@messages.messageCount.filter(_ > 0).map{x =>@hmrcNotificationBadge(NotificationBadge(x.toString))}.getOrElse{}</a>
           }
-          @messages.messageCount.filter(_ > 0).map{x => @hmrcNotificationBadge(NotificationBadge(x.toString))}.getOrElse{}
-      </a>
     </li>
 
     <li>

diff --git a/src/main/play-26/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcNewTabLink.scala.html b/src/main/play-26/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcNewTabLink.scala.html
@@ -20,12 +20,11 @@
 @import params._
 
 @if(!text.isEmpty) {
- <a class="@toClasses("govuk-link ", classList.getOrElse(""))" target="_blank" rel="noopener noreferrer" href="@href">
-  @text
-  @if(params.language.get == "en"){
-  (opens in a new window or tab)
+ <a class="@toClasses("govuk-link ", classList.getOrElse(""))" target="_blank" rel="noopener noreferrer" href="@href">@text@if(params.language.get == "en"){
+  (opens in a new window or tab)</a>
+ } else {
+    @if(params.language.get == "cy"){
+     (yn agor ffenestr neu dab newydd)</a>
+    } else {</a>}
  }
- @if(params.language.get == "cy"){
-  (yn agor ffenestr neu dab newydd)
- }</a>
 }