RubyGems - metadata_presenter - Versions diffs - 3.3.10 → 3.3.11 - Mend

metadata_presenter 3.3.10 → 3.3.11

Files changed (47) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f903ea69aac642330788eb582ca3ca0f23b6be19bb46675dd57e9c65435a9e
-  data.tar.gz: b937d1215881c6634dab4ac6844cc9f4a9d5e34bda404c8d71fc26d5800ffeea
+  metadata.gz: 79c2d0ab7d427f385e8587160abeee458da48091cb3630286d7a0b4608104fb7
+  data.tar.gz: 8fcc6f6707dae22f09838083b3f65248c40f3cbea085ed40a9fd35ca3a0bc328
 SHA512:
-  metadata.gz: c4cb42cfa3147e7b5ba49fa4d847fdfe3af0a568851a525da702f080d08c03bbe8c0f94b01eacf6b5191c04d793a3051a47ecf19338095a35563a5f9d033cecf
-  data.tar.gz: ef5eb881fc90c4bc68057740d6caa4370a14c5328480044384b6ac7c582f0d49dc1acf32e04f61b9cc5f32f275de694485de210ca230df534137e2e7a0fe2440
+  metadata.gz: 978db9bff04000d371f2ac68800dfd5dc2d2dee2e12154cf2c4cb5cfa184cf547fe861c5fd1005109c44545e08cbe31e9f7434da8ced75fb637b20d3ec9e95e1
+  data.tar.gz: 720656165350ddf3ec0f87d4906b3feb1512abaffd4ec63f5b894f86ad7a5c5e88c091d774c4116076ebb28b2c4a848b2ddb1e792c1c957ae74dec796e221d5a

data/app/controllers/metadata_presenter/engine_controller.rb CHANGED Viewed

@@ -5,6 +5,7 @@ module MetadataPresenter
     helper MetadataPresenter::ApplicationHelper
     default_form_builder GOVUKDesignSystemFormBuilder::FormBuilder
+    around_action :switch_locale
     before_action :show_maintenance_page
     def reload_user_data
@@ -137,6 +138,12 @@ module MetadataPresenter
       render template: 'errors/500', status: :internal_server_error
     end
+    def switch_locale(&action)
+      I18n.with_locale(
+        service.metadata&.[]('locale') || I18n.default_locale, &action
+      )
+    end
     def redirect_to_page(url)
       redirect_to File.join(request.script_name, url)
     end

data/app/models/metadata_presenter/saved_form.rb CHANGED Viewed

@@ -21,9 +21,8 @@ module MetadataPresenter
                   :created_at,
                   :updated_at
-    validates :secret_question, :secret_answer, :page_slug, :service_version, :user_id, :user_token, presence: { message: 'Enter an answer for "%{attribute}"' }, allow_blank: false
-    def initialize; end
+    validates :secret_question, :secret_answer, :page_slug, :service_version, :user_id, :user_token,
+              presence: true, allow_blank: false
     def populate_param_values(params)
       self.email           = params['email']

data/app/validators/metadata_presenter/base_validator.rb CHANGED Viewed

@@ -68,7 +68,7 @@ module MetadataPresenter
     # The default error message will be look using the schema key.
     # Assuming the schema key is 'grogu' then the default message
-    # will look for 'error.grogu.value'.
+    # will look for 'error.grogu.value:en' or 'error.grogu.value:cy'.
     #
     # @return [String] returns the default error message
     # @raise [MetadataPresenter::NoDefaultMessage] raises no default message if
@@ -80,9 +80,9 @@ module MetadataPresenter
                              .default_metadata[default_error_message_key]
       if default_message.present?
-        default_message['value'] % error_message_hash.merge(params)
+        default_message[error_key] % error_message_hash.merge(params)
       else
-        raise NoDefaultMessage, "No default message found for key '#{default_error_message_key}'."
+        raise NoDefaultMessage, "No default '#{error_key}' message found for key '#{default_error_message_key}'."
       end
     end
@@ -106,6 +106,16 @@ module MetadataPresenter
       @schema_key ||= self.class.name.demodulize.gsub('Validator', '').underscore
     end
+    # The key to use when retrieving localised error messages.
+    # This key will be `value:locale` i.e. `value:en` for English or
+    # `value:cy` for Welsh.
+    #
+    # @return [String] value key to be looked in the default error metadata
+    #
+    def error_key
+      @error_key ||= ['value', I18n.locale].join(':').freeze
+    end
     # Error message hash that will be interpolate with the custom message or
     # the default metadata
     #

data/app/views/layouts/metadata_presenter/application.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<%= I18n.locale %>" class="govuk-template">
   <head>
     <meta charset="utf-8">
     <title><%= service.service_name %></title>
@@ -42,7 +42,7 @@
       <div class="govuk-width-container govuk-body-m">
         <main class="govuk-main-wrapper govuk-main-wrapper--auto-spacing" id="main-content" role="main">
           <% if back_link.present? %>
-            <a class="govuk-back-link" href="<%= back_link %>">Back</a>
+            <a class="govuk-back-link" href="<%= back_link %>"><%= t('presenter.back') %></a>
           <% end %>
           <% if !allowed_page? %>
             <%= render partial: 'metadata_presenter/session/timeout_fallback' %>

data/app/views/metadata_presenter/analytics/_cookie_banner_confirmation.html.erb CHANGED Viewed

@@ -5,7 +5,7 @@
       <div class="govuk-grid-column-two-thirds">
         <div class="govuk-cookie-banner__content">
           <p class="govuk-body">
-            <%= t('presenter.analytics.confirmation', action: t('presenter.analytics.accepted')) %>
+            <%= t('presenter.analytics.confirmation.accepted') %>
           </p>
         </div>
       </div>
@@ -18,7 +18,7 @@
       <div class="govuk-grid-column-two-thirds">
         <div class="govuk-cookie-banner__content">
           <p class="govuk-body">
-            <%= t('presenter.analytics.confirmation', action: t('presenter.analytics.rejected')) %>
+            <%= t('presenter.analytics.confirmation.rejected') %>
           </p>
         </div>
       </div>

data/app/views/metadata_presenter/attribute/_external_start_page_info.html.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <div class="govuk-notification-banner" role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
 <div class="govuk-notification-banner__header">
   <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
-    <%= I18n.t('presenter.external_start_page_info.important') %>
+    <%= I18n.t('presenter.notification_banners.important') %>
   </h2>
 </div>
 <div class="govuk-notification-banner__content">
@@ -9,4 +9,4 @@
     <%= I18n.t('presenter.external_start_page_info.content', href: govuk_link_to(I18n.t('presenter.external_start_page_info.link_text'), 'https://moj-forms.service.justice.gov.uk/building-and-editing/#start-page')).html_safe %>
   </p>
 </div>
-</div>
+</div>

data/app/views/metadata_presenter/component/_conditional_component_banner.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% if single_page_preview? && !editable? && @page.conditional_components.any? %>
-  <%= govuk_notification_banner(title_text: 'Important') do |nb|
+  <%= govuk_notification_banner(title_text: t('presenter.notification_banners.important')) do |nb|
     nb.with_heading(text: t('presenter.conditional_content.notification'))
   end %>
 <% end%>

data/app/views/metadata_presenter/component/_upload.html.erb CHANGED Viewed

@@ -6,7 +6,7 @@
   <p><%= @page_answers.send(component.id)['original_filename'] %></p>
   <p>
-    <%= link_to 'Remove file', remove_file_path(component.id), class: 'govuk-link' %>
+    <%= link_to t('presenter.questions.upload.remove_file'), remove_file_path(component.id), class: 'govuk-link' %>
   </p>
 <% else %>
   <%= f.govuk_file_field component.id.to_sym,

data/app/views/metadata_presenter/footer/_meta.html.erb CHANGED Viewed

@@ -2,7 +2,9 @@
 <ul class="govuk-footer__inline-list">
 <% service.meta.items.each do |item| %>
   <li class="govuk-footer__inline-list-item">
-    <a class="govuk-footer__link" href=<%= external_or_relative_link(item.href) %>><%= item.text %></a>
+    <a class="govuk-footer__link" href=<%= external_or_relative_link(item.href) %>>
+      <%= t(item._id, scope: [:presenter, :meta], default: item.text) %>
+    </a>
   </li>
 <% end %>
 </ul>

data/app/views/metadata_presenter/footer/footer.html.erb CHANGED Viewed

@@ -9,12 +9,14 @@
           <path fill="currentColor" d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
         </svg>
         <span class="govuk-footer__licence-description">
-          All content is available under the
-          <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated
+          <%= t('presenter.meta.license_html') %>
         </span>
       </div>
       <div class="govuk-footer__meta-item">
-        <a class="govuk-footer__link govuk-footer__copyright-logo" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown copyright</a>
+        <a class="govuk-footer__link govuk-footer__copyright-logo"
+           href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">
+          <%= t('presenter.meta.copyright') %>
+        </a>
       </div>
     </div>
   </div>

data/app/views/metadata_presenter/header/show.html.erb CHANGED Viewed

@@ -1,24 +1,14 @@
-<header class="govuk-header" role="banner" data-module="govuk-header">
-  <a href="#main-content" class="govuk-skip-link" data-module="govuk-skip-link">Skip to main content</a>
+<a href="#main-content" class="govuk-skip-link" data-module="govuk-skip-link">
+  <%= t('presenter.header.skip') %>
+</a>
+<header class="govuk-header" role="banner" data-module="govuk-header">
   <div class="govuk-header__container govuk-width-container">
     <div class="govuk-header__logo">
-      <a href="https://www.gov.uk/" class="govuk-header__link govuk-header__link--homepage">
+      <a href="<%= t('presenter.header.govuk_url') %>" class="govuk-header__link govuk-header__link--homepage">
         <span class="govuk-header__logotype">
-          <svg
-            aria-hidden="true"
-            focusable="false"
-            class="govuk-header__logotype-crown"
-            xmlns="http://www.w3.org/2000/svg"
-            viewbox="0 0 132 97"
-            height="30"
-            width="36"
-          >
-            <path
-              fill="currentColor" fill-rule="evenodd"
-              d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"
-            ></path>
-            <image src="{{ params.assetsPath | default('/assets/images') }}/govuk-logotype-crown.png" xlink:href="" class="govuk-header__logotype-crown-fallback-image" width="36" height="32"></image>
+          <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="30" width="36">
+            <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
           </svg>
           <span class="govuk-header__logotype-text">
             GOV.UK
@@ -28,9 +18,7 @@
     </div>
     <% if service.service_name.present? %>
       <div class="govuk-header__content">
-        <a href="<%= start_page_url %>" class="govuk-header__link govuk-header__service-name">
-          <%= service.service_name %>
-        </a>
+        <%= link_to service.service_name, start_page_url, class: %w[govuk-header__link govuk-header__service-name] %>
       </div>
     <% end %>
   </div>

data/app/views/metadata_presenter/page/checkanswers.html.erb CHANGED Viewed

@@ -49,7 +49,7 @@
                     editable? ? '#' : change_answer_path(url: page_answers_presenter.url),
                     class: 'govuk-link'
                   ) do %>
-                    Change<span class="govuk-visually-hidden"> Your answer for <%= page_answers_presenter.humanised_title %></span>
+                    <%= t('presenter.actions.change_html', question: page_answers_presenter.humanised_title) %>
                   <% end %>
                 </dd>
               </div>
@@ -102,9 +102,9 @@
             <%= t('presenter.actions.submit') -%></button>
             <% if save_and_return_enabled? %>
             <% if editor_preview? || editable? %>
-              <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers', disabled: true %>
+              <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers', disabled: true %>
             <% else %>
-              <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers', value: 'true' %>
+              <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers', value: 'true' %>
             <% end %>
           <% end %>
         </div>

data/app/views/metadata_presenter/page/content.html.erb CHANGED Viewed

@@ -36,14 +36,15 @@
                    } %>
         <div class="govuk-button-group">
-          <%= f.govuk_submit(disabled: editable?) %>
+          <%= f.govuk_submit(t('presenter.actions.continue'), disabled: editable?) %>
           <% if save_and_return_enabled? %>
             <% if editor_preview? || editable? %>
-              <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
+              <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
             <% else %>
-              <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', value: 'true' %>
+              <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', value: 'true' %>
             <% end %>
-          <% end %>        </div>
+          <% end %>
+        </div>
       <% end %>
     </div>
   </div>

data/app/views/metadata_presenter/page/multiplequestions.html.erb CHANGED Viewed

@@ -12,7 +12,7 @@
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post, authenticity_token: false do |f| %>
         <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
-        <%= f.govuk_error_summary %>
+        <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
         <%= render partial: 'metadata_presenter/component/components', locals: {
             f: f,
@@ -24,14 +24,16 @@
           }
         %>
         <div class="govuk-button-group">
-          <%= f.govuk_submit(disabled: editable?) %>
+          <%= f.govuk_submit(t('presenter.actions.continue'), disabled: editable?) %>
           <% if save_and_return_enabled? && show_save_and_return %>
             <% if editor_preview? || editable? %>
-              <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
+              <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
             <% else %>
-              <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later' , value: 'true' %>
+              <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', value: 'true' %>
             <% end %>
-          <% end %>        </div>
+          <% end %>
+        </div>
       <% end %>
     </div>
   </div>

data/app/views/metadata_presenter/page/singlequestion.html.erb CHANGED Viewed

@@ -9,7 +9,7 @@
       <%= render 'metadata_presenter/attribute/section_heading' %>
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post, authenticity_token: false do |f| %>
-        <%= f.govuk_error_summary %>
+        <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
 <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
         <% @page.components.each_with_index do |component, index| %>
           <div class="fb-editable"
@@ -27,13 +27,13 @@
         <% end %>
         <div class="govuk-button-group">
-          <%= f.govuk_submit(disabled: editable?) %>
+          <%= f.govuk_submit(t('presenter.actions.continue'), disabled: editable?) %>
           <% if save_and_return_enabled? && show_save_and_return %>
             <% if editor_preview? || editable? %>
-              <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
+              <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
             <% else %>
-              <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', value: 'true' %>
+              <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', value: 'true' %>
             <% end %>
           <% end %>
         </div>

data/app/views/metadata_presenter/save_and_return/email_confirmation.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
     <div class="govuk-grid-column-two-thirds">
       <a class="govuk-back-link" href="<%= :back %>"><%= t('presenter.back') %></a>
       <%= form_for @email_confirmation do |f| %>
-        <%= f.govuk_error_summary %>
+        <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
         <div class="govuk-form-group">
           <%=
           f.govuk_email_field :email_confirmation,
@@ -18,7 +18,7 @@
         <br/>
         <div class="govuk-button-group">
           <%= f.govuk_submit t('presenter.save_and_return.show.continue') %> <%= link_to t('presenter.save_and_return.show.cancel'), page_slug, class: "govuk-button govuk-button--secondary" %>
-        <div class="govuk-button-group">
+        </div>
       <% end %>
     </div>
   </div>

data/app/views/metadata_presenter/save_and_return/resume_from_start.html.erb CHANGED Viewed

@@ -5,7 +5,7 @@
     <p class="govuk-hint"><%= t('presenter.save_and_return.resume.from_start.info_1') %></p>
     <br/>
     <p class="govuk-hint"><%= t('presenter.save_and_return.resume.from_start.info_2') %></p>
-    <%= link_to t('presenter.save_and_return.resume.from_start.continue'), root_path, class: "govuk-button" %>
+    <%= link_to t('presenter.save_and_return.actions.continue'), root_path, class: "govuk-button" %>
     </div>
   </div>
 </div>

data/app/views/metadata_presenter/save_and_return/resume_progress.html.erb CHANGED Viewed

@@ -27,7 +27,7 @@
                     editable? ? '#' : page_answers_presenter.url,
                     class: 'govuk-link'
                   ) do %>
-                    Change<span class="govuk-visually-hidden"> Your answer for <%= page_answers_presenter.humanised_title %></span>
+                    <%= t('presenter.actions.change_html', question: page_answers_presenter.humanised_title) %>
                   <% end %>
                 </dd>
               </div>
@@ -42,7 +42,7 @@
         </dl>
         <div class="govuk-button-group">
-          <%= link_to t('presenter.save_and_return.resume.progress.continue'), page_slug, class: "govuk-button" %> <a href="<%= save_path(:page_slug=>page_slug) %>" class="govuk-button govuk-button--secondary" data-module="govuk-button" data-component="save-button"><%= t('presenter.save_and_return.save') %></a>
+          <%= link_to t('presenter.save_and_return.actions.continue'), page_slug, class: "govuk-button" %> <a href="<%= save_path(:page_slug=>page_slug) %>" class="govuk-button govuk-button--secondary" data-module="govuk-button" data-component="save-button"><%= t('presenter.save_and_return.actions.save') %></a>
         </div>
       <% end %>
     </div>

data/app/views/metadata_presenter/save_and_return/return.html.erb CHANGED Viewed

@@ -4,7 +4,7 @@
     <h1 id="page-heading" class="govuk-heading-xl"><%= t('presenter.save_and_return.resume.heading', service_name: get_service_name) %></h1>
     <p><%= t('presenter.save_and_return.resume.content') %></p>
     <%= form_for @resume_form do |f| %>
-      <%= f.govuk_error_summary %>
+      <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
       <%= f.hidden_field(:uuid, value: get_uuid) %>
       <div class="govuk-form-group">
       <%=
@@ -20,7 +20,7 @@
           <%= t('presenter.save_and_return.resume.information') %>
         </strong>
       </div>
-      <%= f.govuk_submit t('presenter.save_and_return.resume.continue') %><% end %>
+      <%= f.govuk_submit t('presenter.save_and_return.actions.continue') %><% end %>
     </div>
   </div>
 </div>

data/app/views/metadata_presenter/save_and_return/show.html.erb CHANGED Viewed

@@ -5,7 +5,7 @@
     <p class="mojf-settings-screen__description"><%= t('presenter.save_and_return.show.description') %></p>
       <%= form_for @saved_form do |f| %>
-        <%= f.govuk_error_summary %>
+        <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
         <div class="govuk-form-group">
         <%= f.hidden_field(:page_slug, value: page_slug) %>
           <%=

data/app/views/metadata_presenter/session/_timeout_fallback.html.erb CHANGED Viewed

@@ -1,8 +1,7 @@
 <div class="govuk-warning-text govuk-timeout-warning-fallback">
   <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
   <strong class="govuk-warning-text__text">
-    <span class="govuk-warning-text__assistive">Warning</span>
-    <%= t('presenter.session_timeout_warning.timer_fallback') %> <%= timeout_fallback(session_expiry_time) %>.
-    <%= t('presenter.session_timeout_warning.timer_extra') %>
+    <span class="govuk-warning-text__assistive"><%= t('presenter.notification_banners.warning') %></span>
+    <%= t('presenter.session_timeout_warning.timer_fallback', expiry_time: timeout_fallback(session_expiry_time)) %>
   </strong>
 </div>

data/config/locales/cy.yml ADDED Viewed

@@ -0,0 +1,181 @@
+cy:
+  date:
+    day_names: [ Dydd Sul, Dydd Llun, Dydd Mawrth, Dydd Mercher, Dydd Iau, Dydd Gwener, Dydd Sadwrn ]
+    abbr_day_names: [ Sul, Llun, Maw, Mer, Iau, Gwe, Sad ]
+    month_names: [ ~, Ionawr, Chwefror, Mawrth, Ebrill, Mai, Mehefin, Gorffennaf, Awst, Medi, Hydref, Tachwedd, Rhagfyr ]
+    abbr_month_names: [ ~, Ion, Chw, Maw, Ebr, Mai, Meh, Gor, Awst, Med, Hyd, Tach, Rha ]
+  time:
+    am: yb
+    pm: yh
+  presenter:
+    back: Yn ôl
+    actions:
+      start: Dechrau nawr
+      continue: Parhau
+      submit: (cy) Submit
+      upload_options: (cy) Upload options
+      change_html: (cy) Change <span class="govuk-visually-hidden">Your answer for %{question}</span>
+    errors:
+      summary_heading: Mae yna broblem
+    notification_banners:
+      important: (cy) Important
+      warning: (cy) Warning
+    analytics:
+      heading: (cy) Cookies on %{service_name}
+      body_1: (cy) We use some essential cookies to make this service work.
+      body_2: (cy) We'd also like to use analytics cookies so we can understand how you use the service and make improvements.
+      accept: (cy) Accept analytics cookies
+      reject: (cy) Reject analytics cookies
+      view_cookies: (cy) View cookies
+      confirmation:
+        accepted: (cy) You've accepted analytics cookies.
+        rejected: (cy) You've rejected analytics cookies.
+      hide: (cy) Hide this message
+    external_start_page_info:
+      content: (cy) Your form has a %{href}. Links to your form's 'home' page, such as your form's name in the header, will not work until the GOV.UK page has been published.
+      link_text: (cy) GOV.UK start page
+    maintenance:
+      maintenance_page_heading: (cy) Sorry, this form is unavailable
+      maintenance_page_content: "(cy) If you were in the middle of completing the form, your data has not been saved.\r\n\r\nThe form will be available again from 9am on Monday 19 November 2018.\r\n\r\n\r\n\r\n### Other ways to apply\r\n\r\nContact us if your application is urgent \r\n\r\nEmail:  \r\nTelephone:  \r\nMonday to Friday, 9am to 5pm  \r\n[Find out about call charges](https://www.gov.uk/call-charges)"
+    session_timeout_warning:
+      heading: (cy) Do you need more time?
+      timer: (cy) We will reset your form and delete your information if you do not continue in
+      timer_fallback: (cy) We will reset your form and delete your information if you do not complete the page and press continue by %{expiry_time}.
+      redirect: (cy) You are about to be redirected
+      close_button: (cy) Close
+      button: Parhau
+    session_expired:
+      title: (cy) Your form has been reset
+      content: "(cy) To protect your personal information, we have reset the form and cleared your answers.\r\n\r\nThis is because you were inactive for 30 minutes."
+      restart_link: (cy) Start again
+    session_complete:
+      title: (cy) Submission complete
+      content: "(cy) This form has already been submitted.\r\n\r\nTo protect your personal information, we have reset the form and cleared your answers."
+      restart_link: (cy) Start again
+    confirmation:
+      reference_number: '(cy) Your reference number is:'
+      payment_enabled: (cy) You still need to pay
+      continue_to_pay_button: (cy) Continue to pay
+      application_complete: '(cy) Application complete'
+      email_disclaimer_email_question: '(cy) We will use this address to send you a confirmation email with a copy of your answers.'
+      email_basic_disclaimer_html: '(cy) We will send a confirmation email with a copy of these answers to %{email_provided}'
+    confirmation_email:
+      table_heading: (cy) Your answers
+    questions:
+      upload:
+        remove_file: (cy) Remove file
+      multiupload:
+        remove_file: '(cy) Delete'
+        add_another: '(cy) Add another file'
+        single_upload: '(cy) Maximum file size 7MB'
+        answered_singular: '(cy) You can add 1 more file (maximum 7MB per file)'
+        answered_plural: '(cy) You can add %{num} more files (maximum 7MB per file)'
+        answered_count_singular: '(cy) You have added 1 file'
+        answered_count_plural: '(cy) You have added %{num} files'
+        singular: '(cy) You can add 1 more file (maximum 7MB)'
+        plural: '(cy) You can add up to %{num} files (maximum 7MB per file)'
+        none: "(cy) You can't add any more files. Remove a file if you need to add a different one."
+    conditional_content:
+      notification: "(cy) Some content on this page will be hidden under certain conditions. Preview the full form or publish to Test to check."
+    save_and_return:
+      actions:
+        save: (cy) Save for later
+        continue: Parhau
+      show:
+        heading: '(cy) Save for later'
+        description: '(cy) We will send you a one-off link that you can use to resume this form within 28 days.'
+        email: '(cy) Email address'
+        email_hint: '(cy) We will only use this to send you a link to your form'
+        secret_question: '(cy) Pick a security question'
+        secret_question_hint: '(cy) We will use this to verify your identity when you return'
+        secret_answer: '(cy) The answer to your security question'
+        continue: '(cy) Continue with saving'
+        cancel: '(cy) Cancel saving and resume form'
+      confirm_email:
+        heading: '(cy) Check your email address is correct'
+        description: '(cy) Make sure this is correct before finishing'
+      saved:
+        heading: '(cy) Your form has been saved'
+        success: "(cy) We have sent a one-off link to %{email} which you can use to resume this form within 28 days. After that time, your saved information will be deleted."
+        info_1: "(cy) If you haven't received the email after a few minutes, check your spam folder."
+        info_2: '(cy) This link will only work once. If you want to save your progress again after resuming the form, you will need to repeat the save process and generate another link'
+        info_3: '(cy) You are now free to close this window or navigate away from this page.'
+      validation:
+        email: '(cy) Enter an email address in the correct format, like name@example.com'
+        email_not_matched: '(cy) Does not match'
+        answer_not_matched: '(cy) Your answer is incorrect. You have %{attempts} attempts remaining.'
+        answer_too_long: '(cy) Your answer for %{attribute} must be 100 characters or fewer.'
+      secret_questions:
+        one: "(cy) What is your mother's maiden name?"
+        two: '(cy) What is the last name of your favourite teacher?'
+        three: '(cy) What is the name of the hospital where you were born?'
+      resume:
+        heading: "(cy) Continue with \"%{service_name}\""
+        content: '(cy) To retrieve your information, enter the answer to your security question that you set when saving your progress.'
+        information: '(cy) This will use up your save link. To save your progress again, you will need to repeat the save process and generate another link.'
+        errors:
+          generic_problem:
+            heading: '(cy) There is a problem with your link'
+            info_1: '(cy) Please try again. If you copied and pasted the link into your browser, check you copied the entire link.'
+            info_2: '(cy) If this problem persists, you will need to start the form again. Your saved answers will be securely deleted after 28 days.'
+          expired:
+            heading: '(cy) Your link has expired'
+            info_1: '(cy) It has been more than 28 days since you saved your progress on this form and the link is no longer valid.'
+            info_2: '(cy) Your saved answers have been be securely deleted.'
+          link_used:
+            heading: '(cy) That link has already been used'
+            info_1: '(cy) Links to resume a form only work once. If you have saved your progress more than once, check for a more recent link.'
+            info_2: '(cy) Otherwise, you will need to start the form again. Your saved answers will be securely deleted after 28 days.'
+          failure:
+            heading: '(cy) Your information cannot be retrieved'
+            info_1: '(cy) The answer to your security question was incorrect and you have run out of attempts to retrieve your information.'
+            info_2: '(cy) You will need to start the form again. Your saved answers will be securely deleted.'
+        from_start:
+          heading: "(cy) \"%{service_name}\" has been updated"
+          info_1: '(cy) Your information has been successfully retrieved. However, the form has been updated since your last visit.'
+          info_2: '(cy) Please check from the beginning in case anything has changed, such as new requirements or questions.'
+        progress:
+          heading: '(cy) %{service_name}'
+          content_1: '(cy) You have successfully retrieved your saved information.'
+          content_2: '(cy) Here are the answers you have provided so far.'
+      confirmation_email:
+        subject: "(cy) Your saved form - '%{service_name}'"
+        body: "(cy) You have saved your progress with the form '%{service_name}'.<br /><br /><a href=%{magic_link}>Continue with your form</a><br /><br />This link will only work once. If you want to save your progress again after resuming the form, you will need to repeat the save process and generate another link.<br /><br />The link is valid for 28 days. After that time, your saved information will be deleted."
+    header:
+      skip: Neidio i’r prif gynnwys
+      govuk_url: 'https://www.gov.uk/cymraeg'
+    footer:
+      cookies:
+        heading: Cwcis
+        body: "(cy) This form saves small files (known as 'cookies') onto your device.\r\n \r\nCookies are used to:\r\n \r\n* remember your progress\r\n* measure how you use the form so it can be updated and improved based on your needs\r\n \r\nThese cookies are not used to identify you personally.\r\n \r\nYou will normally see a message on the form before we store a cookie on your computer. Essential cookies are necessary for the form to work but you can still complete the form if you choose not to accept analytics cookies.\r\n \r\nFind out more about [how to manage cookies](https://www.aboutcookies.org/).\r\n \r\n## Essential cookies\r\n \r\nEssential cookies are required to make this form work and keep your information secure while you use it.\r\n \r\nWe use the following essential cookies: \r\n \r\n| Name | Purpose | Expires |\r\n|---|---|---|\r\n| \\_fb\\_runner\\_session | Saves your current progress on this computer and tracks inactivity periods | After 30 minutes of inactivity or when you close your browser |\r\n| analytics | Remembers whether you accept or reject analytics cookies on this form | After 1 year |\r\n \r\n## Analytics cookies\r\n \r\nAnalytics cookies collect information about how you use this form. This helps us make sure the form is meeting the needs of its users and to help us make improvements.\r\n \r\nWe use Google Analytics to learn about:\r\n \r\n* the pages you visit\r\n* how long you spend on each page\r\n* how you got to the form\r\n* what you click on while you are using the form\r\n \r\nWe do not collect or store your personal information (for example your name or address) so this information can't be used to identify who you are. We do not allow third parties to use or share our analytics data.\r\n \r\nThis form may use different versions of Google Analytics and could save some or all of the following cookies:\r\n \r\n| Name | Purpose | Expires |\r\n|---|---|---|\r\n| \\_ga | Helps us count how many people visit this form | 2 years |\r\n| \\_gid | Helps us count how many people visit this form | 1 day   |\r\n| \\_ga\\_\\<container-id> | Used to persist session state | 2 years |\r\n| \\_gac\\_gb\\_\\<container-id> | Contains campaign-related information | 90 days |\r\n| \\_gat | Used to throttle request rate | 1 minute |\r\n| \\_dc\\_gtm\\_\\<property-id>| Used to throttle request rate | 1 minute |\r\n| AMP\\_TOKEN | Contains a token that can be used to retrieve a Client ID from AMP Client ID service | 30 seconds to 1 year |\r\n| \\_gac\\_\\<property-id> | Contains campaign related information | 90 days |\r\n \r\nYou can use a browser addon to [opt out of Google Analytics cookies](https://tools.google.com/dlpage/gaoptout) on all websites."
+      privacy:
+        heading: Polisi preifatrwydd
+      accessibility:
+        heading: Datganiad hygyrchedd
+    meta:
+      config:
+        meta--link: Cwcis
+        meta--link--2: Preifatrwydd
+        meta--link--3: Hygyrchedd
+      copyright: © Hawlfraint y Goron
+      license_html: |
+        Mae’r holl gynnwys ar gael dan
+        <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence-cymraeg/version/3/" rel="license">Drwydded y Llywodraeth Agored v3.0</a>,
+        ac eithrio lle nodir yn wahanol
+  activemodel:
+    errors:
+      messages:
+        blank: 'Rhowch ateb i "%{attribute}"'
+    attributes:
+      metadata_presenter/saved_form:
+        secret_question: (cy) Secret question
+        secret_answer: (cy) Secret answer
+      metadata_presenter/address_fieldset:
+        address_line_one: (cy) Address line 1
+        address_line_two: (cy) Address line 2 (optional)
+        city: (cy) Town or city
+        county: (cy) County (optional)
+        postcode: (cy) Postcode
+        country: (cy) Country

data/config/locales/en.yml CHANGED Viewed

@@ -6,6 +6,12 @@ en:
       continue: Continue
       submit: Submit
       upload_options: Upload options
+      change_html: Change <span class="govuk-visually-hidden">Your answer for %{question}</span>
+    errors:
+      summary_heading: There is a problem
+    notification_banners:
+      important: Important
+      warning: Warning
     analytics:
       heading: Cookies on %{service_name}
       body_1: We use some essential cookies to make this service work.
@@ -13,12 +19,11 @@ en:
       accept: Accept analytics cookies
       reject: Reject analytics cookies
       view_cookies: View cookies
-      accepted: accepted
-      rejected: rejected
-      confirmation: You've %{action} analytics cookies.
+      confirmation:
+        accepted: You've accepted analytics cookies.
+        rejected: You've rejected analytics cookies.
       hide: Hide this message
     external_start_page_info:
-      important: 'Important'
       content: "Your form has a %{href}. Links to your form's 'home' page, such as your form's name in the header, will not work until the GOV.UK page has been published."
       link_text: 'GOV.UK start page'
     maintenance:
@@ -27,7 +32,7 @@ en:
     session_timeout_warning:
       heading: Do you need more time?
       timer: We will reset your form and delete your information if you do not continue in
-      timer_fallback: We will reset your form and delete your information if you do not complete the page and press continue by
+      timer_fallback: We will reset your form and delete your information if you do not complete the page and press continue by %{expiry_time}.
       redirect: You are about to be redirected
       close_button: Close
       button: Continue
@@ -46,7 +51,11 @@ en:
       application_complete: 'Application complete'
       email_disclaimer_email_question: 'We will use this address to send you a confirmation email with a copy of your answers.'
       email_basic_disclaimer_html: 'We will send a confirmation email with a copy of these answers to %{email_provided}'
+    confirmation_email:
+      table_heading: Your answers
     questions:
+      upload:
+        remove_file: Remove file
       multiupload:
         remove_file: 'Delete'
         add_another: 'Add another file'
@@ -61,7 +70,9 @@ en:
     conditional_content:
       notification: "Some content on this page will be hidden under certain conditions. Preview the full form or publish to Test to check."
     save_and_return:
-      save: 'Save for later'
+      actions:
+        save: Save for later
+        continue: Continue
       show:
         heading: 'Save for later'
         description: 'We will send you a one-off link that you can use to resume this form within 28 days.'
@@ -92,7 +103,6 @@ en:
         three: 'What is the name of the hospital where you were born?'
       resume:
         heading: "Continue with \"%{service_name}\""
-        continue: 'Continue'
         content: 'To retrieve your information, enter the answer to your security question that you set when saving your progress.'
         information: 'This will use up your save link. To save your progress again, you will need to repeat the save process and generate another link.'
         errors:
@@ -116,12 +126,16 @@ en:
           heading: "\"%{service_name}\" has been updated"
           info_1: 'Your information has been successfully retrieved. However, the form has been updated since your last visit.'
           info_2: 'Please check from the beginning in case anything has changed, such as new requirements or questions.'
-          continue: 'Continue'
         progress:
           heading: '%{service_name}'
           content_1: 'You have successfully retrieved your saved information.'
           content_2: 'Here are the answers you have provided so far.'
-          continue: 'Continue'
+      confirmation_email:
+        subject: "Your saved form - '%{service_name}'"
+        body: "You have saved your progress with the form '%{service_name}'.<br /><br /><a href=%{magic_link}>Continue with your form</a><br /><br />This link will only work once. If you want to save your progress again after resuming the form, you will need to repeat the save process and generate another link.<br /><br />The link is valid for 28 days. After that time, your saved information will be deleted."
+    header:
+      skip: Skip to main content
+      govuk_url: 'https://www.gov.uk'
     footer:
       cookies:
         heading: "Cookies"
@@ -175,9 +189,25 @@ en:
           - "[date when you performed your basic accessibility check]"
           - "[insert team or organisation here]"
         url: 'accessibility'
+    meta:
+      config:
+        meta--link: Cookies
+        meta--link--2: Privacy
+        meta--link--3: Accessibility
+      copyright: © Crown copyright
+      license_html: |
+        All content is available under the
+        <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>,
+        except where otherwise stated
   activemodel:
+    errors:
+      messages:
+        blank: 'Enter an answer for "%{attribute}"'
     attributes:
+      metadata_presenter/saved_form:
+        secret_question: Secret question
+        secret_answer: Secret answer
       metadata_presenter/address_fieldset:
         address_line_one: Address line 1
         address_line_two: Address line 2 (optional)

data/default_metadata/string/error.accept.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.accept",
   "_type": "string.error",
   "description": "File uploaded is wrong type",
-  "value": "\"%{control}\" was not uploaded successfully as it is the wrong type"
+  "value:en": "\"%{control}\" was not uploaded successfully as it is the wrong type",
+  "value:cy": "(cy) \"%{control}\" was not uploaded successfully as it is the wrong type"
 }

data/default_metadata/string/error.address.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.address",
   "_type": "string.error",
   "description": "Input (address) is blank",
-  "value": "Enter %{field} for \"%{control}\""
+  "value:en": "Enter %{field} for \"%{control}\"",
+  "value:cy": "(cy) Enter %{field} for \"%{control}\""
 }

data/default_metadata/string/error.autocomplete.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.autocomplete",
   "_type": "string.error",
   "description": "Autocomplete item is not on the list",
-  "value": "Select an option from the list"
+  "value:en": "Select an option from the list",
+  "value:cy": "(cy) Select an option from the list"
 }

data/default_metadata/string/error.catch_all.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.catch_all",
   "_type": "string.error",
   "description": "A generic validation error not handled by a more concrete validator",
-  "value": "We could not save your answer, please try again"
+  "value:en": "We could not save your answer, please try again",
+  "value:cy": "(cy) We could not save your answer, please try again"
 }

data/default_metadata/string/error.date.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.date",
   "_type": "string.error",
   "description": "Input (date) is not a valid date",
-  "value": "Enter a valid date for \"%{control}\""
+  "value:en": "Enter a valid date for \"%{control}\"",
+  "value:cy": "(cy) Enter a valid date for \"%{control}\""
 }

data/default_metadata/string/error.date_after.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.date_after",
   "_type": "string.error",
   "description": "Input (date) is earlier than allowed",
-  "value": "Your answer for \"%{control}\" must be %{date_after} or later"
+  "value:en": "Your answer for \"%{control}\" must be %{date_after} or later",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{date_after} or later"
 }

data/default_metadata/string/error.date_before.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.date_before",
   "_type": "string.error",
   "description": "Input (date) is later than allowed",
-  "value": "Your answer for \"%{control}\" must be %{date_before} or earlier"
+  "value:en": "Your answer for \"%{control}\" must be %{date_before} or earlier",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{date_before} or earlier"
 }

data/default_metadata/string/error.email.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.email",
   "_type": "string.error",
   "description": "Input (email) is not a valid email",
-  "value": "Enter an email address in the correct format, like name@example.com"
+  "value:en": "Enter an email address in the correct format, like name@example.com",
+  "value:cy": "(cy) Enter an email address in the correct format, like name@example.com"
 }

data/default_metadata/string/error.max_files.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.max_files",
   "_type": "string.error",
   "description": "Input (number) is larger than the maximum allowed",
-  "value": "Your answer for \"%{control}\" must be %{maximum} or lower"
+  "value:en": "Your answer for \"%{control}\" must be %{maximum} or lower",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{maximum} or lower"
 }

data/default_metadata/string/error.max_length.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.max_length",
   "_type": "string.error",
   "description": "Input (string) is too long",
-  "value": "Your answer for \"%{control}\" must be %{max_length} characters or fewer"
+  "value:en": "Your answer for \"%{control}\" must be %{max_length} characters or fewer",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{max_length} characters or fewer"
 }

data/default_metadata/string/error.max_size.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.max_size",
   "_type": "string.error",
   "description": "File is too large",
-  "value": "The selected file must be smaller than %{max_size}MB."
+  "value:en": "The selected file must be smaller than %{max_size}MB.",
+  "value:cy": "(cy) The selected file must be smaller than %{max_size}MB."
 }

data/default_metadata/string/error.max_word.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.max_word",
   "_type": "string.error",
   "description": "Input (number) is higher than the maximum number of words allowed",
-  "value": "Your answer for \"%{control}\" must be %{max_word} words or fewer"
+  "value:en": "Your answer for \"%{control}\" must be %{max_word} words or fewer",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{max_word} words or fewer"
 }

data/default_metadata/string/error.maximum.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.maximum",
   "_type": "string.error",
   "description": "Input (number) is larger than the maximum allowed",
-  "value": "Your answer for \"%{control}\" must be %{maximum} or lower"
+  "value:en": "Your answer for \"%{control}\" must be %{maximum} or lower",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{maximum} or lower"
 }

data/default_metadata/string/error.min_length.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.min_length",
   "_type": "string.error",
   "description": "Input (string) is too short",
-  "value": "Your answer for \"%{control}\" must be %{min_length} characters or more"
+  "value:en": "Your answer for \"%{control}\" must be %{min_length} characters or more",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{min_length} characters or more"
 }

data/default_metadata/string/error.min_word.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.min_word",
   "_type": "string.error",
   "description": "Input (number) is lower than the minimum number of words allowed",
-  "value": "Your answer for \"%{control}\" must be %{min_word} words or more"
+  "value:en": "Your answer for \"%{control}\" must be %{min_word} words or more",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{min_word} words or more"
 }

data/default_metadata/string/error.minimum.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.minimum",
   "_type": "string.error",
   "description": "Input (number) is lower than the minimum allowed",
-  "value": "Your answer for \"%{control}\" must be %{minimum} or higher"
+  "value:en": "Your answer for \"%{control}\" must be %{minimum} or higher",
+  "value:cy": "(cy) Your answer for \"%{control}\" must be %{minimum} or higher"
 }

data/default_metadata/string/error.multiupload.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.multiupload",
   "_type": "string.error",
   "description": "Cannot upload files with duplicate filenames",
-  "value": "The selected file cannot have the same name as a file you have already selected. Please check you aren't uploading the same file again."
+  "value:en": "The selected file cannot have the same name as a file you have already selected. Please check you aren't uploading the same file again.",
+  "value:cy": "(cy) The selected file cannot have the same name as a file you have already selected. Please check you aren't uploading the same file again."
 }

data/default_metadata/string/error.number.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.number",
   "_type": "string.error",
   "description": "Input (number) is not a number",
-  "value": "Enter a number for \"%{control}\""
+  "value:en": "Enter a number for \"%{control}\"",
+  "value:cy": "(cy) Enter a number for \"%{control}\""
 }

data/default_metadata/string/error.postcode.json CHANGED Viewed

@@ -2,5 +2,6 @@
   "_id": "error.postcode",
   "_type": "string.error",
   "description": "Postcode format is not valid",
-  "value": "Enter a valid UK postcode for \"%{control}\""
+  "value:en": "Enter a valid UK postcode for \"%{control}\"",
+  "value:cy": "(cy) Enter a valid UK postcode for \"%{control}\""
 }

data/default_metadata/string/error.required.json CHANGED Viewed

@@ -2,6 +2,6 @@
   "_id": "error.required",
   "_type": "string.error",
   "description": "Input is required",
-  "value": "Enter an answer for \"%{control}\"",
-  "value:cy": "Rhowch ateb i \"{control}\""
+  "value:en": "Enter an answer for \"%{control}\"",
+  "value:cy": "Rhowch ateb i \"%{control}\""
 }

data/default_metadata/string/error.virus_scan.json CHANGED Viewed

@@ -2,6 +2,6 @@
   "_id": "error.virus_scan",
   "_type": "string.error",
   "description": "File uploaded contains virus",
-  "value": "\"%{control}\" was not uploaded successfully because it contains a virus"
+  "value:en": "\"%{control}\" was not uploaded successfully because it contains a virus",
+  "value:cy": "(cy) \"%{control}\" was not uploaded successfully because it contains a virus"
 }

data/lib/metadata_presenter/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.10'.freeze
+  VERSION = '3.3.11'.freeze
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.10
+  version: 3.3.11
 platform: ruby
 authors:
 - MoJ Forms
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -477,6 +477,7 @@ files:
 - config/initializers/schemas.rb
 - config/initializers/supported_analytics.rb
 - config/initializers/supported_components.rb
+- config/locales/cy.yml
 - config/locales/en.yml
 - config/routes.rb
 - default_metadata/component/address.json