cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Add title to copyright page
This commit is contained in:
Andy Allan 2024-06-19 15:26:21 +01:00 • committed by GitHub
commit 54aa89a4bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/site_controller.rb
View file

@ -110,6 +110,7 @@ class SiteController < ApplicationController
end end
def copyright def copyright
@title = t ".title"
@locale = params[:copyright_locale] || I18n.locale @locale = params[:copyright_locale] || I18n.locale
end end

2
app/views/site/copyright.html.erb
View file

@ -32,7 +32,7 @@
<% I18n.with_locale @locale do %> <% I18n.with_locale @locale do %>
<%= tag.h1 :lang => @locale, :dir => t("html.dir") do %> <%= tag.h1 :lang => @locale, :dir => t("html.dir") do %>
<%= t ".legal_babble.title_html" %> <%= t ".title" %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>

2
config/locales/en.yml
View file

@ -1961,6 +1961,7 @@ en:
legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
partners_title: Partners partners_title: Partners
copyright: copyright:
title: Copyright and License
foreign: foreign:
title: About this translation 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 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 native_link: THIS_LANGUAGE_NAME_HERE version
mapping_link: start mapping mapping_link: start mapping
legal_babble: legal_babble:
title_html: Copyright and License
introduction_1_html: | introduction_1_html: |
OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the
%{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF). %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).