Merge pull request #4884 from AntonKhorev/copyright-page-title

Add title to copyright page

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 15ffe58a2616765eac3b34474b9dd0542447cb33..5d63e79fd3937fc178791920477b3668129e92ce 100644 (file)
--- 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 2073bd63888433f2201305485aa0a0d3824c621d..6940dc2f860f95f09a911d56f5cb7e7ba8817455 100644 (file)
--- 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 e8dde9521375e9f8c92cc278c1275c431637f3d5..8de8a87213aed0d61b69af9b68fdbdc75a7c10ed 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1961,6 +1961,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
@@ -1971,7 +1972,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).