metadata_presenter 3.3.32 → 3.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23806a614439f28197e18973dbfb03d8b6ca9d253b1f4ce91c5147d5414d6be8
-  data.tar.gz: f85e4aaeffa331703b57051e5e5ffa499286ddfcfa3a261a050ae769a6449121
+  metadata.gz: c8518bc2fca3d0f5fec907a7b15c8eb032fc8c33e079809e778713765841010e
+  data.tar.gz: 2d27dcca2327531e0ecf8da4208cffc6456d96a91ab0d1ff71d2ec92032bb305
 SHA512:
-  metadata.gz: 5c05dff8124669e8534f8d0931d8c8a8bf3d2f34bc8518c31768051a7b9c2f24e665015faf37f6de81785600578fe31500dfc805b4949515cc66dbdcf3b27c8c
-  data.tar.gz: 586ffbb28a70ee0157432317aa73076068766b01566656952fb0437bc2e5e5d0f1fcd56cb32ab2301f59f4bd0ef2760e85d88926e8018d62d337f8b1b9d8780a
+  metadata.gz: c0d26fc240f57980e3282c9a7d4d30ba3e76abc121fde1139f64aa3159b5df8f4e82105df6141dc1f3d783a2091d4a4f0f5d0ae93b75e66d79ddc39048442bd4
+  data.tar.gz: 8cd9283fd1b7f93ab1bb51db351b84df694c3a9e23e0f98a50c22a652eca8cc18eba19d3d81548649f7af4385700f222ef22014b07c2d1915710e1abc34384dd

data/app/views/metadata_presenter/attribute/_body.html.erb

@@ -4,7 +4,9 @@
                           type="content"
                           default-content="<%= default_text('body') %>"
                           content="<%= page_body_content %>"
-                          data-fb-content-id="<%= "page[body]" %>">
+                          data-fb-content-id="<%= "page[body]" %>"
+                          data-editor-label-key="aria.optional_content_label"
+                          data-editor-description-key="aria.optional_content_description">
               <div class="html">
                 <%= to_html(page_body_content) %>
               </div>

data/app/views/metadata_presenter/component/_multiupload.html.erb

@@ -31,9 +31,9 @@
     'aria-disabled': editable?,
     label: -> do %>
       <% if answered?(component.id) && @page_answers.send(component.id)[component.id].compact.count.positive? && !editable? %>
-        <h3 class="govuk-heading-s govuk-!-margin-top-8"><%= t('presenter.questions.multiupload.add_another') %></h3>
+        <h2 class="govuk-heading-s govuk-!-margin-top-8"><%= t('presenter.questions.multiupload.add_another') %></h2>
       <% else %>
-        <h3 class="govuk-visually-hidden"><%= t('presenter.questions.multiupload.add_another') %></h3>
+        <h2 class="govuk-visually-hidden"><%= t('presenter.questions.multiupload.add_another') %></h2>
       <% end %>
     <% end %>
   </div>

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

@@ -65,10 +65,12 @@
         </dl>
 
         <% if @page.send_heading.present? %>
-          <h2 class="fb-send-heading fb-editable govuk-heading-m"
+          <h2>
+            <span class="fb-send-heading fb-editable govuk-heading-m"
               data-fb-content-type="element"
               data-fb-content-id="page[send_heading]">
-            <%= @page.send_heading %>
+              <%= @page.send_heading %>
+            </span>
           </h2>
         <% end %>
 
@@ -102,9 +104,10 @@
         <%end%>
         <br><br>
         <div class="govuk-button-group">
-          <button <%= 'disabled' if editable? %> data-prevent-double-click="true" class="fb-block fb-block-actions govuk-button" data-module="govuk-button" data-block-id="actions" data-block-type="actions">
-            <%= t('presenter.actions.submit') -%></button>
-            <% if save_and_return_enabled? %>
+          <button <%= 'aria-disabled=true' if editable? %> data-prevent-double-click="true" class="fb-block fb-block-actions govuk-button" data-module="govuk-button" data-block-id="actions" data-block-type="actions">
+            <%= t('presenter.actions.submit') -%>
+          </button>
+          <% if save_and_return_enabled? %>
             <% if editor_preview? || editable? %>
               <%= 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 %>

data/app/views/metadata_presenter/page/confirmation.html.erb

@@ -34,9 +34,7 @@
                data-fb-content-id="page[lede]"
                data-fb-content-type="element"
                data-fb-default-text="<%= default_text('lede') %>">
-              <div class="html">
                 <%= @page.lede %>
-              </div>
           </div>
         <%- end %>
       </div>

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

@@ -38,7 +38,7 @@
                    } %>
 
         <div class="govuk-button-group">
-          <%= f.govuk_submit(t('presenter.actions.continue'), disabled: editable?) %>
+          <%= f.govuk_submit(t('presenter.actions.continue'), 'aria-disabled': editable?) %>
           <% if save_and_return_enabled? %>
             <% if editor_preview? || editable? %>
               <%= 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 %>

data/app/views/metadata_presenter/page/standalone.html.erb

@@ -29,11 +29,12 @@
         <% end %>
        <%# ORIGINAL TEMPLATE: Uses content from form metadata %>
        <% if @page.heading %>
-         <h1 class="fb-editable govuk-heading-xl"
+         <h1> <span class="fb-editable govuk-heading-xl"
              data-fb-content-id="page[heading]"
              data-fb-content-type="element"
              data-fb-default-value="<%= t("presenter.footer.#{@page.id.gsub('page.','')}.heading") %>">
            <%= @page.heading %>
+           </span>
          </h1>
        <% end %>
        <%= render 'metadata_presenter/attribute/body' %>

data/app/views/metadata_presenter/page/start.html.erb

@@ -7,7 +7,7 @@
 
       <%= form_tag(root_path, method: :post, authenticity_token: false) do %>
         <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
-        <button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
+        <button <%= 'aria-disabled=true' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
           <%= t('presenter.actions.start') -%>
           <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">
             <path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z" />

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/page/start.json

@@ -1,8 +1,8 @@
 {
-  "_id": "page.start",
-  "_type": "page.start",
-  "heading": "Service name goes here",
-  "body": "Use this service to apply for a service or contact us about a case.\r\n\r\n## Before you start\r\nYou will need:\r\n\r\n* your 8-digit reference number\r\n* a copy of your photo ID\r\n* something else\r\n\r\nThis form will take around 5 minutes to complete. We will reply within 10 working days.",
-  "before_you_start": "## Other ways to get in touch\r\nYou can also apply or contact us about your case by:\r\n\r\n* telephone: 01234 567889\r\n* email: <example.service@justice.gov.uk>\r\n\r\nThis form is also [available in Welsh (Cymraeg)](https://example-service.form.service.justice.gov.uk/).",
-  "url": "/"
+    "_id": "page.start",
+    "_type": "page.start",
+    "heading": "Service name goes here",
+    "body": "Use this service to apply for a service or contact us about a case.\r\n\r\n## Before you start\r\nYou will need:\r\n\r\n* your 8-digit reference number\r\n* a copy of your photo ID\r\n* something else\r\n\r\nThis form will take around 5 minutes to complete. We will reply within 10 working days.",
+    "before_you_start": "## Other ways to get in touch\r\nYou can also apply or contact us about your case by:\r\n\r\n* telephone: 01234 567889\r\n* email: <example.service@justice.gov.uk>\r\n\r\nThis form is also [available in Welsh (Cymraeg)](https://example-service.form.service.justice.gov.uk/).",
+    "url": "/"
 }

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.32'.freeze
+  VERSION = '3.3.34'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.32
+  version: 3.3.34
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-04-22 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