From 356d2b3102c59ac6e9bc754659c2b0a3445268ba Mon Sep 17 00:00:00 2001 From: bharti5verma <68339135+bharti5verma@users.noreply.github.com> Date: Tue, 19 Nov 2024 09:45:32 +0000 Subject: [PATCH] MCSC-1169 Accessibility fixes (Calculation) - Part 1 (#374) --- .../taxyear/ThresholdIncomeController.scala | 14 +++- .../HowMuchAAChargeSchemePaidSummary.scala | 2 +- .../HowMuchAAChargeYouPaidSummary.scala | 2 +- .../taxyear/TradeUnionReliefSummary.scala | 2 +- .../UnionPoliceReliefAmountSummary.scala | 2 +- .../taxyear/WhoPaidAAChargeSummary.scala | 12 ++- .../taxyear/ThresholdIncomeView.scala.html | 4 +- .../taxyear/WhoPaidAAChargeView.scala.html | 2 +- conf/messages.cy | 80 +++++++++---------- conf/messages.en | 80 +++++++++---------- .../ThresholdIncomeControllerSpec.scala | 9 ++- 11 files changed, 114 insertions(+), 95 deletions(-) diff --git a/app/controllers/annualallowance/taxyear/ThresholdIncomeController.scala b/app/controllers/annualallowance/taxyear/ThresholdIncomeController.scala index 3aa12c8cd..1f4eab92c 100644 --- a/app/controllers/annualallowance/taxyear/ThresholdIncomeController.scala +++ b/app/controllers/annualallowance/taxyear/ThresholdIncomeController.scala @@ -21,12 +21,14 @@ import forms.annualallowance.taxyear.ThresholdIncomeFormProvider import models.tasklist.sections.AASection import models.{Mode, Period} import pages.annualallowance.taxyear.ThresholdIncomePage -import play.api.i18n.{I18nSupport, MessagesApi} +import play.api.i18n.{I18nSupport, Messages, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} import services.UserDataService import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.annualallowance.taxyear.ThresholdIncomeView +import java.time.format.DateTimeFormatter +import java.util.Locale import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} @@ -51,7 +53,7 @@ class ThresholdIncomeController @Inject() ( case Some(value) => form.fill(value) } - Ok(view(preparedForm, mode, period)) + Ok(view(preparedForm, mode, period, startEndDate(period))) } def onSubmit(mode: Mode, period: Period): Action[AnyContent] = @@ -60,7 +62,7 @@ class ThresholdIncomeController @Inject() ( form .bindFromRequest() .fold( - formWithErrors => Future.successful(BadRequest(view(formWithErrors, mode, period))), + formWithErrors => Future.successful(BadRequest(view(formWithErrors, mode, period, startEndDate(period)))), value => for { updatedAnswers <- Future.fromTry(request.userAnswers.set(ThresholdIncomePage(period), value)) @@ -70,4 +72,10 @@ class ThresholdIncomeController @Inject() ( } yield Redirect(redirectUrl) ) } + + private def startEndDate(period: Period)(implicit messages: Messages): String = { + val languageTag = if (messages.lang.code == "cy") "cy" else "en" + val formatter = DateTimeFormatter.ofPattern("d MMMM yyyy", Locale.forLanguageTag(languageTag)) + period.start.format(formatter) + " " + messages("startEndDateAnd") + " " + period.end.format(formatter) + } } diff --git a/app/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeSchemePaidSummary.scala b/app/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeSchemePaidSummary.scala index 34a901916..99c4bacee 100644 --- a/app/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeSchemePaidSummary.scala +++ b/app/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeSchemePaidSummary.scala @@ -40,7 +40,7 @@ object HowMuchAAChargeSchemePaidSummary { period.start.format(formatter) + " " + messages("startEndDateTo") + " " + period.end.format(formatter) SummaryListRowViewModel( - key = "howMuchAAChargeSchemePaid.checkYourAnswersLabel", + key = messages("howMuchAAChargeSchemePaid.checkYourAnswersLabel", startEndDate), value = ValueViewModel(HtmlContent(currencyFormat(answer))), actions = Seq( ActionItemViewModel( diff --git a/app/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeYouPaidSummary.scala b/app/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeYouPaidSummary.scala index c3cfb69c9..ee090cccb 100644 --- a/app/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeYouPaidSummary.scala +++ b/app/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeYouPaidSummary.scala @@ -40,7 +40,7 @@ object HowMuchAAChargeYouPaidSummary { period.start.format(formatter) + " " + messages("startEndDateTo") + " " + period.end.format(formatter) SummaryListRowViewModel( - key = "howMuchAAChargeYouPaid.checkYourAnswersLabel", + key = messages("howMuchAAChargeYouPaid.checkYourAnswersLabel", startEndDate), value = ValueViewModel(HtmlContent(currencyFormat(answer))), actions = Seq( ActionItemViewModel( diff --git a/app/viewmodels/checkAnswers/annualallowance/taxyear/TradeUnionReliefSummary.scala b/app/viewmodels/checkAnswers/annualallowance/taxyear/TradeUnionReliefSummary.scala index 367ec10d2..c1cf59d0c 100644 --- a/app/viewmodels/checkAnswers/annualallowance/taxyear/TradeUnionReliefSummary.scala +++ b/app/viewmodels/checkAnswers/annualallowance/taxyear/TradeUnionReliefSummary.scala @@ -38,7 +38,7 @@ object TradeUnionReliefSummary { val value = if (answer) "site.yes" else "site.no" SummaryListRowViewModel( - key = "tradeUnionRelief.checkYourAnswersLabel", + key = messages("tradeUnionRelief.checkYourAnswersLabel", startEndDate), value = ValueViewModel(value), actions = Seq( ActionItemViewModel( diff --git a/app/viewmodels/checkAnswers/annualallowance/taxyear/UnionPoliceReliefAmountSummary.scala b/app/viewmodels/checkAnswers/annualallowance/taxyear/UnionPoliceReliefAmountSummary.scala index 033cf7cbc..d620753ef 100644 --- a/app/viewmodels/checkAnswers/annualallowance/taxyear/UnionPoliceReliefAmountSummary.scala +++ b/app/viewmodels/checkAnswers/annualallowance/taxyear/UnionPoliceReliefAmountSummary.scala @@ -38,7 +38,7 @@ object UnionPoliceReliefAmountSummary { period.start.format(formatter) + " " + messages("startEndDateTo") + " " + period.end.format(formatter) SummaryListRowViewModel( - key = "unionPoliceReliefAmount.checkYourAnswersLabel", + key = messages("unionPoliceReliefAmount.checkYourAnswersLabel", startEndDate), value = ValueViewModel(HtmlContent(currencyFormat(answer))), actions = Seq( ActionItemViewModel( diff --git a/app/viewmodels/checkAnswers/annualallowance/taxyear/WhoPaidAAChargeSummary.scala b/app/viewmodels/checkAnswers/annualallowance/taxyear/WhoPaidAAChargeSummary.scala index 2a051ee94..2779e88d9 100644 --- a/app/viewmodels/checkAnswers/annualallowance/taxyear/WhoPaidAAChargeSummary.scala +++ b/app/viewmodels/checkAnswers/annualallowance/taxyear/WhoPaidAAChargeSummary.scala @@ -25,6 +25,9 @@ import uk.gov.hmrc.govukfrontend.views.viewmodels.summarylist.SummaryListRow import viewmodels.govuk.summarylist._ import viewmodels.implicits._ +import java.time.format.DateTimeFormatter +import java.util.Locale + object WhoPaidAAChargeSummary { def row(answers: UserAnswers, period: Period, schemeIndex: SchemeIndex)(implicit @@ -41,8 +44,13 @@ object WhoPaidAAChargeSummary { answer.schemeName } + val languageTag = if (messages.lang.code == "cy") "cy" else "en" + val formatter = DateTimeFormatter.ofPattern("d MMMM yyyy", Locale.forLanguageTag(languageTag)) + val startEndDate: String = + period.start.format(formatter) + " " + messages("startEndDateTo") + " " + period.end.format(formatter) + SummaryListRowViewModel( - key = messages("whoPaidAACharge.checkYourAnswersLabel", schemeName.getOrElse("")), + key = messages("whoPaidAACharge.checkYourAnswersLabel", schemeName.getOrElse(""), startEndDate), value = value, actions = Seq( ActionItemViewModel( @@ -51,7 +59,7 @@ object WhoPaidAAChargeSummary { .onPageLoad(CheckMode, period, schemeIndex) .url ) - .withVisuallyHiddenText(messages("whoPaidAACharge.change.hidden", schemeName.getOrElse(""))) + .withVisuallyHiddenText(messages("whoPaidAACharge.change.hidden", schemeName.getOrElse(""), startEndDate)) ) ) } diff --git a/app/views/annualallowance/taxyear/ThresholdIncomeView.scala.html b/app/views/annualallowance/taxyear/ThresholdIncomeView.scala.html index ef303d407..afd8edc75 100644 --- a/app/views/annualallowance/taxyear/ThresholdIncomeView.scala.html +++ b/app/views/annualallowance/taxyear/ThresholdIncomeView.scala.html @@ -23,7 +23,7 @@ continueButton: components.ContinueButton ) -@(form: Form[_], mode: Mode, period: Period)(implicit request: Request[_], messages: Messages) +@(form: Form[_], mode: Mode, period: Period, startEndDate: String)(implicit request: Request[_], messages: Messages) @contentHint = {

@messages("thresholdIncome.message1")

@@ -67,7 +67,7 @@

@messages("thresholdIncome.subHeading1")

@messages("thresholdIncome.subHeading2." + period)

} -@layout(pageTitle = title(form, messages("thresholdIncome.title"))) { +@layout(pageTitle = title(form, messages("thresholdIncome.title", startEndDate))) { @formHelper(action = controllers.annualallowance.taxyear.routes.ThresholdIncomeController.onSubmit(mode, period), 'autoComplete -> "off") { diff --git a/app/views/annualallowance/taxyear/WhoPaidAAChargeView.scala.html b/app/views/annualallowance/taxyear/WhoPaidAAChargeView.scala.html index 8d5dd37e1..49d84e70a 100644 --- a/app/views/annualallowance/taxyear/WhoPaidAAChargeView.scala.html +++ b/app/views/annualallowance/taxyear/WhoPaidAAChargeView.scala.html @@ -25,7 +25,7 @@ @(form: Form[_], mode: Mode, period: Period, schemeIndex: SchemeIndex, schemeName: String, startEndDate: String)(implicit request: Request[_], messages: Messages) -@layout(pageTitle = title(form, messages("whoPaidAACharge.title", schemeIndex, schemeName))) { +@layout(pageTitle = title(form, messages("whoPaidAACharge.title", schemeName, startEndDate))) { @formHelper(action = controllers.annualallowance.taxyear.routes.WhoPaidAAChargeController.onSubmit(mode,period, schemeIndex), Symbol("autoComplete") -> "off") { diff --git a/conf/messages.cy b/conf/messages.cy index 00ce91ec5..c9cdd2eac 100644 --- a/conf/messages.cy +++ b/conf/messages.cy @@ -121,7 +121,7 @@ resubmittingAdjustment.hint = Dewiswch ‘Na’ os mai dyma’ch tro cyntaf yn d reasonForResubmission.title = Pam ydych am drosysgrifo cyflwyniad blaenorol? reasonForResubmission.heading = Pam ydych am drosysgrifo cyflwyniad blaenorol? -reasonForResubmission.checkYourAnswersLabel = Rheswm dros ailgyflwyno addasiad +reasonForResubmission.checkYourAnswersLabel = Pam ydych am drosysgrifo cyflwyniad blaenorol? reasonForResubmission.error.required = Nodwch y rheswm rydych am drosysgrifo cyflwyniad blaenorol reasonForResubmission.error.length = Mae’n rhaid i’r rheswm rydych wedi’i nodi ar gyfer trosysgrifo cyflwyniad blaenorol fod yn 500 o gymeriadau neu lai reasonForResubmission.change.hidden = Y rheswm am drosysgrifo cyflwyniad blaenorol @@ -135,16 +135,16 @@ ineligible.bullet3 = gwnaethoch adael y maes gwasanaeth cyhoeddus ar ôl 31 Mawr ineligible.bullet4 = nid oeddech yn rhan o unrhyw hen gynllun pensiwn gwasanaeth cyhoeddus ineligible.message2 = Mae’r rhesymau hyn yn golygu na fydd eich buddiannau pensiwn yn cael eu heffeithio gan y Cynllun Unioni Pensiynau Gwasanaeth Cyhoeddus, a does dim rhaid i chi ddefnyddio’r gwasanaeth hwn. -reportingChange.title = Pa daliadau treth yr hoffech chi eu haddasu? -reportingChange.heading = Pa daliadau treth y gallai cael eu heffeithio gan y Cynllun Unioni Pensiynau Gwasanaeth Cyhoeddus, yn eich barn chi? +reportingChange.title = cy: Which tax charges do you think may have been affected by the public service pension remedy? +reportingChange.heading = cy: Which tax charges do you think may have been affected by the public service pension remedy? reportingChange.error.required = Dewiswch y taliadau treth y gallai cael eu heffeithio gan y Cynllun Unioni Pensiynau Gwasanaeth Cyhoeddus, yn eich barn chi reportingChange.annualAllowance = Lwfans blynyddol reportingChange.lifetimeAllowance = Lwfans oes reportingChange.annualAllowance.hint = Lwfans blynyddol (AA) yw’r swm o arian y gallwch ei gyfrannu tuag at eich pensiwn bob blwyddyn heb dalu treth. reportingChange.lifetimeAllowance.hint = Lwfans Oes (LTA) yw cyfanswm yr arian y gallwch ei gynilo yn eich pensiwn yn ystod eich oes heb dalu treth. reportingChange.hint = Dewiswch bob un sy’n berthnasol. -reportingChange.checkYourAnswersLabel = Pa daliadau treth y gallai cael eu heffeithio gan y Cynllun Unioni Pensiynau Gwasanaeth Cyhoeddus, yn eich barn chi? -reportingChange.change.hidden = y taliadau treth y gallai cael eu heffeithio gan y Cynllun Unioni Pensiynau Gwasanaeth Cyhoeddus, yn eich barn chi +reportingChange.checkYourAnswersLabel = cy: Which tax charges do you think may have been affected by the public service pension remedy? +reportingChange.change.hidden = cy: the tax charges you think may have been affected by the public service pension remedy scottishTaxpayerFrom2016.title = A ydych chi wedi bod yn drethdalwr yn yr Alban ar unrhyw adeg o 6 Ebrill 2016 ymlaen? scottishTaxpayerFrom2016.heading = A ydych chi wedi bod yn drethdalwr yn yr Alban ar unrhyw adeg o 6 Ebrill 2016 ymlaen? @@ -163,9 +163,9 @@ whichYearsScottishTaxpayer.2020 = 6 Ebrill 2019 i 5 Ebrill 2020 whichYearsScottishTaxpayer.2019 = 6 Ebrill 2018 i 5 Ebrill 2019 whichYearsScottishTaxpayer.2018 = 6 Ebrill 2017 i 5 Ebrill 2018 whichYearsScottishTaxpayer.2017 = 6 Ebrill 2016 i 5 Ebrill 2017 -whichYearsScottishTaxpayer.checkYourAnswersLabel = Blynyddoedd treth yr oeddech yn drethdalwr yn yr Alban +whichYearsScottishTaxpayer.checkYourAnswersLabel = Pa flynyddoedd treth oeddech chi’n drethdalwr yn yr Alban? whichYearsScottishTaxpayer.error.required = Dewiswch pa flynyddoedd treth yr oeddech yn drethdalwr yn yr Alban -whichYearsScottishTaxpayer.change.hidden = Pa flynyddoedd treth oeddech chi’n drethdalwr yn yr Alban? +whichYearsScottishTaxpayer.change.hidden = cy: which tax years were you a Scottish taxpayer payingPublicPensionScheme.title = Ydych chi wedi parhau i dalu i mewn neu gynyddu eich cynllun pensiwn gwasanaeth cyhoeddus ar ôl 5 Ebrill 2022? payingPublicPensionScheme.heading = Ydych chi wedi parhau i dalu i mewn neu gynyddu eich cynllun pensiwn gwasanaeth cyhoeddus ar ôl 5 Ebrill 2022? @@ -188,7 +188,7 @@ stopPayingPublicPension.change.hidden = y dyddiad y gwnaethoch roi’r gorau i d definedContributionPensionScheme.title = A oes gennych chi unrhyw gynlluniau pensiwn eraill heblaw am eich cynlluniau gwasanaeth cyhoeddus? definedContributionPensionScheme.heading = A oes gennych chi unrhyw gynlluniau pensiwn eraill heblaw am eich cynlluniau gwasanaeth cyhoeddus? -definedContributionPensionScheme.checkYourAnswersLabel = A oes gennych chi gynllun pensiwn cyfraniadau diffiniedig? +definedContributionPensionScheme.checkYourAnswersLabel = A oes gennych chi unrhyw gynlluniau pensiwn eraill heblaw am eich cynlluniau gwasanaeth cyhoeddus? definedContributionPensionScheme.message = Fel arfer, bydd y rhain naill ai’n bensiynau personol neu’n bensiynau rhanddeiliaid. Weithiau, fe’u gelwir yn gynlluniau pensiwn ‘pryniannau arian’. Gallant fod: definedContributionPensionScheme.bullet1 = yn bensiynau gweithle a drefnir gan eich cyflogwr definedContributionPensionScheme.bullet2 = yn bensiynau preifat a drefnir gennych chi @@ -207,7 +207,7 @@ flexiblyAccessedPension.change.hidden = os ydych wedi cyrchu eich pensiwn cyfran flexibleAccessStartDate.title = Pryd gwnaethoch chi gyrchu’ch pensiwn cyfraniadau diffiniedig yn hyblyg am y tro cyntaf? flexibleAccessStartDate.heading = Pryd gwnaethoch chi gyrchu’ch pensiwn cyfraniadau diffiniedig yn hyblyg am y tro cyntaf? -flexibleAccessStartDate.checkYourAnswersLabel = Dyddiad y gwnaethoch gyrchu pensiwn cyfraniadau diffiniedig yn hyblyg am y tro cyntaf +flexibleAccessStartDate.checkYourAnswersLabel = Pryd gwnaethoch chi gyrchu’ch pensiwn cyfraniadau diffiniedig yn hyblyg am y tro cyntaf? flexibleAccessStartDate.hint1 = Mae hwn i’w weld ar eich datganiad cyrchu’n hyblyg. flexibleAccessStartDate.hint2 = Er enghraifft, 25 2 2015 flexibleAccessStartDate.change.hidden = dyddiad y gwnaethoch gyrchu eich pensiwn cyfraniadau diffiniedig yn hyblyg am y tro cyntaf @@ -240,11 +240,11 @@ pIAPreRemedy.message1 = Eich swm mewnbwn pensiwn yw’r cynnydd neu’r twf yng pIAPreRemedy.message2 = Gallwch ddod o hyd i’r wybodaeth hon ar eich datganiad cynilion pensiwn wedi’i ddiwygio neu’ch datganiad cynilion pensiwn wedi’i unioni. pIAPreRemedy.hint = Mae’n rhaid talgrynnu symiau i lawr i’r bunt agosaf, er enghraifft 2300 -pIAPreRemedy.checkYourAnswersLabel.2011 = Swm talu i mewn i bensiwn o 6 Ebrill 2010 i 5 Ebrill 2011 -pIAPreRemedy.checkYourAnswersLabel.2012 = Swm talu i mewn i bensiwn o 6 Ebrill 2011 i 5 Ebrill 2012 -pIAPreRemedy.checkYourAnswersLabel.2013 = Swm talu i mewn i bensiwn o 6 Ebrill 2012 i 5 Ebrill 2013 -pIAPreRemedy.checkYourAnswersLabel.2014 = Swm talu i mewn i bensiwn o 6 Ebrill 2013 i 5 Ebrill 2014 -pIAPreRemedy.checkYourAnswersLabel.2015 = Swm talu i mewn i bensiwn o 6 Ebrill 2014 i 5 Ebrill 2015 +pIAPreRemedy.checkYourAnswersLabel.2011 = Beth oedd eich swm talu i mewn i bensiwn o 6 Ebrill 2010 i 5 Ebrill 2011? +pIAPreRemedy.checkYourAnswersLabel.2012 = Beth oedd eich swm talu i mewn i bensiwn o 6 Ebrill 2011 i 5 Ebrill 2012? +pIAPreRemedy.checkYourAnswersLabel.2013 = Beth oedd eich swm talu i mewn i bensiwn o 6 Ebrill 2012 i 5 Ebrill 2013? +pIAPreRemedy.checkYourAnswersLabel.2014 = Beth oedd eich swm talu i mewn i bensiwn o 6 Ebrill 2013 i 5 Ebrill 2014? +pIAPreRemedy.checkYourAnswersLabel.2015 = Beth oedd eich swm talu i mewn i bensiwn o 6 Ebrill 2014 i 5 Ebrill 2015? pIAPreRemedy.error.required.2011 = Nodwch eich swm talu i mewn i bensiwn o 6 Ebrill 2010 i 5 Ebrill 2011 pIAPreRemedy.error.required.2012 = Nodwch eich swm talu i mewn i bensiwn o 6 Ebrill 2011 i 5 Ebrill 2012 pIAPreRemedy.error.required.2013 = Nodwch eich swm talu i mewn i bensiwn o 6 Ebrill 2012 i 5 Ebrill 2013 @@ -538,18 +538,18 @@ whichScheme.heading = Pa gynllun ydych chi’n nodi manylion ar ei gyfer? whichScheme.hint = Dewiswch o’r opsiynau isod neu nodwch gynllun newydd. whichScheme.error.required = Dewiswch pa gynllun dalodd y tâl neu ychwanegwch un newydd -whoPaidAACharge.title = Pwy sydd wedi talu’r tâl treth lwfans blynyddol ar gyfer {0}? +whoPaidAACharge.title = Pwy sydd wedi talu’r tâl treth lwfans blynyddol ar gyfer {0} rhwng {1}? whoPaidAACharge.heading = Pwy sydd wedi talu’r tâl treth lwfans blynyddol ar gyfer {0} rhwng {1}? whoPaidAACharge.you = Chi whoPaidAACharge.scheme = Cynllun pensiwn whoPaidAACharge.both = Y ddau whoPaidAACharge.error.required = Dewiswch pwy sydd wedi talu tâl treth lwfans blynyddol ar gyfer {0} rhwng {1} -whoPaidAACharge.change.hidden = Pwy sydd wedi talu’r tâl treth lwfans blynyddol ar gyfer {0} -whoPaidAACharge.checkYourAnswersLabel = Pwy sydd wedi talu’r tâl treth lwfans blynyddol ar gyfer {0}? +whoPaidAACharge.change.hidden = Pwy sydd wedi talu’r tâl treth lwfans blynyddol ar gyfer {0} rhwng {1} +whoPaidAACharge.checkYourAnswersLabel = Pwy sydd wedi talu’r tâl treth lwfans blynyddol ar gyfer {0} rhwng {1}? howMuchAAChargeSchemePaid.title = Faint o dâl treth lwfans blynyddol a dalodd eich cynllun pensiwn rhwng {0}? howMuchAAChargeSchemePaid.heading = Faint o dâl treth lwfans blynyddol a dalodd eich cynllun pensiwn {0}? -howMuchAAChargeSchemePaid.checkYourAnswersLabel = Faint o dâl treth lwfans blynyddol a dalodd eich cynllun pensiwn? +howMuchAAChargeSchemePaid.checkYourAnswersLabel = Faint o dâl treth lwfans blynyddol a dalodd eich cynllun pensiwn rhwng {0}? howMuchAAChargeSchemePaid.error.nonNumeric = Mae’n rhaid i swm y tâl treth lwfans blynyddol a dalwyd gan eich cynllun pensiwn rhwng {0} fod yn rhif cyfan howMuchAAChargeSchemePaid.error.required = Nodwch faint o dâl treth lwfans blynyddol a dalodd eich cynllun pensiwn rhwng {0} howMuchAAChargeSchemePaid.error.wholeNumber = Mae’n rhaid i swm y tâl treth lwfans blynyddol a dalwyd gan eich cynllun pensiwn rhwng {0} fod yn rhif cyfan @@ -559,7 +559,7 @@ howMuchAAChargeSchemePaid.hint = Mae’n rhaid talgrynnu symiau i lawr i’r bun howMuchAAChargeYouPaid.title = Faint o dâl treth lwfans blynyddol a dalodd eich cynllun pensiwn rhwng {0}? howMuchAAChargeYouPaid.heading = Faint o dâl treth lwfans blynyddol a dalodd eich cynllun pensiwn rhwng {0}? -howMuchAAChargeYouPaid.checkYourAnswersLabel = Faint o dâl treth lwfans blynyddol wnaethoch chi ei dalu? +howMuchAAChargeYouPaid.checkYourAnswersLabel = Faint o dâl treth lwfans blynyddol a dalodd eich cynllun pensiwn rhwng {0}? howMuchAAChargeYouPaid.error.nonNumeric = Mae’n rhaid i swm y tâl treth lwfans blynyddol a dalwyd gennych rhwng {0} gynnwys y rhifau 0 i 9 yn unig howMuchAAChargeYouPaid.error.required = Nodwch swm y tâl treth lwfans blynyddol a dalwyd gennych rhwng {0} howMuchAAChargeYouPaid.error.wholeNumber = Mae’n rhaid i swm y tâl treth lwfans blynyddol a dalwyd gennych rhwng {0} fod yn rhif cyfan @@ -594,7 +594,7 @@ otherDefinedBenefitOrContribution.error.required = Dewiswch ‘Iawn’ os ydych otherDefinedBenefitOrContribution.change.hidden = cy: if you have contributed to any other defined benefit or defined contribution scheme thresholdIncome.heading = Incwm trothwy -thresholdIncome.title = Incwm trothwy +thresholdIncome.title = cy: Threshold income - Annual allowance from {0} thresholdIncome.message1 = Mae eich incwm trothwy yn cynnwys incwm trethadwy rydych chi’n ei gael, megis enillion a buddsoddiadau ond nid yw’n cynnwys cyfraniadau pensiwn. thresholdIncome.message2 = Dysgwch ragor am incwm trothwy thresholdIncome.subHeading1 = Sut i gyfrifo’ch incwm trothwy @@ -675,7 +675,7 @@ adjustedIncome.error.outOfRange = Mae’n rhaid i’ch incwm wedi’i addasu o { adjustedIncome.change.hidden = Eich incwm wedi’i addasu o {0} totalIncome.caption = Incwm trethadwy o ran y lwfans blynyddol -totalIncome.title = Beth oedd eich incwm trethadwy o {0}? +totalIncome.title = Taxable income - Annual allowance from {0} totalIncome.heading1 = Incwm trethadwy totalIncome.heading2 = Beth oedd eich incwm trethadwy o {0}? totalIncome.message1 = Mae incwm trethadwy yn cynnwys unrhyw fath o incwm y mae’n rhaid i chi dalu treth arno. @@ -690,7 +690,7 @@ totalIncome.bullet6 = incwm o ymddiriedolaeth totalIncome.bullet7 = llog ar gynilion dros drothwy eich lwfans cynilion totalIncome.bullet8 = incwm o gyfranddaliadau (incwm difidend) totalIncome.hint1 = Mae’n rhaid talgrynnu’r swm i lawr i’r bunt agosaf, er enghraifft 2300. -totalIncome.checkYourAnswersLabel = Incwm trethadwy o {0} +totalIncome.checkYourAnswersLabel = Beth oedd eich incwm trethadwy o {0}? totalIncome.error.nonNumeric = Mae’n rhaid i’ch incwm trethadwy o {0} gynnwys y rhifau 0 i 9 yn unig totalIncome.error.required = Nodwch eich incwm trethadwy o {0} totalIncome.error.wholeNumber = Mae’n rhaid i’ch incwm trethadwy o {0} fod yn rhif cyfan @@ -708,7 +708,7 @@ contributedToDuringRemedyPeriod.change.hidden = cynllun cyfraniadau diffiniedig definedContributionAmount.title = Beth oedd eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig o {1}? definedContributionAmount.heading = Beth oedd eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig o {0}? -definedContributionAmount.checkYourAnswersLabel = Nodwch eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig o {0}? +definedContributionAmount.checkYourAnswersLabel = Beth oedd eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig o {1}? definedContributionAmount.message1 = Dyma’r cyfanswm a delir i mewn i gynllun pensiwn cyfraniadau diffiniedig neu unrhyw gynnydd a fu ynddo mewn blwyddyn dreth. definedContributionAmount.message2 = Gall hyn gael ei wneud gennych chi neu gan rywun arall, megis eich cyflogwr. definedContributionAmount.hint1 = Mae’n rhaid talgrynnu symiau i lawr i’r bunt agosaf, er enghraifft 2300 @@ -961,13 +961,13 @@ newEnhancementType.pensionCredit = Credyd pensiwn newEnhancementType.both = Y ddau newEnhancementType.hint1 = Gwiriwch eich diogelwch lwfans oes uwch ar-lein newEnhancementType.hint2 = Dewiswch y math o ddiogelwch uwch sydd gennych o’r opsiynau isod. -newEnhancementType.checkYourAnswersLabel = Dewiswch y math newydd o ddiogelwch lwfans oes sydd gennych +newEnhancementType.checkYourAnswersLabel = Pa fath newydd o ddiogelwch lwfans oes uwch oedd gennych? newEnhancementType.error.required = Dewiswch y math newydd o ddiogelwch lwfans oes sydd gennych newEnhancementType.change.hidden = cy: which new type of lifetime allowance enhancement did you have newInternationalEnhancementReference.title = Beth yw’r cyfeirnod ar gyfer eich diogelwch lwfans oes uwch rhyngwladol newydd? newInternationalEnhancementReference.heading = Beth yw’r cyfeirnod ar gyfer eich diogelwch lwfans oes uwch rhyngwladol newydd? -newInternationalEnhancementReference.checkYourAnswersLabel = Beth yw’r cyfeirnod ar gyfer eich diogelwch lwfans oes uwch rhyngwladol newydd? +newInternationalEnhancementReference.checkYourAnswersLabel = cy: What is your new lifetime allowance international enhancement reference? newInternationalEnhancementReference.message1 = Mae eich cyfeirnod ar dystysgrif diogelwch uwch neu yn eich cyfrif treth bersonol. Gallwch hefyd fewngofnodi i Borth y Llywodraeth i’w wirio. newInternationalEnhancementReference.message2 = Gwiriwch eich diogelwch lwfans oes uwch ar-lein newInternationalEnhancementReference.hint1 = Mae gan y cyfeirnod 15 o gymeriadau ar y mwyaf. Mae’n gymysgedd o lythrennau a rhifau. @@ -1144,7 +1144,7 @@ taxRelief.error.outOfRange = Mae’n rhaid i’ch rhyddhad treth o {2} fod rhwng taxRelief.change.hidden = eich rhyddhad treth o {0} amountSalarySacrificeArrangements.title = Beth oedd swm eich trefniadau aberthu cyflog o {0}? -amountSalarySacrificeArrangements.heading = Beth oedd swm y cyflog a aberthwyd gennych o {0}? +amountSalarySacrificeArrangements.heading = Beth oedd swm eich trefniadau aberthu cyflog o {0}? amountSalarySacrificeArrangements.checkYourAnswersLabel = Beth oedd swm eich trefniadau aberthu cyflog o {0}? amountSalarySacrificeArrangements.hint = Mae’n rhaid talgrynnu’r swm i lawr i’r bunt agosaf, er enghraifft 2300 amountSalarySacrificeArrangements.error.nonNumeric = Mae’n rhaid i swm eich trefniadau aberthu cyflog o {0} gynnwys y rhifau 0 i 9 yn unig @@ -1166,7 +1166,7 @@ howMuchContributionPensionScheme.title = cy: How much did you contribute in tota howMuchContributionPensionScheme.heading = cy: How much did you contribute in total to all of your pension schemes from {0}? howMuchContributionPensionScheme.message1 = cy: You can find this information in your payslips for each job. You must also include any contributions you have made to private pensions. This is not the same as your pension input amount. howMuchContributionPensionScheme.hint = cy: Amounts must be rounded down to the nearest pound, for example 2300 -howMuchContributionPensionScheme.checkYourAnswersLabel = cy: The amount you contributed from {0}? +howMuchContributionPensionScheme.checkYourAnswersLabel = cy: How much did you contribute in total to all of your pension schemes from {0}? howMuchContributionPensionScheme.error.nonNumeric = cy: The amount you contributed must only include numbers 0 to 9 howMuchContributionPensionScheme.error.required = cy: Enter the amount you contributed in total to all of your pension schemes howMuchContributionPensionScheme.error.wholeNumber = cy: The amount you contributed must be a whole number @@ -1219,7 +1219,7 @@ lumpSumDeathBenefitsValue.error.wholeNumber = cy: Your taxable lump sum death be lumpSumDeathBenefitsValue.error.outOfRange = cy: Your taxable lump sum death benefit amount from {2} must be between £0 and £999,999,999 lumpSumDeathBenefitsValue.change.hidden = cy: your taxable lump sum death benefits from {0} -claimingTaxReliefPension.title = cy: Did you claim for income tax relief from {0}? +claimingTaxReliefPension.title = cy: Claiming income tax relief - Annual allowance from {0} claimingTaxReliefPension.heading = cy: Claiming income tax relief claimingTaxReliefPension.message1 = cy: You may have claimed income tax relief if any of the following applied to you: claimingTaxReliefPension.bullet1 = cy: you claimed tax relief for job expenses such as uniforms @@ -1228,7 +1228,7 @@ claimingTaxReliefPension.message2 = cy: You must not include any tax relief clai claimingTaxReliefPension.heading2 = cy: Did you claim for income tax relief from {0}? claimingTaxReliefPension.checkYourAnswersLabel = cy: Did you claim for income tax relief from {0}? claimingTaxReliefPension.error.required = cy: Select yes if you claimed for tax relief on your pension from {0} -claimingTaxReliefPension.change.hidden = cy: if you had claimed for income tax relief from {0} +claimingTaxReliefPension.change.hidden = cy: if you claimed for income tax relief from {0} knowAdjustedAmount.title = cy: Do you know your adjusted income amount from {0}? knowAdjustedAmount.caption = Incwm wedi’i addasu o ran y lwfans blynyddol @@ -1338,18 +1338,18 @@ didYouContributeToRASScheme.checkYourAnswersLabel = cy: Did you make any contrib didYouContributeToRASScheme.error.required = cy: Select yes if made any contributions to a relief at source pension scheme from {0} didYouContributeToRASScheme.change.hidden = cy: if you have made any contributions to a relief at source pension scheme from {0} -doYouHaveGiftAid.title = cy: Did you make any donations to charity on which you claimed tax relief from {0}? +doYouHaveGiftAid.title = cy: Gift aid donations - Annual allowance from {0} doYouHaveGiftAid.heading1 = cy: Gift aid donations doYouHaveGiftAid.heading2 = cy: Did you make any donations to charity on which you claimed tax relief from {0}? doYouHaveGiftAid.message1 = cy: Gift aid is a scheme that allows charities to claim extra money on anything you donate. doYouHaveGiftAid.message2 = cy: If you have donated money directly to a charity, you can claim back the difference between the tax you have paid on the donation and what the charity got back when you fill in your Self Assessment tax return. It is the same if you live in Scotland. doYouHaveGiftAid.message3 = cy: This only applies if you are a higher or additional rate taxpayer. doYouHaveGiftAid.message4 = cy: You can find this information on your SA100 under charitable giving. -doYouHaveGiftAid.checkYourAnswersLabel = cy: Did you make any contributions to charity via gift aid from {0}? +doYouHaveGiftAid.checkYourAnswersLabel = cy: Did you make any donations to charity on which you claimed tax relief from {0}? doYouHaveGiftAid.error.required = cy: Select yes if you made any donations to charity on which you claimed tax relief from {0} doYouHaveGiftAid.change.hidden = cy: if you made any donations to charity on which you claimed tax relief from {0} -amountOfGiftAid.title = cy: How much did you donate to charity via gift aid from {0}? +amountOfGiftAid.title = cy: How much tax relief did you claim from gift aid from {0}? amountOfGiftAid.heading = cy: How much tax relief did you claim from gift aid from {0}? amountOfGiftAid.message1 = cy: To work out how much tax relief you have claimed, you must multiply your donation by 1.25. amountOfGiftAid.message2 = cy: For example, if you made £100 of gift aid donations, you claimed £125 in tax relief. @@ -1361,7 +1361,7 @@ amountOfGiftAid.error.wholeNumber = cy: The amount of tax relief you claimed via amountOfGiftAid.error.outOfRange = cy: The amount of tax relief you claimed via gift aid from {2} must be larger than £1 and smaller than £999,999,999 amountOfGiftAid.change.hidden = cy: the amount of tax relief you claimed via gift aid from {0} -tradeUnionRelief.title = cy: Did you claim tax relief for payments to trade unions or police organisations from {0}? +tradeUnionRelief.title = cy: Payments to trade unions or police organisations - Annual allowance from {0} tradeUnionRelief.heading = cy: Payments to trade unions or police organisations tradeUnionRelief.message1 = cy: You can claim tax relief on: tradeUnionRelief.list1 = cy: professional membership fees, if you must pay the fees to be able to do your job @@ -1371,14 +1371,14 @@ tradeUnionRelief.list3 = cy: not paid yourself (for example if your employer has tradeUnionRelief.list4 = cy: paid to professional organisations that are not approved by HMRC tradeUnionRelief.message3 = cy: If you have relief, you will find it on your P87 form or self assessment. tradeUnionRelief.heading2 = cy: Did you claim tax relief for payments to trade unions or police organisations from {0}? -tradeUnionRelief.checkYourAnswersLabel = cy: Did you claim tax relief for payments to trade unions or police organisations? +tradeUnionRelief.checkYourAnswersLabel = cy: Did you claim tax relief for payments to trade unions or police organisations from {0}? tradeUnionRelief.error.required = cy: Select yes if you claimed tax relief for payments to trade unions or police organisations tradeUnionRelief.change.hidden = cy: if you claimed tax relief for payments to trade unions or police organisations from {0} unionPoliceReliefAmount.title = cy: How much tax relief are you claiming for trade union or police organisation fees from {0}? unionPoliceReliefAmount.heading = cy: How much tax relief are you claiming for trade union or police organisation fees from {0}? unionPoliceReliefAmount.message1 = cy: If you have filed for self-assessment you will find this information in your SA-100 document. -unionPoliceReliefAmount.checkYourAnswersLabel = cy: Amount of tax relief you are claiming for trade union or police organisation fees +unionPoliceReliefAmount.checkYourAnswersLabel = cy: How much tax relief are you claiming for trade union or police organisation fees from {0}? unionPoliceReliefAmount.message2 = cy: If you claimed tax relief but you did not file for self assessment, you will find the amount you claimed on your P87 form for that year. unionPoliceReliefAmount.error.nonNumeric = cy: The tax relief you are claiming for trade union or police organisation fees must only include numbers 0 to 9 unionPoliceReliefAmount.error.required = cy: Enter the amount of tax relief you are claiming for trade union or police organisation fees from {0} @@ -1386,18 +1386,18 @@ unionPoliceReliefAmount.error.wholeNumber = cy: The tax relief you are claiming unionPoliceReliefAmount.error.outOfRange = cy: The tax relief you are claiming for trade union or police organisation fees from {2} must be between £1 and £100 unionPoliceReliefAmount.change.hidden = cy: amount of tax relief you are claiming for trade union or police organisation fees from {0} -affectedByRemedy.title = cy: Are you affected by the Public Service Pensions remedy? +affectedByRemedy.title = cy: Public service pensions remedy affectedByRemedy.heading1 = cy: Public Service Pensions Remedy affectedByRemedy.message1 = cy: You are impacted by the Public Service Pensions remedy if you joined a public service pension scheme on or before 31 March 2012 and: affectedByRemedy.bullet1 = cy: you worked in public service between 1 April 2015 and the 31 March 2022, or affectedByRemedy.bullet2 = cy: you left service after 31 March 2012 and returned within 5 years affectedByRemedy.message3 = cy: Find out more about the Public Service Pensions remedy affectedByRemedy.heading2 = cy: Are you affected by the Public Service Pensions remedy? -affectedByRemedy.checkYourAnswersLabel = cy: Were you affected by the Public Service Pensions Remedy? +affectedByRemedy.checkYourAnswersLabel = cy: Are you affected by the public service pensions remedy? affectedByRemedy.error.required = cy: Select yes if you were affected by the Public Service Pensions Remedy affectedByRemedy.change.hidden = cy: if you are affected by the Public Service Pensions Remedy -previousLTACharge.title = cy: Have you paid an LTA charge? +previousLTACharge.title = cy: Lifetime allowance tax charge - Lifetime allowance from 6 April 2015 to 5 April 2022 previousLTACharge.heading = cy: Lifetime allowance tax charge previousLTACharge.message1 = cy: The Lifetime allowance (LTA) is the total amount of money that you can put into UK registered pension schemes before being liable for a tax charge. previousLTACharge.message2 = cy: The standard lifetime allowance was £1,073,100. This was abolished from 6 April 2023. @@ -1406,13 +1406,13 @@ previousLTACharge.checkYourAnswersLabel = cy: Have you paid a lifetime allowance previousLTACharge.error.required = cy: Select yes if you paid a lifetime allowance tax charge in any tax year from 6 April 2015 to 5 April 2023? previousLTACharge.change.hidden = cy: if you paid a lifetime allowance tax charge in any tax year from 6 April 2015 to 5 April 2023 -pensionProtectedMember.title = cy: Are you a protected member +pensionProtectedMember.title = cy: Protected members - Annual allowance pensionProtectedMember.heading = cy: Protected members pensionProtectedMember.message1 = cy: Protected members did not move from their old (legacy) pension schemes to the new (reform) scheme during the remedy period. pensionProtectedMember.message2 = cy: You could only join the reform scheme on 1 April 2022. pensionProtectedMember.link = cy: Find out more information about protected members pensionProtectedMember.heading2 = cy: Are you a protected member of your public service pension scheme? -pensionProtectedMember.checkYourAnswersLabel = cy: Are you a protected member? +pensionProtectedMember.checkYourAnswersLabel = cy: Are you a protected member of your public service pension scheme? pensionProtectedMember.error.required = cy: Select yes if you were a protected member of your public service pension scheme pensionProtectedMember.change.hidden = cy: if you are a protected member of your public service pension scheme diff --git a/conf/messages.en b/conf/messages.en index 51927f574..58cb0bbfe 100644 --- a/conf/messages.en +++ b/conf/messages.en @@ -121,7 +121,7 @@ resubmittingAdjustment.hint = Select no if this is your first time using the ser reasonForResubmission.title = Why do you want to overwrite a previous submission? reasonForResubmission.heading = Why do you want to overwrite a previous submission? -reasonForResubmission.checkYourAnswersLabel = Reason for overwriting a previous submission +reasonForResubmission.checkYourAnswersLabel = Why do you want to overwrite a previous submission? reasonForResubmission.error.required = Enter the reason you want to overwrite a previous submission reasonForResubmission.error.length = The reason you want to overwrite a previous submission must be 500 characters or fewer reasonForResubmission.change.hidden = reason for overwriting a previous submission @@ -135,16 +135,16 @@ ineligible.bullet3 = you left service after 31 March 2012 but did not return wit ineligible.bullet4 = you were not part of any legacy public service pension scheme ineligible.message2 = These reasons mean that your pension benefits will not be affected by the Public Service Pensions Remedy and you do not need to use this service. -reportingChange.title = Which tax charges would you like adjusted? -reportingChange.heading = Which tax charges do you think may have been affected by the Public Service Pension Remedy? +reportingChange.title = Which tax charges do you think may have been affected by the public service pension remedy? +reportingChange.heading = Which tax charges do you think may have been affected by the public service pension remedy? reportingChange.error.required = Select the tax charges you think may have been affected by the Public Service Pension Remedy reportingChange.annualAllowance = Annual allowance reportingChange.lifetimeAllowance = Lifetime allowance reportingChange.annualAllowance.hint = Annual allowance (AA) is the amount of money you can contribute to your pension each year without paying tax. reportingChange.lifetimeAllowance.hint = Lifetime allowance (LTA) is the total amount of money you can save in your pension over your lifetime without paying tax. reportingChange.hint = Select all that apply. -reportingChange.checkYourAnswersLabel = Which tax charges do you think may have been affected by the Public Service Pension Remedy? -reportingChange.change.hidden = the tax charges you think may have been affected by the Public Service Pension Remedy +reportingChange.checkYourAnswersLabel = Which tax charges do you think may have been affected by the public service pension remedy? +reportingChange.change.hidden = the tax charges you think may have been affected by the public service pension remedy scottishTaxpayerFrom2016.title = Were you ever a Scottish taxpayer from 6 April 2016? scottishTaxpayerFrom2016.heading = Were you ever a Scottish taxpayer from 6 April 2016? @@ -163,9 +163,9 @@ whichYearsScottishTaxpayer.2020 = 6 April 2019 to 5 April 2020 whichYearsScottishTaxpayer.2019 = 6 April 2018 to 5 April 2019 whichYearsScottishTaxpayer.2018 = 6 April 2017 to 5 April 2018 whichYearsScottishTaxpayer.2017 = 6 April 2016 to 5 April 2017 -whichYearsScottishTaxpayer.checkYourAnswersLabel = Tax years you were a Scottish taxpayer +whichYearsScottishTaxpayer.checkYourAnswersLabel = Which tax years were you a Scottish taxpayer? whichYearsScottishTaxpayer.error.required = Select which tax years you were a Scottish taxpayer -whichYearsScottishTaxpayer.change.hidden = which tax years you were a Scottish taxpayer +whichYearsScottishTaxpayer.change.hidden = which tax years were you a Scottish taxpayer payingPublicPensionScheme.title = Did you continue paying into or increasing your public service pension scheme after 5 April 2022? payingPublicPensionScheme.heading = Did you continue paying into or increasing your public service pension scheme after 5 April 2022? @@ -188,7 +188,7 @@ stopPayingPublicPension.change.hidden = the date you stopped paying into a publi definedContributionPensionScheme.title = Do you have any other pension schemes apart from your public service ones? definedContributionPensionScheme.heading = Do you have any other pension schemes apart from your public service ones? -definedContributionPensionScheme.checkYourAnswersLabel = Do you have a defined contribution pension scheme? +definedContributionPensionScheme.checkYourAnswersLabel = Do you have any other pension schemes apart from your public service ones? definedContributionPensionScheme.message = These are usually either personal or stakeholder pensions. They’re sometimes called ‘money purchase’ pension schemes. They can be: definedContributionPensionScheme.bullet1 = workplace pensions arranged by your employer definedContributionPensionScheme.bullet2 = private pensions arranged by you @@ -207,7 +207,7 @@ flexiblyAccessedPension.change.hidden = if you have flexibly accessed your defin flexibleAccessStartDate.title = When did you first flexibly access your defined contribution pension? flexibleAccessStartDate.heading = When did you first flexibly access your defined contribution pension? -flexibleAccessStartDate.checkYourAnswersLabel = Date you first flexibly accessed your defined contribution pension +flexibleAccessStartDate.checkYourAnswersLabel = When did you first flexibly access your defined contribution pension? flexibleAccessStartDate.hint1 = You can find this on your flexible access statement. flexibleAccessStartDate.hint2 = For example, 25 2 2015. flexibleAccessStartDate.change.hidden = the date you first flexibly accessed your defined contribution pension @@ -240,11 +240,11 @@ pIAPreRemedy.message1 = Your pension input amount is the increase or growth in t pIAPreRemedy.message2 = You will find this on your revised or remediable pensions saving statement. pIAPreRemedy.hint = Amounts must be rounded down to the nearest pound, for example 2300 -pIAPreRemedy.checkYourAnswersLabel.2011 = Pension input amount from 6 April 2010 to 5 April 2011 -pIAPreRemedy.checkYourAnswersLabel.2012 = Pension input amount from 6 April 2011 to 5 April 2012 -pIAPreRemedy.checkYourAnswersLabel.2013 = Pension input amount from 6 April 2012 to 5 April 2013 -pIAPreRemedy.checkYourAnswersLabel.2014 = Pension input amount from 6 April 2013 to 5 April 2014 -pIAPreRemedy.checkYourAnswersLabel.2015 = Pension input amount from 6 April 2014 to 5 April 2015 +pIAPreRemedy.checkYourAnswersLabel.2011 = What was your pension input amount from 6 April 2010 to 5 April 2011? +pIAPreRemedy.checkYourAnswersLabel.2012 = What was your pension input amount from 6 April 2011 to 5 April 2012? +pIAPreRemedy.checkYourAnswersLabel.2013 = What was your pension input amount from 6 April 2012 to 5 April 2013? +pIAPreRemedy.checkYourAnswersLabel.2014 = What was your pension input amount from 6 April 2013 to 5 April 2014? +pIAPreRemedy.checkYourAnswersLabel.2015 = What was your pension input amount from 6 April 2014 to 5 April 2015? pIAPreRemedy.error.required.2011 = Enter your pension input amount from 6 April 2010 to 5 April 2011 pIAPreRemedy.error.required.2012 = Enter your pension input amount from 6 April 2011 to 5 April 2012 pIAPreRemedy.error.required.2013 = Enter your pension input amount from 6 April 2012 to 5 April 2013 @@ -538,18 +538,18 @@ whichScheme.heading = Which scheme are you entering details for? whichScheme.hint = Select from the options below or enter a new scheme. whichScheme.error.required = Select which scheme you are entering details for or add new -whoPaidAACharge.title = Who paid the annual allowance tax charge for {1}? +whoPaidAACharge.title = Who paid the annual allowance tax charge for {0} between {1}? whoPaidAACharge.heading = Who paid the annual allowance tax charge for {0} between {1}? whoPaidAACharge.you = You whoPaidAACharge.scheme = Pension scheme whoPaidAACharge.both = Both whoPaidAACharge.error.required = Select who paid the annual allowance tax charge for {0} between {1} -whoPaidAACharge.change.hidden = who paid the annual allowance tax charge for {0} -whoPaidAACharge.checkYourAnswersLabel = Who paid the annual allowance tax charge for {0}? +whoPaidAACharge.change.hidden = who paid the annual allowance tax charge for {0} between {1} +whoPaidAACharge.checkYourAnswersLabel = Who paid the annual allowance tax charge for {0} between {1}? howMuchAAChargeSchemePaid.title = How much annual allowance tax charge did your pension scheme pay between {0}? howMuchAAChargeSchemePaid.heading = How much annual allowance tax charge did your pension scheme pay between {0}? -howMuchAAChargeSchemePaid.checkYourAnswersLabel = How much tax charge your pension scheme paid +howMuchAAChargeSchemePaid.checkYourAnswersLabel = How much annual allowance tax charge did your pension scheme pay between {0}? howMuchAAChargeSchemePaid.error.nonNumeric = The amount of annual allowance tax charge your pension scheme paid between {0} must only include numbers 0 to 9 howMuchAAChargeSchemePaid.error.required = Enter the amount of annual allowance tax charge your pension scheme paid between {0} howMuchAAChargeSchemePaid.error.wholeNumber = The amount of annual allowance tax charge your pension scheme paid between {0} must be a whole number @@ -559,7 +559,7 @@ howMuchAAChargeSchemePaid.hint = Amounts must be rounded down to the nearest pou howMuchAAChargeYouPaid.title = How much annual allowance tax charge did you pay between {0}? howMuchAAChargeYouPaid.heading = How much annual allowance tax charge did you pay between {0}? -howMuchAAChargeYouPaid.checkYourAnswersLabel = How much tax charge you paid +howMuchAAChargeYouPaid.checkYourAnswersLabel = How much annual allowance tax charge did you pay between {0}? howMuchAAChargeYouPaid.error.nonNumeric = The amount of annual allowance tax charge you paid between {0} must only include numbers 0 to 9 howMuchAAChargeYouPaid.error.required = Enter the amount of annual allowance tax charge you paid between {0} howMuchAAChargeYouPaid.error.wholeNumber = The amount of annual allowance tax charge you paid between {0} must be a whole number @@ -594,7 +594,7 @@ otherDefinedBenefitOrContribution.error.required = Select yes if you have contri otherDefinedBenefitOrContribution.change.hidden = if you have contributed to any other defined benefit or defined contribution scheme thresholdIncome.heading = Threshold income -thresholdIncome.title = Threshold income +thresholdIncome.title = Threshold income - Annual allowance from {0} thresholdIncome.message1 = Your threshold income covers taxable income you receive, such as earnings and investments but excludes pension contributions. thresholdIncome.message2 = Find out more about threshold income thresholdIncome.subHeading1 = How to work out your threshold income @@ -675,7 +675,7 @@ adjustedIncome.error.outOfRange = Your adjusted income from {2} must be £999,99 adjustedIncome.change.hidden = your adjusted income from {0} totalIncome.caption = Annual allowance taxable income -totalIncome.title = What was your taxable income from {0}? +totalIncome.title = Taxable income - Annual allowance from {0} totalIncome.heading1 = Taxable income totalIncome.heading2 = What was your taxable income from {0}? totalIncome.message1 = Taxable income covers any type of income that you must pay tax on. @@ -690,7 +690,7 @@ totalIncome.bullet6 = income from a trust totalIncome.bullet7 = interest on savings over your savings allowance totalIncome.bullet8 = income from shares (dividend income) totalIncome.hint1 = Amount must be rounded down to the nearest pound, for example 2300. -totalIncome.checkYourAnswersLabel = Taxable income from {0} +totalIncome.checkYourAnswersLabel = What was your taxable income from {0}? totalIncome.error.nonNumeric = Your taxable income from {0} must only include numbers 0 to 9 totalIncome.error.required = Enter your taxable income from {0} totalIncome.error.wholeNumber = Your taxable income from {0} must be a whole number @@ -708,7 +708,7 @@ contributedToDuringRemedyPeriod.change.hidden = annual allowance defined contrib definedContributionAmount.title = What was your pension input amount for defined contribution pension schemes between {0}? definedContributionAmount.heading = What was your pension input amount for defined contribution pension schemes between {0}? -definedContributionAmount.checkYourAnswersLabel = Pension input amount for defined contribution pension schemes between {0}? +definedContributionAmount.checkYourAnswersLabel = What was your pension input amount for defined contribution pension schemes between {0}? definedContributionAmount.message1 = This is the total amount paid into or any increase in a defined contribution pension scheme in a tax year. definedContributionAmount.message2 = This can be done by you or anyone else, such as your employer. definedContributionAmount.hint1 = Amounts must be rounded down to the nearest pound, for example 2300. @@ -961,13 +961,13 @@ newEnhancementType.pensionCredit = Pension credit newEnhancementType.both = Both newEnhancementType.hint1 = Check your lifetime allowance enhancement online newEnhancementType.hint2 = Choose your enhancement type from the options below. -newEnhancementType.checkYourAnswersLabel = Select your new lifetime allowance enhancement type +newEnhancementType.checkYourAnswersLabel = Which new type of lifetime allowance enhancement did you have? newEnhancementType.error.required = Select your new lifetime allowance enhancement type newEnhancementType.change.hidden = which new type of lifetime allowance enhancement did you have newInternationalEnhancementReference.title = What is your new lifetime allowance international enhancement reference? newInternationalEnhancementReference.heading = What is your new lifetime allowance international enhancement reference? -newInternationalEnhancementReference.checkYourAnswersLabel = What is your lifetime allowance international enhancement reference? +newInternationalEnhancementReference.checkYourAnswersLabel = What is your new lifetime allowance international enhancement reference? newInternationalEnhancementReference.message1 = Your reference is on an enhancement certificate or your personal tax account. You can also sign into Government Gateway to check. newInternationalEnhancementReference.message2 = Check your lifetime allowance enhancement online newInternationalEnhancementReference.hint1 = The reference has a maximum character limit of 15. It is a mixture of letters and numbers. @@ -1144,7 +1144,7 @@ taxRelief.error.outOfRange = Your tax relief from {2} must be between £1 and £ taxRelief.change.hidden = your tax relief from {0} amountSalarySacrificeArrangements.title = What was the amount of your salary sacrifice arrangements from {0}? -amountSalarySacrificeArrangements.heading = What was the amount of your salary sacrifice from {0}? +amountSalarySacrificeArrangements.heading = What was the amount of your salary sacrifice arrangements from {0}? amountSalarySacrificeArrangements.checkYourAnswersLabel = What was the amount of your salary sacrifice arrangements from {0}? amountSalarySacrificeArrangements.hint = Amount must be rounded down to the nearest pound, for example 2300 amountSalarySacrificeArrangements.error.nonNumeric = The amount of your salary sacrifice arrangements from {0} must only include numbers 0 to 9 @@ -1166,7 +1166,7 @@ howMuchContributionPensionScheme.title = How much did you contribute in total to howMuchContributionPensionScheme.heading = How much did you contribute in total to all of your pension schemes from {0}? howMuchContributionPensionScheme.message1 = You can find this information in your payslips for each job. You must also include any contributions you have made to private pensions. This is not the same as your pension input amount. howMuchContributionPensionScheme.hint = Amounts must be rounded down to the nearest pound, for example 2300 -howMuchContributionPensionScheme.checkYourAnswersLabel = The amount you contributed from {0}? +howMuchContributionPensionScheme.checkYourAnswersLabel = How much did you contribute in total to all of your pension schemes from {0}? howMuchContributionPensionScheme.error.nonNumeric = The amount you contributed must only include numbers 0 to 9 howMuchContributionPensionScheme.error.required = Enter the amount you contributed in total to all of your pension schemes howMuchContributionPensionScheme.error.wholeNumber = The amount you contributed must be a whole number @@ -1219,7 +1219,7 @@ lumpSumDeathBenefitsValue.error.wholeNumber = Your taxable lump sum death benefi lumpSumDeathBenefitsValue.error.outOfRange = Your taxable lump sum death benefit amount from {2} must be between £0 and £999,999,999 lumpSumDeathBenefitsValue.change.hidden = your taxable lump sum death benefits from {0} -claimingTaxReliefPension.title = Did you claim for income tax relief from {0}? +claimingTaxReliefPension.title = Claiming income tax relief - Annual allowance from {0} claimingTaxReliefPension.heading = Claiming income tax relief claimingTaxReliefPension.message1 = You may have claimed income tax relief if any of the following applied to you: claimingTaxReliefPension.bullet1 = you claimed tax relief for job expenses such as uniforms @@ -1228,7 +1228,7 @@ claimingTaxReliefPension.message2 = You must not include any tax relief claimed claimingTaxReliefPension.heading2 = Did you claim for income tax relief from {0}? claimingTaxReliefPension.checkYourAnswersLabel = Did you claim for income tax relief from {0}? claimingTaxReliefPension.error.required = Select yes if you claimed for tax relief on your pension from {0} -claimingTaxReliefPension.change.hidden = if you had claimed for income tax relief from {0} +claimingTaxReliefPension.change.hidden = if you claimed for income tax relief from {0} knowAdjustedAmount.title = Do you know your adjusted income amount from {0}? knowAdjustedAmount.caption = Annual allowance adjusted income @@ -1338,18 +1338,18 @@ didYouContributeToRASScheme.checkYourAnswersLabel = Did you make any contributio didYouContributeToRASScheme.error.required = Select yes if made any contributions to a relief at source pension scheme from {0} didYouContributeToRASScheme.change.hidden = if you have made any contributions to a relief at source pension scheme from {0} -doYouHaveGiftAid.title = Did you make any donations to charity on which you claimed tax relief from {0}? +doYouHaveGiftAid.title = Gift aid donations - Annual allowance from {0} doYouHaveGiftAid.heading1 = Gift aid donations doYouHaveGiftAid.heading2 = Did you make any donations to charity on which you claimed tax relief from {0}? doYouHaveGiftAid.message1 = Gift aid is a scheme that allows charities to claim extra money on anything you donate. doYouHaveGiftAid.message2 = If you have donated money directly to a charity, you can claim back the difference between the tax you have paid on the donation and what the charity got back when you fill in your Self Assessment tax return. It is the same if you live in Scotland. doYouHaveGiftAid.message3 = This only applies if you are a higher or additional rate taxpayer. doYouHaveGiftAid.message4 = You can find this information on your SA100 under charitable giving. -doYouHaveGiftAid.checkYourAnswersLabel = Did you make any contributions to charity via gift aid from {0}? +doYouHaveGiftAid.checkYourAnswersLabel = Did you make any donations to charity on which you claimed tax relief from {0}? doYouHaveGiftAid.error.required = Select yes if you made any donations to charity on which you claimed tax relief from {0} doYouHaveGiftAid.change.hidden = if you made any donations to charity on which you claimed tax relief from {0} -amountOfGiftAid.title = How much did you donate to charity via gift aid from {0}? +amountOfGiftAid.title = How much tax relief did you claim from gift aid from {0}? amountOfGiftAid.heading = How much tax relief did you claim from gift aid from {0}? amountOfGiftAid.message1 = To work out how much tax relief you have claimed, you must multiply your donation by 1.25. amountOfGiftAid.message2 = For example, if you made £100 of gift aid donations, you claimed £125 in tax relief. @@ -1361,7 +1361,7 @@ amountOfGiftAid.error.wholeNumber = The amount of tax relief you claimed via gif amountOfGiftAid.error.outOfRange = The amount of tax relief you claimed via gift aid from {2} must be larger than £1 and smaller than £999,999,999 amountOfGiftAid.change.hidden = the amount of tax relief you claimed via gift aid from {0} -tradeUnionRelief.title = Did you claim tax relief for payments to trade unions or police organisations from {0}? +tradeUnionRelief.title = Payments to trade unions or police organisations - Annual allowance from {0} tradeUnionRelief.heading = Payments to trade unions or police organisations tradeUnionRelief.message1 = You can claim tax relief on: tradeUnionRelief.list1 = professional membership fees, if you must pay the fees to be able to do your job @@ -1371,14 +1371,14 @@ tradeUnionRelief.list3 = not paid yourself (for example if your employer has pai tradeUnionRelief.list4 = paid to professional organisations that are not approved by HMRC tradeUnionRelief.message3 = If you have relief, you will find it on your P87 form or self assessment. tradeUnionRelief.heading2 = Did you claim tax relief for payments to trade unions or police organisations from {0}? -tradeUnionRelief.checkYourAnswersLabel = Did you claim tax relief for payments to trade unions or police organisations? +tradeUnionRelief.checkYourAnswersLabel = Did you claim tax relief for payments to trade unions or police organisations from {0}? tradeUnionRelief.error.required = Select yes if you claimed tax relief for payments to trade unions or police organisations tradeUnionRelief.change.hidden = if you claimed tax relief for payments to trade unions or police organisations from {0} unionPoliceReliefAmount.title = How much tax relief are you claiming for trade union or police organisation fees from {0}? unionPoliceReliefAmount.heading = How much tax relief are you claiming for trade union or police organisation fees from {0}? unionPoliceReliefAmount.message1 = If you have filed for self-assessment you will find this information in your SA-100 document. -unionPoliceReliefAmount.checkYourAnswersLabel = Amount of tax relief you are claiming for trade union or police organisation fees +unionPoliceReliefAmount.checkYourAnswersLabel = How much tax relief are you claiming for trade union or police organisation fees from {0}? unionPoliceReliefAmount.message2 = If you claimed tax relief but you did not file for self assessment, you will find the amount you claimed on your P87 form for that year. unionPoliceReliefAmount.error.nonNumeric = The tax relief you are claiming for trade union or police organisation fees must only include numbers 0 to 9 unionPoliceReliefAmount.error.required = Enter the amount of tax relief you are claiming for trade union or police organisation fees from {0} @@ -1386,18 +1386,18 @@ unionPoliceReliefAmount.error.wholeNumber = The tax relief you are claiming for unionPoliceReliefAmount.error.outOfRange = The tax relief you are claiming for trade union or police organisation fees from {2} must be between £1 and £100 unionPoliceReliefAmount.change.hidden = amount of tax relief you are claiming for trade union or police organisation fees from {0} -affectedByRemedy.title = Are you affected by the Public Service Pensions remedy? +affectedByRemedy.title = Public service pensions remedy affectedByRemedy.heading1 = Public Service Pensions Remedy affectedByRemedy.message1 = You are impacted by the Public Service Pensions remedy if you joined a public service pension scheme on or before 31 March 2012 and: affectedByRemedy.bullet1 = you worked in public service between 1 April 2015 and the 31 March 2022, or affectedByRemedy.bullet2 = you left service after 31 March 2012 and returned within 5 years affectedByRemedy.message3 = Find out more about the Public Service Pensions remedy affectedByRemedy.heading2 = Are you affected by the Public Service Pensions remedy? -affectedByRemedy.checkYourAnswersLabel = Were you affected by the Public Service Pensions Remedy? +affectedByRemedy.checkYourAnswersLabel = Are you affected by the public service pensions remedy? affectedByRemedy.error.required = Select yes if you were affected by the Public Service Pensions Remedy affectedByRemedy.change.hidden = if you are affected by the Public Service Pensions Remedy -previousLTACharge.title = Have you paid an LTA charge? +previousLTACharge.title = Lifetime allowance tax charge - Lifetime allowance from 6 April 2015 to 5 April 2022 previousLTACharge.heading = Lifetime allowance tax charge previousLTACharge.message1 = The Lifetime allowance (LTA) is the total amount of money that you can put into UK registered pension schemes before being liable for a tax charge. previousLTACharge.message2 = The standard lifetime allowance was £1,073,100. This was abolished from 6 April 2023. @@ -1406,13 +1406,13 @@ previousLTACharge.checkYourAnswersLabel = Have you paid a lifetime allowance tax previousLTACharge.error.required = Select yes if you paid a lifetime allowance tax charge in any tax year from 6 April 2015 to 5 April 2023? previousLTACharge.change.hidden = if you paid a lifetime allowance tax charge in any tax year from 6 April 2015 to 5 April 2023 -pensionProtectedMember.title = Are you a protected member +pensionProtectedMember.title = Protected members - Annual allowance pensionProtectedMember.heading = Protected members pensionProtectedMember.message1 = Protected members did not move from their old (legacy) pension schemes to the new (reform) scheme during the remedy period. pensionProtectedMember.message2 = You could only join the reform scheme on 1 April 2022. pensionProtectedMember.link = Find out more information about protected members pensionProtectedMember.heading2 = Are you a protected member of your public service pension scheme? -pensionProtectedMember.checkYourAnswersLabel = Are you a protected member? +pensionProtectedMember.checkYourAnswersLabel = Are you a protected member of your public service pension scheme? pensionProtectedMember.error.required = Select yes if you were a protected member of your public service pension scheme pensionProtectedMember.change.hidden = if you are a protected member of your public service pension scheme diff --git a/test/controllers/annualallowance/taxyear/ThresholdIncomeControllerSpec.scala b/test/controllers/annualallowance/taxyear/ThresholdIncomeControllerSpec.scala index af80347a5..69de53d0c 100644 --- a/test/controllers/annualallowance/taxyear/ThresholdIncomeControllerSpec.scala +++ b/test/controllers/annualallowance/taxyear/ThresholdIncomeControllerSpec.scala @@ -67,7 +67,8 @@ class ThresholdIncomeControllerSpec extends SpecBase with MockitoSugar { contentAsString(result) mustEqual view( form, NormalMode, - Period._2013 + Period._2013, + "6 April 2012 and 5 April 2013" )(request, messages(application)).toString } } @@ -95,7 +96,8 @@ class ThresholdIncomeControllerSpec extends SpecBase with MockitoSugar { contentAsString(result) mustEqual view( form.fill(ThresholdIncome.Yes), NormalMode, - Period._2013 + Period._2013, + "6 April 2012 and 5 April 2013" )(request, messages(application)).toString } } @@ -141,7 +143,8 @@ class ThresholdIncomeControllerSpec extends SpecBase with MockitoSugar { contentAsString(result) mustEqual view( boundForm, NormalMode, - Period._2013 + Period._2013, + "6 April 2012 and 5 April 2013" )(request, messages(application)).toString } }