From: Tom Hughes Date: Wed, 22 Mar 2023 10:52:02 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/3981' X-Git-Tag: live~1336 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/425d568037231409d07937c99ed09f1707efbd12?hp=cefca34f042066c8340efcfdb5f724ec5ff89877 Merge remote-tracking branch 'upstream/pull/3981' --- diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 3253aebe1..f8ea248b5 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -3,34 +3,30 @@ <% if t(".legal_babble", :locale => I18n.locale) != t(".legal_babble", :locale => :en) %> - <%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %> -

<%= t ".native.title" %>

-

- <%= t ".native.html", - :native_link => link_to(t(".native.native_link"), - :controller => "site", - :action => "copyright", - :copyright_locale => nil), - :mapping_link => link_to(t(".native.mapping_link"), - :controller => "site", - :action => "index") %> -

- <% end %> +

<%= t ".native.title" %>

+

+ <%= t ".native.html", + :native_link => link_to(t(".native.native_link"), + :controller => "site", + :action => "copyright", + :copyright_locale => nil), + :mapping_link => link_to(t(".native.mapping_link"), + :controller => "site", + :action => "index") %> +


<% end %> <% else %> <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %> - <%= tag.div :lang => "en", :dir => t("html.dir", :locale => "en") do %> -

<%= t ".foreign.title" %>

-

- <%= t ".foreign.html", - :english_original_link => link_to(t(".foreign.english_link"), - :controller => "site", - :action => "copyright", - :copyright_locale => "en") %> -

- <% end %> +

<%= t ".foreign.title" %>

+

+ <%= t ".foreign.html", + :english_original_link => link_to(t(".foreign.english_link"), + :controller => "site", + :action => "copyright", + :copyright_locale => "en") %> +


<% end %> <% end %>