govuk_publishing_components 27.16.0 → 27.20.0

data/config/locales/zh.yml

@@ -1,48 +1,51 @@
 ---
 zh:
   common:
-    translations:
+    translations: 翻译
   components:
     accordion:
-      hide:
-      hide_all:
-      show:
-      show_all:
-      this_section_visually_hidden:
+      hide: 隐藏
+      hide_all: 隐藏所有小节
+      show: 显示
+      show_all: 显示所有小节
+      this_section_visually_hidden: " 本小节"
     article_schema:
-      scoped_search_description:
+      scoped_search_description: 在 %{title} 内搜索
     attachment:
-      opendocument_html:
-      order_a_copy:
+      opendocument_html: 本文件是 <a href='https://www.gov.uk/guidance/using-open-document-formats-odf-in-your-organisation' target=%{target} class='govuk-link'>开放式文本</a> 格式
+      order_a_copy: 订购副本
       page:
-        one:
-        other:
-      reference:
-      request_format_cta:
-      request_format_details_html:
-      request_format_text:
+        one: 1页
+        other: "%{count} 页"
+      reference: 参考号：%{reference}
+      request_format_cta: 申请可访问格式。
+      request_format_details_html: '如果您使用辅助技术（如屏幕阅读器），并需要更易于访问的格式，请发送电子邮件 <a href=''mailto:%{alternative_format_contact_email}'' target=''_blank'' class=''govuk-link''>%{alternative_format_contact_email}</a>。请告诉我们您需要什么格式。如果您能说出自己使用的辅助技术，这对我们很有帮助。  '
+      request_format_text: 此文件可能不适合辅助技术用户使用。
     back_link:
-      back:
+      back: 向后
     character_count:
-      body:
+      body: 您最多可以输入 %{number} 个 %{type}
       type:
-        characters:
-        words:
+        characters: 字符
+        words: 单词
     checkboxes:
-      or:
+      or: 或
     contents_list:
-      contents:
+      contents: 目录
     contextual_sidebar:
-      pretitle:
+      pretitle: 也是部分
     cookie_banner:
       buttons:
-        accept_cookies:
-        reject_cookies:
-      confirmation_message:
-      confirmation_message_link:
-      hide:
+        accept_cookies: 接受额外cookies
+        reject_cookies: 拒绝额外cookies
+      confirmation_message_html: 您可以随时 %{link}。
+      confirmation_message_link: 更改您的cookie设置
+      hide: 隐藏此消息
       text:
-      title:
+      - 我们使用一些基本的cookie以使本网站运作。
+      - 我们希望设置额外的cookie，以了解您如何使用GOV.UK，记住您的设置，并改善政府服务。
+      - 我们也使用其他网站设置的cookie，以帮助我们提供其服务的内容。
+      title: GOV.UK上的Cookies
     devolved_nations:
       applies_to:
       connectors:
@@ -51,69 +54,59 @@ zh:
       england:
       northern_ireland:
       scotland:
+      type:
+        consultation:
+        detailed_guide:
+        guidance:
+        publication:
       wales:
     feedback:
-      close:
-      dont_include_personal_info:
-      email_address:
-      help_us_improve_govuk:
-      is_not_useful:
-      is_this_page_useful:
-      is_useful:
-      maybe:
-      more_about_visit:
-      'no':
-      send:
-      send_me_survey:
-      something_wrong:
-      thank_you_for_feedback:
-      what_doing:
-      what_wrong:
-      'yes':
+      close: 关闭
+      dont_include_personal_info: 不要包含个人或财务信息，比如您的国家保险号或信用卡信息。
+      email_address: 电子邮箱地址
+      help_us_improve_govuk: 帮助我们改善GOV.UK
+      is_not_useful: 这个页面没有用
+      is_this_page_useful: 这个页面有用吗？
+      is_useful: 这个页面很有用
+      maybe: 可能
+      more_about_visit: 为了帮助我们改进GOV.UK，我们想了解更多关于您今天访问的信息。我们会给您发一个反馈表格的链接。只需2分钟即可填完。别担心，我们不会给您发垃圾邮件或将您的电子邮件地址分享给任何人。
+      'no': 否
+      send: 发送
+      send_me_survey: 将调查表发给我
+      something_wrong: 报告此页面的问题
+      thank_you_for_feedback: 非常感谢您的反馈
+      what_doing: 您在干什么？
+      what_wrong: 发生了哪些错误？
+      'yes': 是
     government_navigation:
-      consultations:
-      departments:
-      get-involved:
-      how-government-works:
-      news_and_communications:
-      statistics:
-      worldwide:
-    intervention:
-      description:
-      dismiss_link_text:
-      dismiss_post_link:
-      title:
+      consultations: 咨询
+      departments: 部门
+      get-involved: 参与
+      how-government-works: 政府如何运营
+      news_and_communications: 新闻和通讯
+      statistics: 统计数据
+      worldwide: 全世界
     layout_footer:
-      copyright_html:
-      licence_html:
-      support_links:
+      copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown版权所有</a>
+      licence_html: 除另有说明外，所有内容均可在 <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">开放政府许可证第3.0版</a>获取
+      support_links: 支持链接
     layout_for_public:
       account_layout:
         feedback:
           banners:
-            footer_intro:
-            footer_link:
-            footer_outro:
-            phase_intro:
-            phase_link:
-            phase_outro:
-            title:
+            phase_banner_html:
         navigation:
-          destroy_user_session:
           menu_bar:
             account:
               link_text:
             manage:
               link_text:
-            security:
-              link_text:
-          user_root_path:
     layout_header:
-      hide_button:
-      menu:
-      search_button:
-      show_button:
-      top_level:
+      hide_button: 隐藏搜索
+      menu: 菜单
+      search_button: 搜索GOV.UK
+      show_button: 显示搜索
+      top_level: 最高级
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
@@ -128,77 +121,83 @@ zh:
       popular_links_heading:
       search_text:
     metadata:
-      from:
-      history:
-      last_updated:
-      part_of:
-      published:
-      see_all_updates:
-      toggle_less:
-      toggle_more:
+      from: 从
+      history: 历史
+      last_updated: 上次更新
+      part_of: 一部分
+      published: 已发布
+      see_all_updates: 查看全部更新
+      toggle_less: 显示更少
+      toggle_more: "+ %{number}更多"
     modal_dialogue:
-      close_modal:
+      close_modal: 关闭模态对话
     notice:
       banner_title:
     organisation_schema:
-      all_content_search_description:
+      all_content_search_description: 查找 %{organisation} 的全部内容
     previous_and_next_navigation:
-      pagination:
+      pagination: 分页
     print_link:
-      text:
+      text: 打印本页面
     radio:
-      or:
+      or: 或
     related_footer_navigation:
-      collections:
-      policies:
-      statistical_data_sets:
-      topical_events:
+      collections: 待整理
+      policies: 策略
+      statistical_data_sets: 统计数据集
+      topical_events: 局部事件
     related_navigation:
-      collections:
-      external_links:
-      policies:
-      publishers:
-      related_contacts:
-      related_content:
-      related_external_links:
-      related_guides:
-      statistical_data_sets:
-      topical_events:
-      topics:
+      collections: 待整理
+      external_links: 网页上的其它地方
+      policies: 策略
+      publishers: 发布者
+      related_contacts: 其他联系人
+      related_content: 相关内容
+      related_external_links: 网页上的其它地方
+      related_guides: 详细指南
+      statistical_data_sets: 统计数据集
+      topical_events: 局部事件
+      topics: 探索本主题
       transition:
-        link_path:
-        link_text:
-        title:
-      world_locations:
+        hub_page_link_path: "/transition-check/questions"
+        hub_page_link_text: 获得个性化的操作列表
+        hub_page_title: 英国脱欧检查程序
+        link_path: "/brexit"
+        link_text: 检查您需要做的事情
+        title: 英国脱欧
+      world_locations: 世界地点
     search_box:
-      input_title:
-      label:
-      search_button:
+      input_title: 搜索
+      label: 搜索GOV.UK
+      search_button: 搜索
     show_password:
-      announce_hide:
-      announce_show:
-      hide:
-      hide_password:
-      show:
-      show_password:
+      announce_hide: 您的密码已隐藏
+      announce_show: 您的密码已显示
+      hide: 隐藏
+      hide_password: 隐藏密码
+      show: 显示
+      show_password: 显示密码
+    single_page_notification_button:
+      subscribe_text:
+      unsubscribe_text:
     skip_link:
-      text:
+      text: 跳过主要内容
     step_by_step_nav:
-      hide:
-      hide_all:
-      show:
-      show_all:
+      hide: 隐藏
+      hide_all: 隐藏全部步骤
+      show: 显示
+      show_all: 显示全部步骤
     step_by_step_nav_related:
-      part_of:
+      part_of: 一部分
     subscription_links:
-      email_signup_link_text:
-      feed_link_label:
-      feed_link_text:
-      subscriptions:
+      email_signup_link_text: 获取电子邮件
+      feed_link_label: 将此URL复制并粘贴到推送阅读器
+      feed_link_text: 订阅推送
+      subscriptions: 订阅
     success_alert:
-      success:
+      success: 成功
     summary_list:
-      delete:
-      edit:
+      delete: 删除
+      edit: 更改
     tabs:
-      contents:
+      contents: 目录

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -108,146 +108,22 @@ module GovukPublishingComponents
         false
       end
 
-      def show_brexit_related_links?
-        # If tagged directly to /brexit or /world/brexit
-        # Or if tagged to a taxon which has /brexit as a parent
-        # And is not the brexit hub pages
-        return false if brexit_hub_pages.include?(content_item["content_id"])
-
-        tagged_to_brexit?
-      end
-
-      def brexit_cta_document_exceptions
-        # /government/news/30-creative-teams-awarded-up-to-100000-each-for-festival-uk-2022-rd-project
-        # and answer pages that have a start button (tracked in https://docs.google.com/spreadsheets/d/1ynH8zIjvElvK-u8JLI8KOYylxTbzJsoXRqEnqrnqv_4/edit)
-        %w[
-          c3752802-f091-43a9-ba90-33568fccf391
-          e1a9ce2b-4085-4761-b70f-d125a6571de3
-          6a2bf66e-2313-4204-afd5-9940de5e1d66
-          f65b0ac7-b8cd-476b-bd5d-738268517659
-          45ad868a-2e79-4029-991b-c29559d7eb29
-          e4e9c4ec-385e-4758-93ac-388bc154815e
-          cee73f76-83f0-44e2-b657-3b51a9cbc76e
-          9a945506-60bc-44d8-a2ec-0eb2824732d6
-          6ae16c12-a554-44e2-b3e3-596375aa1b9a
-          9add4ccc-dc4c-44cf-9b69-6878c162d431
-          4f5cf1cd-efda-4c49-8292-1db1c6c3cfb0
-          73058592-dedf-4379-9a1d-d8222a796c0a
-          c9259172-5432-43a6-b710-409d463c7627
-          59ecfc6d-cb9e-49b8-b013-fc368ebdf8ed
-          9897695d-624b-4cb9-b873-f3113f0332a1
-          715f4659-b058-46ec-84c8-cc346c210778
-          c63890f9-2356-4be3-9e07-6cf4b8de7081
-          e7661ec8-b678-444e-b4d0-a221fa83a7f7
-          723f9c0a-bcdb-4d8f-952c-6df0ed468c57
-          a1c420b7-11d7-4b9c-a97e-406fb73c0200
-          c1347936-839b-4547-a570-0c315c34ee45
-          1396f68b-6ffa-47ef-a049-414e7b548e81
-          3b054acf-d0af-470e-b912-9481204d1a9a
-          317b9c08-928b-4fd2-bc8e-4c6acf287c58
-          44d6cb7a-d853-4cd8-a9cb-69eff0299d9e
-          15517245-f142-4e45-ad84-773250f7d5a2
-          6fe6644d-d037-4ea4-baf6-800dc1966ed0
-          4a63625c-a195-4b86-9562-cb6653dd26ff
-          47521233-20a8-4d02-ba31-6e1977448fd1
-          7b8ca4ac-f3a3-41b8-9555-9e244c36575b
-          be1a82d1-e53c-431a-9e7a-337ed4b2654f
-          6c445001-4e29-4853-8c14-444d7f9374ee
-          c8cf2a7c-5c13-4f3d-b1ff-6a7eb5533973
-          2422a237-f8f1-4e9f-ad51-f1d44fde9755
-          ae000c08-c74f-467b-b8a4-90f138252a5c
-          7eec7800-9c4d-4160-af53-57b5d3e02972
-          eb545b3b-111b-4c3c-890c-c9ec29b9090d
-          8d705ade-8977-480d-9080-72a19e341c2a
-          2a0dd317-0252-4c7c-8c13-b43af28406bc
-          f27e5792-a84b-4164-9890-7e86767634e8
-          b0b9a600-1fe6-4257-9e68-2be0f59ea25d
-          28fa04ea-42e1-46ad-9abc-acf132c5666d
-          64b27b8a-ae53-4034-a812-f4805cd7e3ad
-          1dd5a75f-18b4-419d-b2b6-6d4808f2c7e4
-          b21b9e34-455c-4305-b4cc-4e6b8d3f7522
-          0ab53a0d-b098-43a8-b3cc-8b3224697228
-          e3862156-ba5a-41ba-8ee6-22e5cd6a6144
-          2e8f7fae-7164-459c-898b-0c0538eee3e0
-          6087439c-26d2-4881-b345-5160e23f3b5e
-          cac78a0a-9c28-436a-a29e-8ccbe8fbc956
-          c2fd13a5-537b-4368-ac2e-6078b2c463f1
-          98f0a21d-7b67-4089-a98c-f0a0177291a2
-          06692612-8c39-464c-8aee-2aa62e6c8887
-          df943977-69cb-479d-a921-9410d603c471
-          2656eb6b-f2eb-4982-8a90-e40d03a34a4d
-          4ca8698b-4a24-45ff-baea-7633cc24b679
-          ed73581f-9bf8-48b5-bb66-935581a255e3
-          15f1c594-af1d-4f16-97cc-ad4d12017509
-        ] + brexit_hub_pages
-      end
-
-      # we don't want to show the standard Brexit sidebar nav on
-      # https://www.gov.uk/guidance/brexit-guidance-for-individuals-and-families or
-      # https://www.gov.uk/guidance/brexit-guidance-for-businesses
-      # as it might result in circular journeys
-      def brexit_hub_pages
-        %w[
-          91cd6143-69d5-4f27-99ff-a52fb0d51c78
-          6555e0bf-c270-4cf9-a0c5-d20b95fab7f1
-        ]
-      end
-
-      def brexit_cta_document_exception?
-        brexit_cta_document_exceptions.include?(content_item["content_id"])
-      end
-
-      def brexit_cta_document_type_exceptions
-        %w[
-          aaib_report
-          asylum_support_decision
-          fatality_notice
-          maib_report
-          raib_report
-          simple_smart_answer
-          smart_answer
-          transaction
-        ]
-      end
-
-      def brexit_cta_document_type_exception?
-        brexit_cta_document_type_exceptions.include?(content_item["document_type"])
-      end
-
       def brexit_cta_taxon_allow_list
-        # Entering and staying in the UK
-        # Going and being abroad
-        # Corporate information
-        # Transport
-        # Environment
-        # International
-        # Defence and armed forces
-        # Work
-        # Welfare
-        # Money
-        # Business and industry
-        # Health and social care
-        # Education > Further and higher education
-        # Education > Teaching and leadership
-        # Education > Funding and finance for students
-        # Coronavirus (COVID-19)
+        # Overseas businesses: exporting to the UK
+        # Exporting goods and services
+        # Exporting
+        # Manufacturing, wholesaling, importing and exporting medicines
+        # Importing goods and services
+        # Importing
+        # Manufacturing, wholesaling, importing and exporting medicines
         %w[
-          ba3a9702-da22-487f-86c1-8334a730e559
-          9597c30a-605a-4e36-8bc1-47e5cdae41b3
-          a544d48b-1e9e-47fb-b427-7a987c658c14
-          a4038b29-b332-4f13-98b1-1c9709e216bc
-          3cf97f69-84de-41ae-bc7b-7e2cc238fa58
-          37d0fa26-abed-4c74-8835-b3b51ae1c8b2
-          e491505c-77ae-45b2-84be-8c94b94f6a2b
-          d0f1e5a3-c8f4-4780-8678-994f19104b21
-          dded88e2-f92e-424f-b73e-6ad24a839c51
-          6acc9db4-780e-4a46-92b4-1812e3c2c48a
-          495afdb6-47be-4df1-8b38-91c8adb1eefc
-          8124ead8-8ebc-4faf-88ad-dd5cbcc92ba8
-          dd767840-363e-43ad-8835-c9ab516633de
-          ff00b8b2-dcdb-4659-93c2-291c9be354f3
-          23265b25-7ec3-4960-8517-4ff8d4d92cac
-          5b7b9532-a775-4bd2-a3aa-6ce380184b6c
+          2f8b848d-23c8-4f42-a41a-df1f81c64d0f
+          8af13fba-d969-4d87-a02e-2e71783d47be
+          efa9782b-a3d0-4ca0-9c92-3b89748175b7
+          f441e630-2bba-4bbd-8c1b-22ae61cc00c2
+          4788b4b8-2642-47ca-bfc2-bd7e8705a1da
+          d74faafc-781d-4087-8e0c-be4216180059
+          f441e630-2bba-4bbd-8c1b-22ae61cc00c2
         ]
       end
 
@@ -261,10 +137,6 @@ module GovukPublishingComponents
         false
       end
 
-      def brexit_cta_lang_allow_list?
-        %w[en cy].include?(content_item["locale"])
-      end
-
       def parent_taxon_include?(taxon, taxon_list)
         if taxon.present?
           if taxon.dig("links", "parent_taxons").to_a.any? { |taxon_item| taxon_list.include?(taxon_item["content_id"]) }
@@ -277,46 +149,46 @@ module GovukPublishingComponents
         end
       end
 
-      def brexit_cta_taxon_exception_list
-        # Entering and staying in the UK > Immigration offences
-        # Entering and staying in the UK > Inspections of border, immigration and asylum services
-        # Entering and staying in the UK > Refugees, asylum and human rights
-        # Transport > Local transport
-        # Education > Further and higher education > Education in prisons
+      def show_brexit_cta?
+        brexit_cta_taxon_allow_list?
+      end
+
+      def show_covid_booster_cta?
+        !covid_booster_cta_document_type_exempt? &&
+          !covid_booster_cta_taxon_exception_list?
+      end
+
+      def covid_booster_cta_document_type_exempt?
+        covid_booster_cta_document_type_exceptions.include?(content_item["document_type"])
+      end
+
+      def covid_booster_cta_document_type_exceptions
         %w[
-          fa13521f-9285-45b0-bd65-4a472a8037e7
-          0fab9131-f877-4286-b4d8-922fbfb402b6
-          08a8a69f-2825-4fe2-a4cf-c83458a5629e
-          3b4d6319-fcef-4637-b35a-e3df76321894
-          6426d1c5-93c8-4659-85d5-1f0d3368a124
+          simple_smart_answer
+          smart_answer
+          step_by_step_nav
         ]
       end
 
-      def brexit_cta_taxon_exception_list?
+      def covid_booster_cta_taxon_exception_list?
         taxons = content_item.dig("links", "taxons").to_a
         taxons.each do |taxon|
-          if brexit_cta_taxon_exception_list.include?(taxon["content_id"]) || parent_taxon_include?(taxon, brexit_cta_taxon_exception_list)
+          if covid_booster_cta_taxon_exception_list.include?(taxon["content_id"]) || parent_taxon_include?(taxon, covid_booster_cta_taxon_exception_list)
             return true
           end
         end
         false
       end
 
-      def brexit_cta_exception?
-        brexit_cta_document_exception? ||
-          brexit_cta_document_type_exception? ||
-          brexit_cta_taxon_exception_list?
-      end
-
-      def show_brexit_cta?
-        brexit_cta_taxon_allow_list? &&
-          brexit_cta_lang_allow_list? &&
-          step_by_step_count.zero? &&
-          !brexit_cta_exception?
-      end
-
-      def step_by_step_count
-        step_nav_helper.step_navs.count
+      def covid_booster_cta_taxon_exception_list
+        # Welfare > Death and benefits
+        # Life circumstances > Death and bereavement
+        # Life circumstances > Death registration disclosure
+        %w[
+          ac7b8472-5d09-4679-9551-87847b0ac827
+          0fffa994-b76d-4539-8bf9-2a6c6751580d
+          de978199-11e8-49b9-965e-4fa6a7ae79a8
+        ]
       end
 
       def content_tagged_to_current_step_by_step?

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -13,6 +13,9 @@ module GovukPublishingComponents
         @image_src = local_assigns[:image_src]
         @image_alt = local_assigns[:image_alt] || ""
         @image_loading = local_assigns[:image_loading] || "auto"
+        @srcset = local_assigns[:srcset] || nil
+        @sizes = local_assigns[:sizes] || nil
+        @image_loading = local_assigns[:image_loading] || "auto"
         @context = local_assigns[:context]
         @description = local_assigns[:description]
         @large = local_assigns[:large]
@@ -36,7 +39,14 @@ module GovukPublishingComponents
       def image
         if @image_src
           content_tag(:figure, class: "gem-c-image-card__image-wrapper") do
-            image_tag(@image_src, class: "gem-c-image-card__image", alt: @image_alt, loading: @image_loading)
+            image_tag(
+              @image_src,
+              class: "gem-c-image-card__image",
+              alt: @image_alt,
+              loading: @image_loading,
+              sizes: @sizes,
+              srcset: @srcset,
+            )
           end
         end
       end

data/lib/govuk_publishing_components/presenters/single_page_notification_button_helper.rb

@@ -1,7 +1,7 @@
 module GovukPublishingComponents
   module Presenters
     class SinglePageNotificationButtonHelper
-      attr_reader :already_subscribed, :data_attributes, :base_path, :js_enhancement, :button_type, :button_location
+      attr_reader :already_subscribed, :data_attributes, :base_path, :js_enhancement, :button_type, :button_location, :classes
 
       def initialize(local_assigns)
         @local_assigns = local_assigns
@@ -11,6 +11,8 @@ module GovukPublishingComponents
         @base_path = @local_assigns[:base_path] || nil
         @button_location = button_location_is_valid? ? @local_assigns[:button_location] : nil
         @button_type = @local_assigns[:already_subscribed] ? "Unsubscribe" : "Subscribe"
+        @classes = %w[gem-c-single-page-notification-button]
+        @classes << "js-personalisation-enhancement" if js_enhancement
       end
 
       def data

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "27.16.0".freeze
+  VERSION = "27.20.0".freeze
 end