metadata_presenter 3.3.33 → 3.3.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f00e0571713d8b74a2883bb464ad8c342502cc6708808a5dfaaea78a9b534c
-  data.tar.gz: 5ee73d1243561920fcef19397169ac1225972d2380ee165cb1df557a3afbb53e
+  metadata.gz: b1c0f9efcd3ccefe26dbbd01e6503a4e47a84e7d68df5dae76299ac53c869e70
+  data.tar.gz: bb54be9040c515c64ace352d337b5b2aa000260647e02164738f047550eaa2a0
 SHA512:
-  metadata.gz: da292175228fb81f4936fcb2ad4fde0336d5e7b2713960a5ff011fc35b44c5a224eacb7537270befc59bc815e68a07851891e31dae03ea50d7fa6c4afc1f987a
-  data.tar.gz: 93ad61db2246bae318c363337337885a7783d14118a6c14c6e096a046d0ce78cefc611e9c71d0ac9536fe79559227f0395456db1b7178e890e98f5204a644873
+  metadata.gz: 25bfcf637501fcebaf73c1d4058188cb4350c3a8420c9da4ecbc54de89aae31da70a6ef0e410874c968f42608b60ed4550a86d90a0bc841d96aa88be92b23347
+  data.tar.gz: f4bbcf62535963748332e4a6addfb1b93c0d74f3939ad706dca7da9968f8ce64ecfe6b83a96eb8e458129aa0c19b844a20e5f5f44d0f584bfd98dd91984921c6

data/app/controllers/metadata_presenter/save_and_return_controller.rb

@@ -41,7 +41,14 @@ module MetadataPresenter
 
     def email_confirmation
       @saved_form = session[:saved_form]
-      @email_confirmation = EmailConfirmation.new(@saved_form['email'])
+
+      if @saved_form
+        @email_confirmation = EmailConfirmation.new(@saved_form['email'])
+      else
+        # we see errors when the session saved form is nil, if this is affecting real users we'd prefer to
+        # bump them back to the create step, but we can't easily recreate all the params and we can't cover crawlers hitting the page directly
+        redirect_back fallback_location: root_path
+      end
     end
 
     def confirm_email

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

@@ -1,7 +1,7 @@
 <div class="fb-main-grid-wrapper">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <a class="govuk-back-link" href="<%= :back %>"><%= t('presenter.back') %></a>
+    <%= link_to t('presenter.back'), :back, class: "govuk-back-link" %>
       <%= form_for @email_confirmation do |f| %>
         <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
         <div class="govuk-form-group">

data/config/locales/cy.yml

@@ -14,7 +14,7 @@ cy:
       start: Dechrau nawr
       continue: Parhau
       submit: Cyflwyno
-      sign_in: Sign in
+      sign_in: Mewngofnodi
       upload_options: Llwytho opsiynau
       change_html: Newid <span class="govuk-visually-hidden">eich ateb ar gyfer %{question}</span>
     errors:
@@ -40,12 +40,12 @@ cy:
       maintenance_page_heading: Mae’n ddrwg gennym, nid yw’r ffurflen hon ar gael
       maintenance_page_content: "Os oeddech chi yng nghanol llenwi’r ffurflen, nid yw eich data wedi’i chadw.\r\n\r\nBydd y ffurflen ar gael eto o 9am ar ddydd Llun 19 Tachwedd.\r\n\r\n\r\n\r\n### Other ways to apply\r\n\r\nCysylltwch â ni os yw eich cais yn frys \r\n\r\nEmail:  \r\nTelephone:  \r\nDydd Llun i ddydd Gwener, 9am i 5pm  \r\n[Gwybodaeth am gost galwadau](https://www.gov.uk/costau-galwadau)"
     authorisation:
-      heading: Sign in
-      lede: This form has its own username and password. Contact the form owner if you are unsure what these are.
-      warning: This is a Test version of the form and should not be shared without the form owner’s permission.
+      heading: Mewngofnodi
+      lede: Mae gan y ffurflen hon ei henw defnyddiwr a’i chyfrinair ei hun. Cysylltwch â pherchennog y ffurflen os nad ydych yn siŵr beth yw’r rhain.
+      warning: Fersiwn Brawf o’r ffurflen yw hon ac ni ddylid ei rhannu heb ganiatâd perchennog y ffurflen.
       labels:
-        username: Username
-        password: Password
+        username: Enw defnyddiwr
+        password: Cyfrinair
     session_timeout_warning:
       heading: Ydych chi eisiau mwy o amser?
       timer: Byddwn yn ailosod eich ffurflen ac yn dileu eich gwybodaeth os na fyddwch yn parhau mewn
@@ -181,11 +181,11 @@ cy:
         metadata_presenter/auth_form:
           attributes:
             base:
-              unauthorised: The username and password do not match. Try again
+              unauthorised: Nid yw’r enw defnyddiwr a’r cyfrinair yn cyfateb. Rhowch gynnig arall arni
             username:
-              blank: Enter a username
+              blank: Rhowch enw defnyddiwr
             password:
-              blank: Enter a password
+              blank: Rhowch gyfrinair
     attributes:
       metadata_presenter/saved_form:
         secret_question: Cwestiwn cudd

data/default_metadata/string/error.pattern.json

@@ -3,5 +3,5 @@
   "_type": "string.error",
   "description": "Input (string) does not match with the regular expression",
   "value:en": "Your answer for \"%{control}\" must match the required format",
-  "value:cy": "(cy) Your answer for \"%{control}\" must match the required format"
-}
+  "value:cy": "Rhaid i’ch ateb ar gyfer \"%{control}\" gyfateb i’r fformat gofynnol"
+}

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.33'.freeze
+  VERSION = '3.3.35'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.33
+  version: 3.3.35
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -290,20 +290,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement