Merge 8a7977e into 4c68280

ministryofjustice · Dec 3, 2024 · 2b02f78 · 2b02f78
2 parents 4c68280 + 8a7977e
commit 2b02f78
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/lang/cy.json b/lang/cy.json
@@ -393,8 +393,9 @@
     "jointlyAndSeverallyMixedHintReplacementAttorneysExample:property-and-affairs": "Er enghraifft, gallech ddweud bod rhaid i’ch holl atwrneiod wrth gefn gytuno â’i gilydd os ydynt am werthu’ch tŷ, ond eu bod yn gallu gwneud penderfyniadau eraill ar wahân i’w gilydd.",
     "jointlyAndSeverallyMixedHintReplacementAttorneysExample:personal-welfare": "Er enghraifft, gallech ddweud bod rhaid i’ch holl atwrneiod wrth gefn gytuno â’i gilydd fod angen i chi symud i gartref gofal, ond eu bod yn gallu gwneud penderfyniadau eraill ar wahân i’w gilydd.",
     "ifYouChooseThisOptionMustStateDecisionsAgreedJointly": "Os byddwch yn dewis yr opsiwn hwn, rhaid i chi ddatgan pa benderfyniadau sydd angen cytuno arnynt ar y cyd.",
-    "decisionDetailsHint": "Rhowch fanylion am unrhyw benderfyniadau y mae’n rhaid i’ch atwrneiod eu gwneud gyda’u gilydd. <a class=\"govuk-link\" href=\"#\">Darllenwch y canllawiau i weld rhai enghreifftiau</a>.",
-    "replacementDecisionDetailsHint": "Dywedwch wrthym pa benderfyniadau y mae’n rhaid i’ch atwrneiod wrth gefn eu gwneud ar y cyd.<a class=\"govuk-link\" href=\"#\">Darllenwch y canllawiau i weld rhai enghreifftiau.</a>",
+    "readTheGuidanceToSeeSomeExamples": "Darllenwch y canllawiau i weld rhai enghreifftiau.",
+    "enterDetailsOfDecisionsAttorneys": "Welsh",
+    "enterDetailsOfDecisionsReplacement": "Welsh",
     "details": "Manylion",
     "howAttorneysShouldMakeDecisions": "sut y dylai’r atwrneiod wneud penderfyniadau",
     "howReplacementAttorneysShouldMakeDecisions": "sut y dylai’r atwrneiod wrth gefn wneud penderfyniadau",

diff --git a/lang/en.json b/lang/en.json
@@ -349,8 +349,9 @@
     "jointlyAndSeverallyMixedHintReplacementAttorneysExample:property-and-affairs": "For example, you could say your replacement attorneys must all agree if they want to sell your home, but they can make other decisions separately.",
     "jointlyAndSeverallyMixedHintReplacementAttorneysExample:personal-welfare": "As an example, you could say your replacement attorneys must all agree that you need to move into a care home, but they can make other decisions separately.",
     "ifYouChooseThisOptionMustStateDecisionsAgreedJointly": "If you choose this option you must state which decisions need to be agreed jointly.",
-    "decisionDetailsHint": "Give details about any decisions your attorneys must make jointly. <a class=\"govuk-link\" href=\"#\">Read the guidance to see some examples</a>.",
-    "replacementDecisionDetailsHint": "Give details about any decisions your replacement attorneys must make together. <a href=\"#\" class=\"govuk-link\">Read the guidance to see some examples.</a>",
+    "readTheGuidanceToSeeSomeExamples": "Read the guidance to see some examples.",
+    "enterDetailsOfDecisionsAttorneys": "Enter details of any decisions your attorneys must make jointly",
+    "enterDetailsOfDecisionsReplacement": "Enter details of any decisions your replacement attorneys must make jointly",
     "details": "Details",
     "howAttorneysShouldMakeDecisions": "how the attorneys should make decisions",
     "howReplacementAttorneysShouldMakeDecisions": "how the replacement attorneys should make decisions",

diff --git a/web/template/donor/how_should_attorneys_make_decisions.gohtml b/web/template/donor/how_should_attorneys_make_decisions.gohtml
@@ -54,9 +54,9 @@
                             </div>
                             <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="decision-type-3-conditional-div">
                                 <div class="govuk-form-group govuk-!-margin-top-4 {{ if .Errors.Has "mixed-details" }}govuk-form-group--error{{ end }}">
-                                    <p class="govuk-body">{{ trHtml .App "decisionDetailsHint" }}</p>
+                                    <p class="govuk-body"><a class="govuk-link" href="#">{{ tr .App "readTheGuidanceToSeeSomeExamples" }}</a></p>
                                     <label class="govuk-label" for="f-mixed-details" {{ if .Errors.Has "mixed-details" }}aria-describedby="mixed-details-error"{{ end }}>
-                                        {{ tr .App "details" }}
+                                        {{ tr .App "enterDetailsOfDecisionsAttorneys" }}
                                     </label>
                                     {{ template "error-message" (errorMessage . "mixed-details") }}
                                     <textarea class="govuk-textarea {{ if .Errors.Has "mixed-details" }}govuk-input--error{{ end }}" id="f-mixed-details" name="mixed-details" rows="10">{{ .Form.DecisionsDetails }}</textarea>

diff --git a/web/template/donor/how_should_replacement_attorneys_make_decisions.gohtml b/web/template/donor/how_should_replacement_attorneys_make_decisions.gohtml
@@ -51,9 +51,9 @@
               </div>
               <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="decision-type-3-conditional-div">
                 <div class="govuk-form-group govuk-!-margin-top-4 {{ if .Errors.Has "mixed-details" }}govuk-form-group--error{{ end }}">
-                  <p class="govuk-body">{{ trHtml .App "replacementDecisionDetailsHint" }}</p>
+                  <p class="govuk-body"><a href="#" class="govuk-link">{{ tr .App "readTheGuidanceToSeeSomeExamples" }}</a></p>
                   <label class="govuk-label" for="f-mixed-details" {{ if .Errors.Has "mixed-details" }}aria-describedby="mixed-details-error"{{ end }}>
-                    {{ tr .App "details" }}
+                    {{ tr .App "enterDetailsOfDecisionsReplacement" }}
                   </label>
 
                   {{ template "error-message" (errorMessage . "mixed-details") }}