govuk_publishing_components 23.7.1 → 23.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63eb3e251bfdd3c16215cc72dbe7a225ba84dff4d1aac2fecfa393a17f737a59
-  data.tar.gz: 6645fbe499447ded996095c91e01a4e34ba1fc83e9b14bb872f1bc713798d2b8
+  metadata.gz: 4b65d39a36c66fce7a8137823bfc36e49e0da0a079aca53915b3d45285cae845
+  data.tar.gz: 34d3d5d5e175fa52e7ee61e5f259828a60d767d8b19bcc5c002010b3448a531c
 SHA512:
-  metadata.gz: 552b029895c0c121224f830891ac14c874557765be7abadb8e9527bb9ad658b7e3bf8ce142bc278391da411b25b3750578b386814c151ece65cd0588570a90d4
-  data.tar.gz: e339ad09ad94a7286ae59a559ba2b172068998f6e98c2c3f0257b4991e99e8e6dfde8781dfdc256478764c2cee5d107705a07f1dee02b05cb9d1c03554840e1a
+  metadata.gz: 64e67eaa447d97a8e42304b59c836e08131bde424cff2dac6631fae05bf035aa793d90a6987fd5af1777a6fe00e50d71f5cc176d9fc992ad8e0159ea649792f9
+  data.tar.gz: 59b458f62f226e28be467e1ae9c8eb4e7b5fde87dfbb09fdfe7eeb40c83190f91ecc1a3702973e459000bcb62318d5f30420c431a3b138ef28dc3807669f57a4

data/app/views/govuk_publishing_components/components/_contextual_sidebar.html.erb

@@ -1,4 +1,5 @@
 <% navigation = GovukPublishingComponents::Presenters::ContextualNavigation.new(content_item, request) %>
+<% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
 
 <div class="gem-c-contextual-sidebar">
   <% if navigation.show_brexit_cta? && navigation.step_by_step_count.zero? %>
@@ -16,7 +17,7 @@
         "track-dimension": t("components.related_navigation.transition.link_text"),
         "track-dimension-index": "29",
       },
-      lang: I18n.locale,
+      lang: shared_helper.t_locale("components.related_navigation.transition.title"),
     } %>
   <% end %>
 

data/app/views/govuk_publishing_components/components/_related_navigation.html.erb

@@ -1,4 +1,5 @@
 <% related_nav_helper = GovukPublishingComponents::Presenters::RelatedNavigationHelper.new(local_assigns) %>
+<% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
 
 <% if related_nav_helper.related_navigation? %>
   <% random = SecureRandom.hex(4) %>
@@ -8,7 +9,7 @@
       <h2 id="related-nav-related_items-<%= random %>"
           class="gem-c-related-navigation__main-heading"
           data-track-count="sidebarRelatedItemSection"
-          <%= related_nav_helper.t_lang(
+          <%= shared_helper.t_lang(
               "components.related_#{local_assigns[:context]}_navigation.related_content",
               default: 'components.related_navigation.related_content'
             )
@@ -28,6 +29,7 @@
 
       <%= render 'govuk_publishing_components/components/related_navigation/section',
         related_nav_helper: related_nav_helper,
+        shared_helper: shared_helper,
         section_title: section_title,
         links: links,
         section_index: section_index,

data/app/views/govuk_publishing_components/components/_transition_countdown.html.erb

@@ -7,10 +7,11 @@
   text ||= nil
   url ||= nil
   data_attributes ||= {}
-  lang ||= 'en'
+  lang ||= "en"
+  direction ||= "ltr"
   css_classes = %w(gem-c-transition-countdown)
-  css_classes << 'gem-c-transition-countdown--cta' if url
-  css_classes << 'govuk-link' if url
+  css_classes << "gem-c-transition-countdown--cta" if url
+  css_classes << "govuk-link" if url
 %>
 
 <% countdown = capture do %>
@@ -24,11 +25,11 @@
 <% end %>
 
 <% if url %>
-  <%= link_to url, class: css_classes, data: data_attributes, lang: lang do %>
+  <%= link_to url, class: css_classes, data: data_attributes, lang: lang, dir: direction do %>
     <%= countdown %>
   <% end %>
 <% else %>
-  <%= tag.div class: css_classes, lang: lang do %>
+  <%= tag.div class: css_classes, lang: lang, dir: direction do %>
     <%= countdown %>
   <% end %>
 <% end %>

data/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb

@@ -28,7 +28,7 @@
           link[:path],
           class: related_nav_helper.section_css_class("gem-c-related-navigation__section-link", section_title, link, (index >= section_link_limit)),
           rel: link[:rel],
-          lang: related_nav_helper.t_locale_check(link[:locale]),
+          lang: shared_helper.t_locale_check(link[:locale]),
           data: {
             track_category: 'relatedLinkClicked',
             track_action: "#{section_index}.#{index} #{related_nav_helper.construct_section_heading(section_title) || t('components.related_navigation.related_content')}",

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -97,48 +97,8 @@ module GovukPublishingComponents
         related_navigation.flat_map(&:last).any?
       end
 
-      def t_locale(content, options = {})
-        # Check if the content string has a translation
-        content_translation_available = translation_present?(content)
-
-        # True, return locale
-        this_locale = I18n.locale if content_translation_available
-        # If false, return default locale
-        this_locale = I18n.default_locale unless content_translation_available
-
-        # Check if default string passed in
-        if options[:default].present?
-          # Check if the default string has a translation
-          default_translation_available = translation_present?(options[:default])
-          # If true, return locale
-          this_locale = I18n.locale if default_translation_available
-          # If false, return default_locale
-          this_locale = I18n.default_locale unless default_translation_available
-        end
-
-        this_locale
-      end
-
-      def t_lang(content, options = {})
-        locale = t_locale(content, options)
-        "lang=#{locale}" unless locale.eql?(I18n.locale)
-      end
-
-      def t_locale_check(locale)
-        locale.presence unless locale.to_s.eql?(I18n.locale.to_s)
-      end
-
     private
 
-      def translation_present?(content)
-        default_string = "This is a string to act as a default for the `I18n.translate` method. Comparing the result reveals if there is a translation in the i18n files."
-        I18n.translate(
-          content,
-          default: default_string,
-          fallback: false,
-        ) != default_string
-      end
-
       def related_items
         related_quick_links = content_item_details_for("quick_links")
 

data/lib/govuk_publishing_components/presenters/shared_helper.rb

@@ -30,6 +30,48 @@ module GovukPublishingComponents
 
         "span"
       end
+
+      def t_locale(content, options = {})
+        # Check if the content string has a translation
+        content_translation_available = translation_present?(content)
+
+        # True, return locale
+        this_locale = I18n.locale if content_translation_available
+        # If false, return default locale
+        this_locale = I18n.default_locale unless content_translation_available
+
+        # Check if default string passed in
+        if options[:default].present?
+          # Check if the default string has a translation
+          default_translation_available = translation_present?(options[:default])
+          # If true, return locale
+          this_locale = I18n.locale if default_translation_available
+          # If false, return default_locale
+          this_locale = I18n.default_locale unless default_translation_available
+        end
+
+        this_locale
+      end
+
+      def t_lang(content, options = {})
+        locale = t_locale(content, options)
+        "lang=#{locale}" unless locale.eql?(I18n.locale)
+      end
+
+      def t_locale_check(locale)
+        locale.presence unless locale.to_s.eql?(I18n.locale.to_s)
+      end
+
+    private
+
+      def translation_present?(content)
+        default_string = "This is a string to act as a default for the `I18n.translate` method. Comparing the result reveals if there is a translation in the i18n files."
+        I18n.translate(
+          content,
+          default: default_string,
+          fallback: false,
+        ) != default_string
+      end
     end
   end
 end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "23.7.1".freeze
+  VERSION = "23.7.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 23.7.1
+  version: 23.7.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config