X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3b237dc3dabda181ed68dc587b1befc678a03706..71f01eab43c0185b7e8368980f474a2587ed3710:/app/views/site/copyright.html.erb diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index feec81c82..1c4b23b56 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -3,32 +3,32 @@ <% if t(".legal_babble", :locale => I18n.locale) != t(".legal_babble", :locale => :en) %> - <%= tag.h1 :lang => @locale, :dir => t("html.dir", :locale => @locale) do %> + <%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>

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

- <%= raw t ".native.text", - :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") %> + <%= 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 %>
<% end %> <% else %> - <%= tag.div :lang => "en", :dir => t("html.dir", :locale => "en") do %> - <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %> + <% 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" %>

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

<% end %>
@@ -44,12 +44,13 @@ <%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>

<%= t ".legal_babble.intro_1_html", :locale => @locale %>

<%= t ".legal_babble.intro_2_html", :locale => @locale %>

-

<%= t ".legal_babble.intro_3_html", :locale => @locale %>

+

<%= t ".legal_babble.intro_3_1_html", :locale => @locale %>

<%= t ".legal_babble.credit_title_html", :locale => @locale %>

<%= t ".legal_babble.credit_1_html", :locale => @locale %>

-

<%= t ".legal_babble.credit_2_html", :locale => @locale %>

-

<%= t ".legal_babble.credit_3_html", :locale => @locale %>

+

<%= t ".legal_babble.credit_2_1_html", :locale => @locale %>

+

<%= t ".legal_babble.credit_3_1_html", :locale => @locale %>

+

<%= t ".legal_babble.credit_4_html", :locale => @locale %>

<%= image_tag("attribution_example.png", :alt => t(".legal_babble.attribution_example.alt"), :border => 0,