From: Anton Khorev Date: Fri, 7 Jun 2024 09:51:38 +0000 (+0300) Subject: Add title to copyright page X-Git-Tag: live~422^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2cf3a52d405ef4fb2b22691d5c9cc01a43ea05f6?hp=67be6616b0e69fcc275c44b9e8351ddab6e3ce4e Add title to copyright page --- diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 15ffe58a2..5d63e79fd 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -110,6 +110,7 @@ class SiteController < ApplicationController end def copyright + @title = t ".title" @locale = params[:copyright_locale] || I18n.locale end diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 2073bd638..6940dc2f8 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -32,7 +32,7 @@ <% I18n.with_locale @locale do %> <%= tag.h1 :lang => @locale, :dir => t("html.dir") do %> - <%= t ".legal_babble.title_html" %> + <%= t ".title" %> <% end %> <% end %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 1da263d77..c86bfa2c0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1960,6 +1960,7 @@ en: legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy partners_title: Partners copyright: + title: Copyright and License foreign: title: About this translation html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence @@ -1970,7 +1971,6 @@ en: native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping legal_babble: - title_html: Copyright and License introduction_1_html: | OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).