govuk_publishing_components 57.0.0 → 57.2.0

data/config/locales/ro.yml

@@ -61,18 +61,27 @@ ro:
     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: Închideți
       dont_include_personal_info: Nu includeți informații cu caracter personal sau financiar, precum numărul de asigurări sociale sau datele cardului de credit.

data/config/locales/ru.yml

@@ -64,18 +64,27 @@ ru:
     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/config/locales/si.yml

@@ -60,18 +60,27 @@ si:
     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/config/locales/sk.yml

@@ -65,18 +65,27 @@ sk:
     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: Zatvoriť
       dont_include_personal_info: Neuvádzajte osobné ani finančné údaje, ako je číslo vášho národného poistenia alebo údaje o kreditnej karte.

data/config/locales/sl.yml

@@ -67,18 +67,27 @@ sl:
     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: Zapri
       dont_include_personal_info: Ne vključujte osebnih ali finančnih podatkov, na primer številke zavarovanja ali podatkov o kreditni kartici.

data/config/locales/so.yml

@@ -60,18 +60,27 @@ so:
     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: Xidhan
       dont_include_personal_info: Oo aanay kujirin macluumaadka shaqsiyadeed ama maaliyadeed sida lambarka Caymiska Qaranka ama faah-faahinta kiridhit kaadhka.

data/config/locales/sq.yml

@@ -60,18 +60,27 @@ sq:
     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: Mbyll
       dont_include_personal_info: Mos përfshini informacione personale ose financiare si numri juaj i Sigurimit Kombëtar ose detajet e kartës së kreditit.

data/config/locales/sr.yml

@@ -61,18 +61,27 @@ sr:
     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: Zatvori
       dont_include_personal_info: Nemojte navoditi lični ili finansijske podatke, na primer svoj broj osiguranja ili podatke o kreditnoj kartici.

data/config/locales/sv.yml

@@ -60,18 +60,27 @@ sv:
     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: Stäng
       dont_include_personal_info: Ange inte personlig eller finansiell information, t.ex. ditt försäkringsnummer eller kreditkortsuppgifter.

data/config/locales/sw.yml

@@ -60,18 +60,27 @@ sw:
     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: Funga
       dont_include_personal_info: Usiweke maelezo ya kibinafsi au ya fedha kama vile nambari yako ya Bima ya Kitaifa au maelezo ya kadi yako ya mikopo.

data/config/locales/ta.yml

@@ -61,18 +61,27 @@ ta:
     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/config/locales/th.yml

@@ -58,18 +58,27 @@ th:
     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: อย่าใส่ข้อมูลส่วนบุคคลหรือข้อมูลทางการเงิน เช่น หมายเลขประกันสังคม (National Insurance) หรือรายละเอียดบัตรเครดิต

data/config/locales/tk.yml

@@ -61,18 +61,27 @@ tk:
     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: Ýapyk
       dont_include_personal_info: Milli ätiýaçlandyryş belgiňiz ýa-da töleg kartlaryňyza degişli maglumatlaryňyz ýaly şahsy ýa-da maliýe maglumatlary goşmaň.

data/config/locales/tr.yml

@@ -61,18 +61,27 @@ tr:
     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: Kapat
       dont_include_personal_info: Ulusal Sigorta numaranız veya kredi kartı bilgileriniz gibi kişisel veya ekonomik bilgileri eklemeyin.

data/config/locales/uk.yml

@@ -67,18 +67,27 @@ uk:
     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/config/locales/ur.yml

@@ -57,18 +57,27 @@ ur:
     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/config/locales/uz.yml

@@ -62,18 +62,27 @@ uz:
     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/config/locales/vi.yml

@@ -59,18 +59,27 @@ vi:
     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: Đóng
       dont_include_personal_info: Không bao gồm thông tin cá nhân hoặc thông tin tài chính như số Bảo hiểm Quốc gia hoặc chi tiết thẻ tín dụng của bạn.

data/config/locales/zh-hk.yml

@@ -58,18 +58,27 @@ zh-hk:
     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/config/locales/zh-tw.yml

@@ -58,18 +58,27 @@ zh-tw:
     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/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/middleware/ga4_optimise.rb

@@ -0,0 +1,33 @@
+module GovukPublishingComponents
+  module Middleware
+    class Ga4Optimise
+      DATA_GA4_REGEX = /data-ga4-(?:link|event|form|focus-loss)=("[^"]*")/
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        status, headers, response = @app.call(env)
+        return [status, headers, safe_body_from_response(response)] unless headers["content-type"]&.start_with?("text/html")
+
+        body = response.each.first
+        matched_sections = body.scan(DATA_GA4_REGEX)
+
+        if matched_sections.any?
+          matched_sections.each do |section|
+            body.sub!(section.first, section.first.gsub('"', "'").gsub("&quot\;", '"'))
+          end
+        end
+
+        [status, headers, [body]]
+      end
+
+      def safe_body_from_response(response)
+        return [response.body] if response.respond_to?(:body)
+
+        response
+      end
+    end
+  end
+end