govuk_publishing_components 32.0.0 → 33.0.0

data/config/locales/pt.yml

@@ -164,13 +164,16 @@ pt:
         link_text: Verifique o que precisa de fazer
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Locais mundiais
     search_box:
       input_title: Pesquisar
       label: Pesquisar em GOV.UK
       search_button: Pesquisar
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: A sua palavra-passe é ocultada
       announce_show: A sua palavra-passe é mostrada

data/config/locales/ro.yml

@@ -165,13 +165,16 @@ ro:
         link_text: Verificați ce trebuie să faceți
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Locații pe glob
     search_box:
       input_title: Căutați
       label: Căutați pe GOV.UK
       search_button: Căutați
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Parola dvs. este ascunsă
       announce_show: Parola dvs. este afișată

data/config/locales/ru.yml

@@ -168,13 +168,16 @@ ru:
         link_text: Проверьте, что вам нужно сделать
         title: Брексит
       ukraine:
-        title:
         links:
+        title:
       world_locations: Места нахождения по миру
     search_box:
       input_title: Поиск
       label: Поиск на GOV.UK
       search_button: Поиск
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Ваш пароль скрыт
       announce_show: Ваш пароль показан

data/config/locales/si.yml

@@ -164,13 +164,16 @@ si:
         link_text: ඔබ කළ යුතු දේ පරීක්ෂා කරන්න
         title: බ්රෙක්සිට්
       ukraine:
-        title:
         links:
+        title:
       world_locations: ලෝක ස්ථාන
     search_box:
       input_title: සොයන්න
       label: GOV.UK මත සොයන්න
       search_button: සොයන්න
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: ඔබගේ මුරපදය සඟවා ඇත
       announce_show: ඔබගේ මුරපදය පෙන්වා ඇත

data/config/locales/sk.yml

@@ -169,13 +169,16 @@ sk:
         link_text: Skontrolujte, čo je potrebné urobiť
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Svetové lokality
     search_box:
       input_title: Vyhľadávanie
       label: Vyhľadávanie na GOV.UK
       search_button: Vyhľadávanie
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Vaše heslo je skryté
       announce_show: Vaše heslo sa zobrazuje.

data/config/locales/sl.yml

@@ -171,13 +171,16 @@ sl:
         link_text: Preverite, kaj morate storiti
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Lokacije po svetu
     search_box:
       input_title: Iskanje
       label: Iskanje po GOV.UK
       search_button: Iskanje
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Vaše geslo je skrito
       announce_show: Vaše geslo je prikazano

data/config/locales/so.yml

@@ -164,13 +164,16 @@ so:
         link_text: Hubi waxaad u baahantahay inaad qabato
         title: Ka bixitaanka Ingiriiska
       ukraine:
-        title:
         links:
+        title:
       world_locations: Goobaha Dunida
     search_box:
       input_title: Baadh
       label: Baadh GOV.UK
       search_button: Baadh
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Fure sireedkaagu wuu qarsoonayhay
       announce_show: Fure sireedkaagu wuu muuqdaa

data/config/locales/sq.yml

@@ -164,13 +164,16 @@ sq:
         link_text: Kontrolloni se çfarë duhet të bëni
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Vendndodhjet globale
     search_box:
       input_title: Kërko
       label: Kërko në GOV.UK
       search_button: Kërko
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Fjalëkalimi juaj është fshehur
       announce_show: Fjalëkalimi juaj është treguar

data/config/locales/sr.yml

@@ -165,13 +165,16 @@ sr:
         link_text: Proverite šta treba da uradite
         title: Bregzit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Globalne lokacije
     search_box:
       input_title: Pretraži
       label: Pretraži na GOV.UK
       search_button: Pretraži
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Lozinka je sakrivena
       announce_show: Lozinka je prikazana

data/config/locales/sv.yml

@@ -164,13 +164,16 @@ sv:
         link_text: Kontrollera vad du behöver göra
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Platser i världen
     search_box:
       input_title: Sök på
       label: Sök på GOV.UK
       search_button: Sök på
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Ditt lösenord är dolt
       announce_show: Ditt lösenord visas

data/config/locales/sw.yml

@@ -164,13 +164,16 @@ sw:
         link_text: Angalia unachopaswa kufanya
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Maeneo ya kimataifa
     search_box:
       input_title: Tafuta
       label: Tafuta kwenye tovuti ya GOV.UK
       search_button: Tafuta
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Nenosiri lako limefichwa
       announce_show: Nenosiri lako limeonyeshwa

data/config/locales/ta.yml

@@ -165,13 +165,16 @@ ta:
         link_text: நீங்கள் செய்யவேண்டியது என்ன என்று பாருங்கள்
         title: பிரெக்சிட்
       ukraine:
-        title:
         links:
+        title:
       world_locations: உலக இருப்பிடங்கள்
     search_box:
       input_title: தேடு
       label: GOV.UK-யில் தேடுக
       search_button: தேடு
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: உங்கள் கடவுச்சொல் மறைக்கப்பட்டுள்ளது
       announce_show: உங்கள் கடவுச்சொல் காட்டப்படுகிறது

data/config/locales/th.yml

@@ -162,13 +162,16 @@ th:
         link_text: ตรวจสอบสิ่งที่คุณต้องทำ
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: สถานที่ทั่วโลก
     search_box:
       input_title: ค้นหา
       label: ค้นหาใน GOV.UK
       search_button: ค้นหา
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: รหัสผ่านของคุณถูกซ่อน
       announce_show: รหัสผ่านของคุณถูกแสดง

data/config/locales/tk.yml

@@ -165,13 +165,16 @@ tk:
         link_text: Näme etmelidigiňizi belläň
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Dünýä ýerleri
     search_box:
       input_title: Gözlemek
       label: GOV.UK-de gözle
       search_button: Gözlemek
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Açar sözüňiz gizlenen
       announce_show: Açar sözüňiz görkezilen

data/config/locales/tr.yml

@@ -165,13 +165,16 @@ tr:
         link_text: Ne yapmaya ihtiyacınız olduğunu kontrol edin
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Dünya geneli konumlar
     search_box:
       input_title: Ara
       label: GOV.UK adresini ara
       search_button: Ara
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Şifreniz gizli
       announce_show: Şifreniz gösteriliyor

data/config/locales/uk.yml

@@ -171,13 +171,16 @@ uk:
         link_text: Перевірте, що вам потрібно зробити
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Світові локації
     search_box:
       input_title: Пошук
       label: Пошук на GOV.UK
       search_button: Пошук
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Ваш пароль приховано
       announce_show: Ваш пароль показано

data/config/locales/ur.yml

@@ -161,13 +161,16 @@ ur:
         link_text: پڑتال کریں کہ آپ کو کیا کرنے کی ضرورت ہے
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: عالمی مقامات
     search_box:
       input_title: تلاش
       label: GOV.UK پر تلاش کریں
       search_button: تلاش
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: آپ کا پاس ورڈ پوشیدہ ہے
       announce_show: آپ کا پاس ورڈ دکھائی دے رہا ہے

data/config/locales/uz.yml

@@ -166,13 +166,16 @@ uz:
         link_text: Нима қилиш зарурлигини текшириш
         title: Брексит
       ukraine:
-        title:
         links:
+        title:
       world_locations: Жаҳондаги жойлашиш жойи
     search_box:
       input_title: Излаш
       label: GOV.UKда излаш
       search_button: Излаш
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Сизнинг пароль яширилган
       announce_show: Сизнинг пароль акс эттирилган

data/config/locales/vi.yml

@@ -163,13 +163,16 @@ vi:
         link_text: Kiểm tra những gì bạn cần làm
         title: Brexit
       ukraine:
-        title:
         links:
+        title:
       world_locations: Các vị trí trên thế giới
     search_box:
       input_title: Tìm kiếm
       label: Tìm kiếm trên GOV.UK
       search_button: Tìm kiếm
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: Mật khẩu của bạn bị ẩn
       announce_show: Mật khẩu của bạn được hiển thị

data/config/locales/zh-hk.yml

@@ -162,13 +162,16 @@ zh-hk:
         link_text: 查看您需要做的事
         title: 英國脫歐
       ukraine:
-        title:
         links:
+        title:
       world_locations: 全世界之地點
     search_box:
       input_title: 搜尋
       label: 搜尋 GOV.UK
       search_button: 搜尋
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: 您的密碼已隱藏
       announce_show: 您的密碼已顯示

data/config/locales/zh-tw.yml

@@ -162,13 +162,16 @@ zh-tw:
         link_text: 確認你需要：
         title: 脫歐
       ukraine:
-        title:
         links:
+        title:
       world_locations: 世界地點
     search_box:
       input_title: 搜尋
       label: 在英國政府網站上搜尋
       search_button: 搜尋
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: 隱藏你的密碼
       announce_show: 顯示你的密碼

data/config/locales/zh.yml

@@ -162,13 +162,16 @@ zh:
         link_text: 检查您需要做的事情
         title: 英国脱欧
       ukraine:
-        title:
         links:
+        title:
       world_locations: 世界地点
     search_box:
       input_title: 搜索
       label: 搜索GOV.UK
       search_button: 搜索
+    share_links:
+      all_opens_in_new_tab:
+      opens_in_new_tab:
     show_password:
       announce_hide: 您的密码已隐藏
       announce_show: 您的密码已显示

data/lib/govuk_publishing_components/presenters/button_helper.rb

@@ -23,7 +23,9 @@ module GovukPublishingComponents
                   :name,
                   :value,
                   :classes,
-                  :aria_label
+                  :aria_label,
+                  :aria_controls,
+                  :aria_describedby
 
       def initialize(local_assigns)
         @href = local_assigns[:href]
@@ -52,6 +54,8 @@ module GovukPublishingComponents
         @aria_label = local_assigns[:aria_label]
         @info_text_id = "info-text-id-#{SecureRandom.hex(4)}"
         @button_id = "button-id-#{SecureRandom.hex(4)}"
+        @aria_controls = local_assigns[:aria_controls]
+        @aria_describedby = local_assigns[:aria_describedby]
       end
 
       def link?
@@ -90,6 +94,8 @@ module GovukPublishingComponents
         options[:name] = name if name.present? && value.present?
         options[:value] = value if name.present? && value.present?
         options[:aria] = { label: aria_label } if aria_label
+        options[:aria][:controls] =  aria_controls if aria_controls
+        options[:aria][:describedby] = aria_describedby if aria_describedby
         options[:draggable] = false if link?
         options
       end

data/lib/govuk_publishing_components/presenters/single_page_notification_button_helper.rb

@@ -13,6 +13,8 @@ module GovukPublishingComponents
         @button_type = @local_assigns[:already_subscribed] ? "Unsubscribe" : "Subscribe"
         @classes = %w[gem-c-single-page-notification-button]
         @classes << "js-personalisation-enhancement" if js_enhancement
+        @button_text_subscribe = custom_button_text_is_valid? ? custom_subscribe_text : default_subscribe_text
+        @button_text_unsubscribe = custom_button_text_is_valid? ? custom_unsubscribe_text : default_unsubscribe_text
       end
 
       def data
@@ -24,6 +26,8 @@ module GovukPublishingComponents
         @data_attributes[:track_category] = "Single-page-notification-button"
         # This attribute is passed through to the personalisation API to ensure when a new button is returned from the API, it has the same button_location
         @data_attributes[:button_location] = button_location
+        @data_attributes[:button_text_subscribe] = @button_text_subscribe
+        @data_attributes[:button_text_unsubscribe] = @button_text_unsubscribe
         @data_attributes
       end
 
@@ -32,7 +36,27 @@ module GovukPublishingComponents
       end
 
       def button_text
-        @already_subscribed ? I18n.t("components.single_page_notification_button.unsubscribe_text") : I18n.t("components.single_page_notification_button.subscribe_text")
+        @already_subscribed ? @button_text_unsubscribe : @button_text_subscribe
+      end
+
+      def custom_button_text_is_valid?
+        custom_subscribe_text.present? && custom_unsubscribe_text.present?
+      end
+
+      def custom_subscribe_text
+        @local_assigns.dig(:button_text, :subscribe)
+      end
+
+      def custom_unsubscribe_text
+        @local_assigns.dig(:button_text, :unsubscribe)
+      end
+
+      def default_subscribe_text
+        I18n.t("components.single_page_notification_button.subscribe_text")
+      end
+
+      def default_unsubscribe_text
+        I18n.t("components.single_page_notification_button.unsubscribe_text")
       end
     end
   end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "32.0.0".freeze
+  VERSION = "33.0.0".freeze
 end