From: Tom Hughes Date: Fri, 12 Apr 2024 16:56:15 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4559' X-Git-Tag: live~184 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6290405336817cd282ad5062ce3fc3774ccf61e4?hp=8bb126938f67d3ea01ac16b42f8ad3e35f39baaf Merge remote-tracking branch 'upstream/pull/4559' --- diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index c17f090af..f014eb037 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -140,6 +140,14 @@ <%= t ".legal_babble.contributors_fr_credit_html", :france => tag.strong(t(".legal_babble.contributors_fr_france")) %> +
  • + <%= t ".legal_babble.contributors_hr_credit_html", + :croatia => tag.strong(t(".legal_babble.contributors_hr_croatia")), + :dgu_link => link_to(t(".legal_babble.contributors_hr_dgu"), + t(".legal_babble.contributors_hr_dgu_url")), + :open_data_portal => link_to(t(".legal_babble.contributors_hr_open_data_portal"), + t(".legal_babble.contributors_hr_open_data_portal_url")) %> +
  • <%= t ".legal_babble.contributors_nl_credit_html", :netherlands => tag.strong(t(".legal_babble.contributors_nl_netherlands")), diff --git a/config/locales/en.yml b/config/locales/en.yml index f9117ca1c..77002268b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2098,6 +2098,14 @@ en: %{france}: Contains data sourced from Direction Générale des Impôts. contributors_fr_france: France + contributors_hr_credit_html: | + %{croatia}: Contains data from the %{dgu_link} and %{open_data_portal} + (public information of Croatia). + contributors_hr_croatia: Croatia + contributors_hr_dgu: State Geodetic Administration of Croatia + contributors_hr_dgu_url: https://dgu.gov.hr/ + contributors_hr_open_data_portal: National Open Data Portal + contributors_hr_open_data_portal_url: https://data.gov.hr/ contributors_nl_credit_html: | %{netherlands}: Contains © AND data, 2007 (%{and_link}) contributors_nl_netherlands: Netherlands