metadata_presenter 2.17.3 → 2.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c079c0847adaccf21574a07a32cf5a4fddf1fba7e8466f1b0b0d60f38fefab7a
-  data.tar.gz: eafb0dc710884f01c8e30fcc2ede557dc0fc2da5c8995c312f2a748556b3e4ef
+  metadata.gz: 1319d1ef92929cfe90e5d393ab22b300017dea7a20463d146a420b074722dcb8
+  data.tar.gz: 462da18acdf93f6e97500a543e9f0151eec78bc0670f04c0b57388c1962efd8b
 SHA512:
-  metadata.gz: 87324f9fcefbe834370f94c5e1cff7cf3e059436426bbc436caeee9e8e39d1a779e6fe986ba042ba2123e5eb124f5c7c495d60d09bbd275f248662ae270036b5
-  data.tar.gz: 3ac5eebef758cd8f6bc40b6bb067baa47566d318fa3d0b8c830cf8718dd038ceafb9ff835484d160bd9fca8cb41ce76b2d69b2b7a6f6fcbb6a4d7d0fa8a6f7f3
+  metadata.gz: 9b27f1e84d0e2b713ca2a1ee1ed36623bdf18b1585e723207c4247d88fadc760b8530c68e38161f9365d1e464f85d909be27760eba588da06deff6df666b0318
+  data.tar.gz: 8a60e5b0ae4fbb55d6def14a76d2dc91d89a1c4abb167d0fd4c2a2824147808aa3f6055384315a3d5e67db35b78f2a4f6d063b9c8926cfc492756b4ee3534830

data/app/views/metadata_presenter/analytics/_ga4.html.erb

@@ -1,10 +1,16 @@
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= analytic_tag %>"></script>
+<!-- Google Analytics 4 -->
+<% if Rails.application.config.global_ga4.present? %>
+<script>
+  gtag('config', '<%= measurement_id %>');
+</script>
+<% else %>
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
-  gtag('config', '<%= analytic_tag %>');
+  gtag('config', '<%= measurement_id %>');
 </script>
-<!-- End Global site tag (gtag.js) - Google Analytics -->
+<% end %>
+<!-- End Google Analytics 4 -->

data/app/views/metadata_presenter/analytics/_global_analytics.html.erb

@@ -0,0 +1,10 @@
+<!-- Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '<%= measurement_id %>');
+</script>
+<!-- End Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->

data/app/views/metadata_presenter/analytics/_google.html.erb

@@ -1,5 +1,5 @@
 <% analytics.each do |analytic| %>
   <% if ENV[analytic].present? %>
-    <%= render partial: "metadata_presenter/analytics/#{analytic.downcase}", locals: { analytic_tag: ENV[analytic] } %>
+    <%= render partial: "metadata_presenter/analytics/#{analytic.downcase}", locals: { measurement_id: ENV[analytic] } %>
   <% end %>
 <% end %>

data/app/views/metadata_presenter/analytics/_gtm.html.erb

@@ -3,5 +3,5 @@
 new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','<%= analytic_tag %>');</script>
+})(window,document,'script','dataLayer','<%= measurement_id %>');</script>
 <!-- End Google Tag Manager -->

data/app/views/metadata_presenter/analytics/_ua.html.erb

@@ -5,7 +5,7 @@
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-  ga('create', '<%= analytic_tag %>', 'auto');
+  ga('create', '<%= measurement_id %>', 'auto');
   ga('send', 'pageview');
 </script>
 <!-- End Google Universal Analytics -->

data/app/views/metadata_presenter/analytics/analytics.html.erb

@@ -1,3 +1,7 @@
+<% if Rails.application.config.global_ga4.present? %>
+  <%= render partial: 'metadata_presenter/analytics/global_analytics', locals: { measurement_id: Rails.application.config.global_ga4 } %>
+<% end %>
+
 <% Rails.application.config.supported_analytics.each do |provider, analytics| %>
   <%= render partial: "metadata_presenter/analytics/#{provider}", locals: { analytics: analytics } %>
 <% end %>

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

@@ -85,7 +85,7 @@
                  } %>
 
         <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">
-        Accept and send application
+          <%= t('actions.submit') -%>
         </button>
       <% end %>
 

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

@@ -8,7 +8,7 @@
       <%- end %>
        <%= form_tag(reserved_answers_path, method: :post) do  %>
         <button class='govuk-button govuk-button--start govuk-!-margin-top-2'>
-        Continue
+          <%= t('actions.continue') -%>
           <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" />
           </svg>

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

@@ -7,7 +7,7 @@
 
       <%= form_tag(root_path, method: :post) do %>
         <button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
-          Start now
+          <%= t('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" />
           </svg>

data/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+  actions:
+    start: Start Now
+    continue: Continue
+    submit: Submit
   analytics:
     heading: Cookies on %{service_name}
     body_1: We use some essential cookies to make this service work.

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.17.3'.freeze
+  VERSION = '2.17.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.17.3
+  version: 2.17.4
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -335,6 +335,7 @@ files:
 - app/views/layouts/metadata_presenter/application.html.erb
 - app/views/metadata_presenter/analytics/_cookie_banner.html.erb
 - app/views/metadata_presenter/analytics/_ga4.html.erb
+- app/views/metadata_presenter/analytics/_global_analytics.html.erb
 - app/views/metadata_presenter/analytics/_google.html.erb
 - app/views/metadata_presenter/analytics/_gtm.html.erb
 - app/views/metadata_presenter/analytics/_ua.html.erb