wip update and add welsh content for copy of answers

Author: alice-carr

app/views/forms/check_your_answers/show.html.erb

@@ -19,6 +19,27 @@
 
   <%= render CheckYourAnswersComponent::View.new(form: @form, steps: @steps, mode: @mode) %>
 
+<%# todo: this is all a wip and is failing tests at the moment. will use a component %>
+  <div class="govuk-grid-row">
+        <div class="govuk-grid-column-two-thirds-from-desktop">
+      <%if !@current_context.wants_copy_of_answers? %>
+        <%# can i use the CheckYourAnswersComponent view for this, or a new component? %>
+        <h2 class="govuk-heading-m govuk-!-margin-top-7"><%= t('form.check_your_answers.does_not_want_copy_of_answers_title') %></h2>
+        <dl class="govuk-summary-list">
+          <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key"><%= t('form.check_your_answers.does_not_want_copy_of_answers_key') %></dt>
+            <dd class="govuk-summary-list__value"><p><%= t('form.check_your_answers.does_not_want_copy_of_answers_value') %></p></dd>
+            <%# todo: fix href link %>
+            <dd class="govuk-summary-list__actions"><a class="govuk-link" href="/copy-of-answers"><%= t('govuk_components.govuk_summary_list.change') %></dd>
+          </div>
+        </dl>
+      <%elsif @current_context.wants_copy_of_answers? %>
+        <%# todo: add email address%>
+        <div class="govuk-hint"><%= t('form.check_your_answers.wants_copy_of_answers') %></div>
+      <% end %>
+    </div>
+  </div>
+  
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
       <%= form.govuk_radio_buttons_fieldset(:send_confirmation, legend: { size: 'm', tag: 'h2' }) do %>

app/views/forms/continue_to_one_login/show.html.erb

@@ -8,7 +8,7 @@
   <div class="govuk-grid-column-two-thirds">
     <h1 class="govuk-heading-l"><%= t('.title') %></h1>
 
-    <p><%= t('.body') %></p>
+    <%= t('.body_html') %>
 
     <%= govuk_button_to(
           t(".continue_button"),

config/locales/cy.yml

@@ -86,7 +86,7 @@ cy:
         copy_of_answers_input:
           attributes:
             copy_of_answers:
-              blank: PLACEHOLDER! Dewiswch ydw os hoffech dderbyn copi o'ch atebion
+              blank: Dewiswch 'Ydw' os ydych eisiau copi o’ch atebion
         email_confirmation_input:
           attributes:
             confirmation_email_address:
@@ -298,10 +298,10 @@ cy:
   errors:
     auth_error:
       body_html: |
-        <p>We could not confirm your email address using GOV.UK One Login.</p>
-        <p>You’ll need to go back to the form and submit your answers.</p>
-        <p><a href="%{link_url}">Back to form</a></p>
-      title: Sorry, something has gone wrong
+        <p>Nid oeddem yn gallu cadarnhau eich cyfeiriad e-bost gan ddefnyddio GOV.UK One Login.</p>
+        <p>Bydd angen i chi fynd yn ôl i’r ffurflen a chyflwyno’ch atebion.</p>
+        <p><a href="%{link_url}">Yn ôl i’r ffurflen</a></p>
+      title: Mae’n ddrwg gennym, mae rhywbeth wedi mynd o’i le
     goto_page_routing_error:
       cannot_have_goto_page_before_routing_page:
         body_html: |
@@ -337,9 +337,9 @@ cy:
       title: Er lles eich diogelwch, rydyn ni wedi dileu’ch atebion
     return_from_one_login_session_missing:
       body_html: |
-        <p>We could not confirm your email address using GOV.UK One Login.</p>
-        <p>You’ll need to go back to the form and submit your answers - try clicking the ‘Back’ button in your browser.</p>
-      title: Sorry, something has gone wrong
+        <p>Nid oeddem yn gallu cadarnhau eich cyfeiriad e-bost gan ddefnyddio GOV.UK One Login.</p>
+        <p>Bydd angen i chi fynd yn ôl i’r ffurflen a chyflwyno’ch atebion - ceisiwch glicio ar y botwm ’Yn ôl’ yn eich porwr.</p>
+      title: Mae’n ddrwg gennym, mae rhywbeth wedi mynd o’i le
     submission_error:
       body: |
         Roedd yna broblem gyda’r gwasanaeth ac rydyn ni wedi methu cyflwyno’ch atebion.
@@ -363,9 +363,13 @@ cy:
     check_your_answers:
       agree_and_submit: Cytuno a chyflwyno
       declaration: Datganiad
+      does_not_want_copy_of_answers_key: Cael copi o’ch atebion
+      does_not_want_copy_of_answers_title: Rydych wedi dewis peidio â chael copi o’ch atebion
+      does_not_want_copy_of_answers_value: Na
       not_completed: Heb ei gwblhau
       submit: Cyflwyno
       title: Edrychwch dros eich atebion cyn cyflwyno’ch ffurflen
+      wants_copy_of_answers: 'Byddwn yn anfon e-bost cadarnhau gyda chopi o’ch atebion i’ch cyfeiriad e-bost GOV.UK One Login:'
     submitted:
       continue_to_pay: Parhau i dalu
       email_sent: Rydym wedi anfon e-bost cadarnhau atoch.
@@ -395,14 +399,16 @@ cy:
     back: Yn ôl
     continue_to_one_login:
       show:
-        body: To help make sure the information we send you stays secure, you’ll need to sign in to or create a GOV.UK One Login.
-        continue_button: Continue to GOV.UK One Login
-        title: Use GOV.UK One Login to keep your information secure
+        body_html: |
+          <p>Bydd yr e-bost gyda’ch atebion yn cael ei anfon i’r cyfeiriad e-bost sy’n gysylltiedig â’ch GOV.UK One Login.</p>
+          <p>Os ydych angen i’r atebion gael eu hanfon i gyfeiriad e-bost gwahanol - er enghraifft, eich e-bost gwaith - gallwch greu GOV.UK One Login newydd.</p>
+        continue_button: Parhau i GOV.UK One Login
+        title: Defnyddiwch GOV.UK One Login i gadw’ch gwybodaeth yn ddiogel.
     copy_of_answers:
       show:
-        heading: PLACEHOLDER! Ydych chi eisiau copi o'ch atebion?
-        hint: PLACEHOLDER! Byddwn ond yn defnyddio'r cyfeiriad e-bost rydych yn ei ddarparu yma i anfon cadarnhad bod eich ffurflen wedi'i chyflwyno'n llwyddiannus. Ni fydd yn cynnwys copi o'ch atebion.
-        title: PLACEHOLDER! Ydych chi eisiau copi o'ch atebion?
+        heading: Ydych chi eisiau cael e-bost gyda chopi o’ch atebion?
+        hint: Byddwch angen GOV.UK One Login ar gyfer hyn - byddwch yn gallu mewngofnodi neu greu un newydd.
+        title: Ydych chi eisiau cael e-bost gyda chopi o’ch atebion?
     remove_answer:
       show:
         address_heading: Dileu cyfeiriad
@@ -672,5 +678,5 @@ cy:
     phone: Ffôn
   unknown_form_submitted:
     show:
-      email_sent: We’ve sent you a confirmation email with a copy of your answers.
+      email_sent: Rydym wedi anfon e-bost cadarnhau atoch gyda chopi o’ch atebion.
       title: Your form has been submitted

config/locales/en.yml

@@ -363,9 +363,13 @@ en:
     check_your_answers:
       agree_and_submit: Agree and submit
       declaration: Declaration
+      does_not_want_copy_of_answers_key: Get a copy of your answers
+      does_not_want_copy_of_answers_title: You’ve chosen to not get a copy of your answers
+      does_not_want_copy_of_answers_value: false
       not_completed: Not completed
       submit: Submit
       title: Check your answers before submitting your form
+      wants_copy_of_answers: 'We’ll send a confirmation email with a copy of your answers to your GOV.UK One Login email address:'
     submitted:
       continue_to_pay: Continue to pay
       email_sent: We’ve sent you a confirmation email.
@@ -395,7 +399,9 @@ en:
     back: Back
     continue_to_one_login:
       show:
-        body: To help make sure the information we send you stays secure, you’ll need to sign in to or create a GOV.UK One Login.
+        body_html: |
+          <p>The email with your answers will be sent to the email address linked to your GOV.UK One Login.</p>
+          <p>If you need the answers sent to a different email address - for example, your work email - you can create a new GOV.UK One Login.</p>
         continue_button: Continue to GOV.UK One Login
         title: Use GOV.UK One Login to keep your information secure
     copy_of_answers: