govuk_publishing_components 57.1.0 → 57.3.0

data/config/locales/zh.yml

@@ -58,18 +58,27 @@ zh:
     devolved_nations:
       applies_to:
       aria_label:
-      connectors:
-        last_word:
-        two_words:
       england:
+        end:
+        middle:
+        start:
       northern_ireland:
+        end:
+        middle:
+        start:
       scotland:
+        end:
+        middle:
+        start:
       type:
         consultation:
         detailed_guide:
         guidance:
         publication:
       wales:
+        end:
+        middle:
+        start:
     feedback:
       close: 关闭
       dont_include_personal_info: 不要包含个人或财务信息，比如您的国家保险号或信用卡信息。

data/lib/govuk_publishing_components/presenters/devolved_nations_helper.rb

@@ -9,20 +9,21 @@ module GovukPublishingComponents
       end
 
       def applicable_nations_title_text(use_english_translation = nil)
-        @national_applicability
-          .select { |_, v| v[:applicable] == true }
-          .map { |k, _| get_translation("components.devolved_nations.#{k}", use_english_translation) }
-          .sort
-          .to_sentence(
-            two_words_connector: get_translation("components.devolved_nations.connectors.two_words", use_english_translation),
-            last_word_connector: get_translation("components.devolved_nations.connectors.last_word", use_english_translation),
-          )
+        nation_keys = @national_applicability
+                    .select { |_, v| v[:applicable] == true }
+                    .map { |k, _| k }
+        nation_keys.each_with_index.map { |k, i| name_for_position(k, i, nation_keys.count, use_english_translation) }.join
       end
 
-      def get_translation(key, use_english_translation = nil)
-        return I18n.t(key, locale: :en) if use_english_translation
-
-        I18n.t(key)
+      def name_for_position(nation, position, total, use_english_translation)
+        key = if position.zero?
+                :start
+              elsif position == (total - 1)
+                :end
+              else
+                :middle
+              end
+        I18n.t("components.devolved_nations.#{nation}.#{key}", locale: use_english_translation ? :en : nil)
       end
 
       def ga4_applicable_nations_title_text(remove_connector_word = nil)
@@ -40,7 +41,7 @@ module GovukPublishingComponents
       end
 
       def alternative_content_text(name)
-        nation = I18n.t("components.devolved_nations.#{name}")
+        nation = I18n.t("components.devolved_nations.#{name}.start")
 
         if I18n.exists?("components.devolved_nations.type.#{@content_type}")
           I18n.t("components.devolved_nations.type.#{@content_type}", nation:)

data/lib/govuk_publishing_components/presenters/select_helper.rb

@@ -44,13 +44,15 @@ module GovukPublishingComponents
           [
             option[:text],
             option[:value],
-            options_data_attribute(option[:data_attributes]),
+            options_extra_attributes(option[:data_attributes], option[:disabled]),
           ]
         end
       end
 
-      def options_data_attribute(attributes)
-        return {} if attributes.nil?
+      def options_extra_attributes(attributes, disabled)
+        attrs = {}
+        attrs[:disabled] = true if disabled
+        return attrs if attributes.nil?
 
         attrs = {}
         attributes.each do |key, value|

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "57.1.0".freeze
+  VERSION = "57.3.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 57.1.0
+  version: 57.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -437,6 +437,7 @@ files:
 - app/assets/images/govuk_publishing_components/image-card-srcset/cop26-320.jpg
 - app/assets/images/govuk_publishing_components/image-card-srcset/cop26-480.jpg
 - app/assets/images/govuk_publishing_components/image-card-srcset/cop26.jpg
+- app/assets/images/govuk_publishing_components/intervention/hmrc.svg
 - app/assets/images/govuk_publishing_components/take-action-amber.svg
 - app/assets/images/govuk_publishing_components/take-action-green.svg
 - app/assets/images/govuk_publishing_components/take-action-red.svg