Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translate "and" connective in metadata component for some languages #4477

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
## Unreleased

* Add /media/ path to GA4 download link tracking ([PR #4491](https://github.com/alphagov/govuk_publishing_components/pull/4491/))
* Translate "and" connective in metadata component for some languages ([PR #4477](https://github.com/alphagov/govuk_publishing_components/pull/4477))

## 46.3.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 %>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a small refactoring I've done.

<%= items.to_sentence(last_word_connector: ' and ').html_safe %>
<% end %>
1 change: 1 addition & 0 deletions config/locales/ar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ ar:
navigation_search_subheading:
search_text:
metadata:
and:
from: من
history: المحفوظات
last_updated: التحديث الأخير
Expand Down
1 change: 1 addition & 0 deletions config/locales/az.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ az:
navigation_search_subheading:
search_text:
metadata:
and:
from: "...dan (dən)"
history: Tarix
last_updated: Son yenilənmə
Expand Down
1 change: 1 addition & 0 deletions config/locales/be.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ be:
navigation_search_subheading:
search_text:
metadata:
and:
from: З
history: Гiсторыя
last_updated: Апошняе абнаўленне
Expand Down
1 change: 1 addition & 0 deletions config/locales/bg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ bg:
navigation_search_subheading:
search_text:
metadata:
and:
from: От
history: История
last_updated: Последно актуализирани
Expand Down
1 change: 1 addition & 0 deletions config/locales/bn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ bn:
navigation_search_subheading:
search_text:
metadata:
and:
from: থেকে
history: ইতিহাস
last_updated: সর্বশেষ আপডেট করা হয়েছে
Expand Down
1 change: 1 addition & 0 deletions config/locales/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ cs:
navigation_search_subheading:
search_text:
metadata:
and:
from: 'Komu I:'
history: Historie
last_updated: 'Poslední aktualizace:'
Expand Down
1 change: 1 addition & 0 deletions config/locales/cy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ cy:
navigation_search_subheading:
search_text:
metadata:
and:
from: Gan
history: Hanes
last_updated: Diweddarwyd ddiwethaf
Expand Down
1 change: 1 addition & 0 deletions config/locales/da.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ da:
navigation_search_subheading:
search_text:
metadata:
and:
from: Fra
history: Historie
last_updated: Sidst opdateret
Expand Down
1 change: 1 addition & 0 deletions config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ de:
navigation_search_subheading:
search_text:
metadata:
and: und
from: Von
history: Geschichte
last_updated: Zuletzt aktualisiert
Expand Down
1 change: 1 addition & 0 deletions config/locales/dr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ dr:
navigation_search_subheading:
search_text:
metadata:
and:
from: از
history: پیشینهء جستجو
last_updated: آخرین آپدیت
Expand Down
1 change: 1 addition & 0 deletions config/locales/el.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ el:
navigation_search_subheading:
search_text:
metadata:
and:
from: Από
history: Ιστορικό
last_updated: Τελευταία ενημέρωση
Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions config/locales/es-419.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ es-419:
navigation_search_subheading:
search_text:
metadata:
and: y
from: Desde
history: Historial
last_updated: Última actualización
Expand Down
1 change: 1 addition & 0 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ es:
navigation_search_subheading:
search_text:
metadata:
and: y
from: Desde
history: Historial
last_updated: Última actualización
Expand Down
1 change: 1 addition & 0 deletions config/locales/et.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ et:
navigation_search_subheading:
search_text:
metadata:
and:
from: Alates
history: Ajalugu
last_updated: Viimati värskendatud
Expand Down
1 change: 1 addition & 0 deletions config/locales/fa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ fa:
navigation_search_subheading:
search_text:
metadata:
and:
from: از
history: تاریخچه
last_updated: آخرین بروزرسانی
Expand Down
1 change: 1 addition & 0 deletions config/locales/fi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ fi:
navigation_search_subheading:
search_text:
metadata:
and:
from: Alkaen
history: Historia
last_updated: Viimeksi päivitetty
Expand Down
1 change: 1 addition & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ fr:
navigation_search_subheading:
search_text:
metadata:
and: et
from: De
history: Historique
last_updated: Dernière mise à jour
Expand Down
1 change: 1 addition & 0 deletions config/locales/gd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ gd:
navigation_search_subheading:
search_text:
metadata:
and:
from: De
history: Stairiúil
last_updated: Nuashonrú deireanach
Expand Down
1 change: 1 addition & 0 deletions config/locales/gu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ gu:
navigation_search_subheading:
search_text:
metadata:
and:
from: થી
history: હિસ્ટરી
last_updated: છેલ્લે અપડેટ કરવામાં આવ્યું
Expand Down
1 change: 1 addition & 0 deletions config/locales/he.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ he:
navigation_search_subheading:
search_text:
metadata:
and:
from: מ-
history: היסטוריה
last_updated: עדכון אחרון
Expand Down
1 change: 1 addition & 0 deletions config/locales/hi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ hi:
navigation_search_subheading:
search_text:
metadata:
and:
from: से
history: इतिहास
last_updated: आखरी अपडेट
Expand Down
1 change: 1 addition & 0 deletions config/locales/hr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ hr:
navigation_search_subheading:
search_text:
metadata:
and:
from: Iz
history: Istorija
last_updated: Posljednji put ažurirano
Expand Down
1 change: 1 addition & 0 deletions config/locales/hu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ hu:
navigation_search_subheading:
search_text:
metadata:
and:
from: Feladó
history: Előzmények
last_updated: Utolsó frissítés
Expand Down
1 change: 1 addition & 0 deletions config/locales/hy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ hy:
navigation_search_subheading:
search_text:
metadata:
and:
from: Ումից՝
history: Պատմություն
last_updated: Վերջին անգամ թարմացվել է
Expand Down
1 change: 1 addition & 0 deletions config/locales/id.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ id:
navigation_search_subheading:
search_text:
metadata:
and:
from: Dari
history: Riwayat
last_updated: Terakhir diperbarui
Expand Down
1 change: 1 addition & 0 deletions config/locales/is.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ is:
navigation_search_subheading:
search_text:
metadata:
and:
from: Frá
history: Saga
last_updated: Síðast uppfært
Expand Down
1 change: 1 addition & 0 deletions config/locales/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ it:
navigation_search_subheading:
search_text:
metadata:
and:
from: Da
history: Cronologia
last_updated: Ultimo aggiornamento
Expand Down
1 change: 1 addition & 0 deletions config/locales/ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ ja:
navigation_search_subheading:
search_text:
metadata:
and:
from: から
history: 歴史
last_updated: 最終更新
Expand Down
1 change: 1 addition & 0 deletions config/locales/ka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ ka:
navigation_search_subheading:
search_text:
metadata:
and:
from: დან
history: ისტორია
last_updated: ბოლო განახლება
Expand Down
1 change: 1 addition & 0 deletions config/locales/kk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ kk:
navigation_search_subheading:
search_text:
metadata:
and:
from: Кімнен
history: Журнал
last_updated: Соңғы рет жаңартылды
Expand Down
1 change: 1 addition & 0 deletions config/locales/ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ ko:
navigation_search_subheading:
search_text:
metadata:
and:
from:
history:
last_updated:
Expand Down
1 change: 1 addition & 0 deletions config/locales/lt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ lt:
navigation_search_subheading:
search_text:
metadata:
and:
from: Nuo
history: Istorija
last_updated: Paskutinį kartą naujinta
Expand Down
1 change: 1 addition & 0 deletions config/locales/lv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ lv:
navigation_search_subheading:
search_text:
metadata:
and:
from: 'No'
history: Vēsture
last_updated: Pēdējoreiz atjaunināts
Expand Down
1 change: 1 addition & 0 deletions config/locales/ms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ ms:
navigation_search_subheading:
search_text:
metadata:
and:
from: Daripada
history: Sejarah
last_updated: Kali terakhir dikemas kini
Expand Down
1 change: 1 addition & 0 deletions config/locales/mt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ mt:
navigation_search_subheading:
search_text:
metadata:
and:
from: Minn
history: Storja
last_updated: Aġġornat l-aħħar
Expand Down
1 change: 1 addition & 0 deletions config/locales/nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ nl:
navigation_search_subheading:
search_text:
metadata:
and:
from: Van
history: Geschiedenis
last_updated: Laatst bijgewerkt
Expand Down
1 change: 1 addition & 0 deletions config/locales/no.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
navigation_search_subheading:
search_text:
metadata:
and:
from: Fra
history: Historie
last_updated: Sist oppdatert
Expand Down
1 change: 1 addition & 0 deletions config/locales/pa-pk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ pa-pk:
navigation_search_subheading:
search_text:
metadata:
and:
from: ایتھوں
history: پچھلا کم
last_updated: آخری دفعہ کدوں نویں گل دسی سی
Expand Down
1 change: 1 addition & 0 deletions config/locales/pa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ pa:
navigation_search_subheading:
search_text:
metadata:
and:
from: ਤੋਂ
history: ਇਤਿਹਾਸ
last_updated: ਪਿਛਲੀ ਵਾਰ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ
Expand Down
1 change: 1 addition & 0 deletions config/locales/pl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ pl:
navigation_search_subheading:
search_text:
metadata:
and: i
from: Od
history: Historia
last_updated: Ostatnio zaktualizowano
Expand Down
1 change: 1 addition & 0 deletions config/locales/ps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ ps:
navigation_search_subheading:
search_text:
metadata:
and:
from: له
history: تاریخ
last_updated: وروستی تازه شوی
Expand Down
1 change: 1 addition & 0 deletions config/locales/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ pt:
navigation_search_subheading:
search_text:
metadata:
and:
from: De
history: Histórico
last_updated: Última atualização
Expand Down
1 change: 1 addition & 0 deletions config/locales/ro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ ro:
navigation_search_subheading:
search_text:
metadata:
and:
from: De la
history: Istoric
last_updated: Ultima actualizare
Expand Down
1 change: 1 addition & 0 deletions config/locales/ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ ru:
navigation_search_subheading:
search_text:
metadata:
and:
from: Из
history: История
last_updated: Последнее обновление
Expand Down
1 change: 1 addition & 0 deletions config/locales/si.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ si:
navigation_search_subheading:
search_text:
metadata:
and:
from: සිට
history: ඉතිහාසය
last_updated: අවසන් වරට යාවත්කාලීන කළේ
Expand Down
Loading
Loading