Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MCSC-1281 Incorrect error messages for Defined Contribution and Defin… #407

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions conf/messages.cy
Original file line number Diff line number Diff line change
Expand Up @@ -1038,9 +1038,9 @@ definedBenefit2016PreAmount.heading = Beth oedd eich swm talu i mewn i bensiwn a
definedBenefit2016PreAmount.checkYourAnswersLabel = Beth oedd eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn buddiannau diffiniedig rhwng 6 Ebrill a 8 Gorffennaf?
definedBenefit2016PreAmount.message1 = Dyma’r cyfanswm a delir i mewn i gynllun pensiwn buddiannau diffiniedig neu unrhyw gynnydd a fu ynddo mewn blwyddyn dreth.
definedBenefit2016PreAmount.hint1 = Mae’n rhaid talgrynnu symiau i lawr i’r bunt agosaf, er enghraifft 2300
definedBenefit2016PreAmount.error.nonNumeric = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn buddiannau diffiniedig rhwng 6 Ebrill a 8 Gorffennaf gynnwys y rhifau 0 i 9 yn unig
definedBenefit2016PreAmount.error.required = Nodwch eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn buddiannau diffiniedig diffiniedig rhwng 6 Ebrill a 8 Gorffennaf
definedBenefit2016PreAmount.error.wholeNumber = Mae’n rhaid i’ch swm mewnbwn pensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng 6 Ebrill 2015 ac 8 Gorffennaf 2015 fod yn rhif cyfan
definedBenefit2016PreAmount.error.nonNumeric = cy: Your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015 must only include numbers 0 to 9
definedBenefit2016PreAmount.error.required = cy: Enter your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015
definedBenefit2016PreAmount.error.wholeNumber = cy: Your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015 must be a whole number
definedBenefit2016PreAmount.error.maximum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn buddiannau diffiniedig rhwng 6 Ebrill a 8 Gorffennaf fod yn £999,999,999 neu lai
definedBenefit2016PreAmount.error.minimum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn buddiannau diffiniedig rhwng 6 Ebrill a 8 Gorffennaf fod yn £0 neu fwy
definedBenefit2016PreAmount.change.hidden = eich swm mewnbwn pensiwn ar gyfer cynlluniau pensiwn buddiannau diffiniedig rhwng 6 Ebrill 2015 a 8 Gorffennaf 2015
Expand All @@ -1066,6 +1066,7 @@ definedContribution2016PreAmount.hint1 = Mae’n rhaid talgrynnu symiau i lawr i
definedContribution2016PreAmount.checkYourAnswersLabel = Beth oedd eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}?
definedContribution2016PreAmount.error.nonNumeric = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0} gynnwys y rhifau 0 i 9 yn unig
definedContribution2016PreAmount.error.required = Nodwch eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}
definedContribution2016PreAmount.error.wholeNumber = cy: Your pension input amount for defined contribution pension schemes between {0} must be a whole number
definedContribution2016PreAmount.error.maximum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {1} fod yn £999,999,999 neu lai
definedContribution2016PreAmount.error.minimum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {1} fod yn £0 neu fwy
definedContribution2016PreAmount.change.hidden = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}
Expand All @@ -1079,6 +1080,7 @@ definedContribution2016PostAmount.hint1 = Mae’n rhaid talgrynnu symiau i lawr
definedContribution2016PostAmount.checkYourAnswersLabel = Beth oedd eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}?
definedContribution2016PostAmount.error.nonNumeric = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0} gynnwys y rhifau 0 i 9 yn unig
definedContribution2016PostAmount.error.required = Nodwch eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}
definedContribution2016PostAmount.error.wholeNumber = cy: Your pension input amount for defined contribution schemes between {0} must be a whole number
definedContribution2016PostAmount.error.maximum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {1} fod yn £999,999,999 neu lai
definedContribution2016PostAmount.error.minimum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {1} fod yn £0 neu fwy
definedContribution2016PostAmount.change.hidden = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}
Expand All @@ -1092,6 +1094,7 @@ definedContribution2016PreFlexiAmount.hint1 = Mae’n rhaid talgrynnu symiau i l
definedContribution2016PreFlexiAmount.checkYourAnswersLabel = Beth oedd eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}?
definedContribution2016PreFlexiAmount.error.nonNumeric = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0} gynnwys y rhifau 0 i 9 yn unig
definedContribution2016PreFlexiAmount.error.required = Nodwch eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}
definedContribution2016PreFlexiAmount.error.wholeNumber = cy: Your pension input amount for defined contribution pension schemes between {0} must be a whole number
definedContribution2016PreFlexiAmount.error.maximum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {1} fod yn £999,999,999 neu lai
definedContribution2016PreFlexiAmount.error.minimum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {1} fod yn £0 neu fwy
definedContribution2016PreFlexiAmount.change.hidden = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}
Expand All @@ -1105,6 +1108,7 @@ definedContribution2016PostFlexiAmount.hint1 = Mae’n rhaid talgrynnu symiau i
definedContribution2016PostFlexiAmount.checkYourAnswersLabel = Beth oedd eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}?
definedContribution2016PostFlexiAmount.error.nonNumeric = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0} gynnwys y rhifau 0 i 9 yn unig
definedContribution2016PostFlexiAmount.error.required = Nodwch eich swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}
definedContribution2016PostFlexiAmount.error.wholeNumber = cy: Your pension input amount for defined contribution schemes between {0} must be a whole number
definedContribution2016PostFlexiAmount.error.maximum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {1} fod yn £999,999,999 neu lai
definedContribution2016PostFlexiAmount.error.minimum = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {1} fod yn £0 neu fwy
definedContribution2016PostFlexiAmount.change.hidden = Mae’n rhaid i’ch swm talu i mewn i bensiwn ar gyfer cynlluniau pensiwn cyfraniadau diffiniedig rhwng {0}
Expand Down
10 changes: 7 additions & 3 deletions conf/messages.en
Original file line number Diff line number Diff line change
Expand Up @@ -1038,9 +1038,9 @@ definedBenefit2016PreAmount.heading = What was your pension input amount for def
definedBenefit2016PreAmount.checkYourAnswersLabel = What was your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015?
definedBenefit2016PreAmount.message1 = This is the total amount paid into or any increase in a defined benefit pension scheme in a tax year.
definedBenefit2016PreAmount.hint1 = Amounts must be rounded down to the nearest pound, for example 2300
definedBenefit2016PreAmount.error.nonNumeric = Your pension input amount for defined contribution pension schemes between 6 April 2015 and 8 July 2015 must only include numbers 0 to 9
definedBenefit2016PreAmount.error.required = Enter your pension input amount for defined contribution pension schemes between 6 April 2015 and 8 July 2015
definedBenefit2016PreAmount.error.wholeNumber = Your pension input amount for defined contribution pension schemes between 6 April 2015 and 8 July 2015 must be a whole number
definedBenefit2016PreAmount.error.nonNumeric = Your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015 must only include numbers 0 to 9
definedBenefit2016PreAmount.error.required = Enter your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015
definedBenefit2016PreAmount.error.wholeNumber = Your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015 must be a whole number
definedBenefit2016PreAmount.error.maximum = Your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015 must be £999,999,999 or less
definedBenefit2016PreAmount.error.minimum = Your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015 must be £0 or more
definedBenefit2016PreAmount.change.hidden = your pension input amount for defined benefit pension schemes between 6 April 2015 and 8 July 2015
Expand All @@ -1066,6 +1066,7 @@ definedContribution2016PreAmount.hint1 = Amounts must be rounded down to the nea
definedContribution2016PreAmount.checkYourAnswersLabel = What was your pension input amount for defined contribution pension schemes between {0}?
definedContribution2016PreAmount.error.nonNumeric = Your pension input amount for defined contribution pension schemes between {0} must only include numbers 0 to 9
definedContribution2016PreAmount.error.required = Enter your pension input amount for defined contribution pension schemes between {0}
definedContribution2016PreAmount.error.wholeNumber = Your pension input amount for defined contribution pension schemes between {0} must be a whole number
definedContribution2016PreAmount.error.maximum = Your pension input amount for defined contribution pension schemes between {1} must be £999,999,999 or less
definedContribution2016PreAmount.error.minimum = Your pension input amount for defined contribution pension schemes between {1} must be £0 or more
definedContribution2016PreAmount.change.hidden = your pension input amount for defined contribution pension schemes between {0}
Expand All @@ -1079,6 +1080,7 @@ definedContribution2016PostAmount.hint1 = Amounts must be rounded down to the ne
definedContribution2016PostAmount.checkYourAnswersLabel = What was your pension input amount for defined contribution pension schemes between {0}?
definedContribution2016PostAmount.error.nonNumeric = Your pension input amount for defined contribution pension schemes between {0} must only include numbers 0 to 9
definedContribution2016PostAmount.error.required = Enter your pension input amount for defined contribution pension schemes between {0}
definedContribution2016PostAmount.error.wholeNumber = Your pension input amount for defined contribution schemes between {0} must be a whole number
definedContribution2016PostAmount.error.maximum = Your pension input amount for defined contribution pension schemes between {1} must be £999,999,999 or less
definedContribution2016PostAmount.error.minimum = Your pension input amount for defined contribution pension schemes between {1} must be £0 or more
definedContribution2016PostAmount.change.hidden = your pension input amount for defined contribution pension schemes between {0}
Expand All @@ -1092,6 +1094,7 @@ definedContribution2016PreFlexiAmount.hint1 = Amounts must be rounded down to th
definedContribution2016PreFlexiAmount.checkYourAnswersLabel = What was your pension input amount for defined contribution pension schemes between {0}?
definedContribution2016PreFlexiAmount.error.nonNumeric = Your pension input amount for defined contribution pension schemes between {0} must only include numbers 0 to 9
definedContribution2016PreFlexiAmount.error.required = Enter your pension input amount for defined contribution pension schemes between {0}
definedContribution2016PreFlexiAmount.error.wholeNumber = Your pension input amount for defined contribution pension schemes between {0} must be a whole number
definedContribution2016PreFlexiAmount.error.maximum = Your pension input amount for defined contribution pension schemes between {1} must be £999,999,999 or less
definedContribution2016PreFlexiAmount.error.minimum = Your pension input amount for defined contribution pension schemes between {1} must be £0 or more
definedContribution2016PreFlexiAmount.change.hidden = your pension input amount for defined contribution pension schemes between {0}
Expand All @@ -1105,6 +1108,7 @@ definedContribution2016PostFlexiAmount.hint1 = Amounts must be rounded down to t
definedContribution2016PostFlexiAmount.checkYourAnswersLabel = What was your pension input amount for defined contribution pension schemes between {0}?
definedContribution2016PostFlexiAmount.error.nonNumeric = Your pension input amount for defined contribution pension schemes between {0} must only include numbers 0 to 9
definedContribution2016PostFlexiAmount.error.required = Enter your pension input amount for defined contribution pension schemes between {0}
definedContribution2016PostFlexiAmount.error.wholeNumber = Your pension input amount for defined contribution schemes between {0} must be a whole number
definedContribution2016PostFlexiAmount.error.maximum = Your pension input amount for defined contribution pension schemes between {1} must be £999,999,999 or less
definedContribution2016PostFlexiAmount.error.minimum = Your pension input amount for defined contribution pension schemes between {1} must be £0 or more
definedContribution2016PostFlexiAmount.change.hidden = your pension input amount for defined contribution pension schemes between {0}
Expand Down