Translate "and" connective in metadata component

alphagov · Dec 5, 2024 · 2f8634b · 2f8634b
1 parent 53d0e0a
commit 2f8634b
Show file tree

Hide file tree

Showing 66 changed files with 82 additions and 3 deletions.
diff --git a/app/views/govuk_publishing_components/components/metadata/_sentence.html.erb b/app/views/govuk_publishing_components/components/metadata/_sentence.html.erb
@@ -5,9 +5,10 @@
     remaining = items[list_limit..items.length]
     items = items[0...list_limit]
   end
+  connector = " #{t("components.metadata.and")} "
 %>
+<%= items.to_sentence(two_words_connector: connector, last_word_connector: connector).html_safe %>
 <% if remaining.any? %>
-  <%= items.to_sentence(last_word_connector: ' and ').html_safe %>
   <div class="gem-c-metadata__toggle-wrap govuk-!-display-none-print">
     <a href="#"
        class="gem-c-metadata__definition-link govuk-!-display-none-print"
@@ -20,6 +21,4 @@
     </a>
   </div>
   <span id="toggle-<%= toggle_id %>" class="gem-c-metadata__toggle-items js-hidden"><%= remaining.to_sentence.html_safe %></span>
-<% else %>
-  <%= items.to_sentence(last_word_connector: ' and ').html_safe %>
 <% end %>
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
@@ -137,6 +137,7 @@ ar:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: و
       from: من
       history: المحفوظات
       last_updated: التحديث الأخير

diff --git a/config/locales/az.yml b/config/locales/az.yml
@@ -134,6 +134,7 @@ az:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: və
       from: "...dan (dən)"
       history: Tarix
       last_updated: Son yenilənmə

diff --git a/config/locales/be.yml b/config/locales/be.yml
@@ -140,6 +140,7 @@ be:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: і
       from: З
       history: Гiсторыя
       last_updated: Апошняе абнаўленне

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
@@ -138,6 +138,7 @@ bg:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: и
       from: От
       history: История
       last_updated: Последно актуализирани

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
@@ -135,6 +135,7 @@ bn:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: এবং
       from: থেকে
       history: ইতিহাস
       last_updated: সর্বশেষ আপডেট করা হয়েছে

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -139,6 +139,7 @@ cs:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: a
       from: 'Komu I:'
       history: Historie
       last_updated: 'Poslední aktualizace:'

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
@@ -138,6 +138,7 @@ cy:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: a
       from: Gan
       history: Hanes
       last_updated: Diweddarwyd ddiwethaf

diff --git a/config/locales/da.yml b/config/locales/da.yml
@@ -135,6 +135,7 @@ da:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: og
       from: Fra
       history: Historie
       last_updated: Sidst opdateret

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -138,6 +138,7 @@ de:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: und
       from: Von
       history: Geschichte
       last_updated: Zuletzt aktualisiert

diff --git a/config/locales/dr.yml b/config/locales/dr.yml
@@ -136,6 +136,7 @@ dr:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: و
       from: از
       history: پیشینهء جستجو
       last_updated: آخرین آپدیت

diff --git a/config/locales/el.yml b/config/locales/el.yml
@@ -134,6 +134,7 @@ el:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: και
       from: Από
       history: Ιστορικό
       last_updated: Τελευταία ενημέρωση

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -241,6 +241,7 @@ en:
       navigation_search_subheading: Search
       search_text: Search GOV.UK
     metadata:
+      and: and
       from: From
       history: History
       last_updated: Last updated

diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml
@@ -134,6 +134,7 @@ es-419:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: y
       from: Desde
       history: Historial
       last_updated: Última actualización

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -134,6 +134,7 @@ es:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: y
       from: Desde
       history: Historial
       last_updated: Última actualización

diff --git a/config/locales/et.yml b/config/locales/et.yml
@@ -137,6 +137,7 @@ et:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: ja
       from: Alates
       history: Ajalugu
       last_updated: Viimati värskendatud

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
@@ -133,6 +133,7 @@ fa:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: و
       from: از
       history: تاریخچه
       last_updated: آخرین بروزرسانی

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
@@ -136,6 +136,7 @@ fi:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: ja
       from: Alkaen
       history: Historia
       last_updated: Viimeksi päivitetty

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -134,6 +134,7 @@ fr:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: et
       from: De
       history: Historique
       last_updated: Dernière mise à jour

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
@@ -136,6 +136,7 @@ gd:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: agus
       from: De
       history: Stairiúil
       last_updated: Nuashonrú deireanach

diff --git a/config/locales/gu.yml b/config/locales/gu.yml
@@ -134,6 +134,7 @@ gu:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: અને
       from: થી
       history: હિસ્ટરી
       last_updated: છેલ્લે અપડેટ કરવામાં આવ્યું

diff --git a/config/locales/he.yml b/config/locales/he.yml
@@ -134,6 +134,7 @@ he:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: ו
       from: מ-
       history: היסטוריה
       last_updated: עדכון אחרון

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
@@ -134,6 +134,7 @@ hi:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: और
       from: से
       history: इतिहास
       last_updated: आखरी अपडेट

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
@@ -135,6 +135,7 @@ hr:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: i
       from: Iz
       history: Istorija
       last_updated: Posljednji put ažurirano

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
@@ -137,6 +137,7 @@ hu:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: és
       from: Feladó
       history: Előzmények
       last_updated: Utolsó frissítés

diff --git a/config/locales/hy.yml b/config/locales/hy.yml
@@ -138,6 +138,7 @@ hy:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: և
       from: Ումից՝
       history: Պատմություն
       last_updated: Վերջին անգամ թարմացվել է

diff --git a/config/locales/id.yml b/config/locales/id.yml
@@ -134,6 +134,7 @@ id:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: dan
       from: Dari
       history: Riwayat
       last_updated: Terakhir diperbarui

diff --git a/config/locales/is.yml b/config/locales/is.yml
@@ -134,6 +134,7 @@ is:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: og
       from: Frá
       history: Saga
       last_updated: Síðast uppfært

diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -134,6 +134,7 @@ it:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: e
       from: Da
       history: Cronologia
       last_updated: Ultimo aggiornamento

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -130,6 +130,7 @@ ja:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: および
       from: から
       history: 歴史
       last_updated: 最終更新

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
@@ -137,6 +137,7 @@ ka:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: და
       from: დან
       history: ისტორია
       last_updated: ბოლო განახლება

diff --git a/config/locales/kk.yml b/config/locales/kk.yml
@@ -134,6 +134,7 @@ kk:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: және
       from: Кімнен
       history: Журнал
       last_updated: Соңғы рет жаңартылды

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
@@ -129,6 +129,7 @@ ko:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: 그리고
       from:
       history:
       last_updated:

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
@@ -139,6 +139,7 @@ lt:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: ir
       from: Nuo
       history: Istorija
       last_updated: Paskutinį kartą naujinta

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
@@ -138,6 +138,7 @@ lv:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: un
       from: 'No'
       history: Vēsture
       last_updated: Pēdējoreiz atjaunināts

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
@@ -133,6 +133,7 @@ ms:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: dan
       from: Daripada
       history: Sejarah
       last_updated: Kali terakhir dikemas kini

diff --git a/config/locales/mt.yml b/config/locales/mt.yml
@@ -136,6 +136,7 @@ mt:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: u
       from: Minn
       history: Storja
       last_updated: Aġġornat l-aħħar

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
@@ -134,6 +134,7 @@ nl:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: en
       from: Van
       history: Geschiedenis
       last_updated: Laatst bijgewerkt

diff --git a/config/locales/no.yml b/config/locales/no.yml
@@ -134,6 +134,7 @@
       navigation_search_subheading:
       search_text:
     metadata:
+      and: og
       from: Fra
       history: Historie
       last_updated: Sist oppdatert

diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml
@@ -130,6 +130,7 @@ pa-pk:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: ہور
       from: ایتھوں
       history: پچھلا کم
       last_updated: آخری دفعہ کدوں نویں گل دسی سی

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
@@ -134,6 +134,7 @@ pa:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: ਅਤੇ
       from: ਤੋਂ
       history: ਇਤਿਹਾਸ
       last_updated: ਪਿਛਲੀ ਵਾਰ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
@@ -138,6 +138,7 @@ pl:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: i
       from: Od
       history: Historia
       last_updated: Ostatnio zaktualizowano

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
@@ -131,6 +131,7 @@ ps:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: او
       from: له
       history: تاریخ
       last_updated: وروستی تازه شوی

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
@@ -134,6 +134,7 @@ pt:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: e
       from: De
       history: Histórico
       last_updated: Última atualização

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
@@ -135,6 +135,7 @@ ro:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: și
       from: De la
       history: Istoric
       last_updated: Ultima actualizare

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -138,6 +138,7 @@ ru:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: и
       from: Из
       history: История
       last_updated: Последнее обновление

diff --git a/config/locales/si.yml b/config/locales/si.yml
@@ -134,6 +134,7 @@ si:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: සහ
       from: සිට
       history: ඉතිහාසය
       last_updated: අවසන් වරට යාවත්කාලීන කළේ

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
@@ -139,6 +139,7 @@ sk:
       navigation_search_subheading:
       search_text:
     metadata:
+      and: a
       from: Od
       history: História
       last_updated: Posledná aktualizácia