X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/22fefc3df0c9302c2756f2cbbb2cdd011174a3a5..9b19a45e74abd4414bb79d6b992f7bec14390ad6:/app/views/site/copyright.html.erb diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index ce766fe34..1c4b23b56 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -1,34 +1,34 @@ <% content_for :heading do %> -<% if @locale == 'en' %> +<% if @locale == "en" %> - <% if t('.legal_babble', :locale => I18n.locale) != t('.legal_babble', :locale => :en) %> - <%= tag.h1 :lang => @locale, :dir => t("html.dir", :locale => @locale) do %> -

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

+ <% 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" %>

- <%= 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) %> -

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

+ <% 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,16 +44,17 @@ <%= 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'), + :alt => t(".legal_babble.attribution_example.alt"), :border => 0, - :title => t('.legal_babble.attribution_example.title')) %> + :title => t(".legal_babble.attribution_example.title")) %>

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

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

@@ -70,6 +71,7 @@
  • <%= t ".legal_babble.contributors_nl_html", :locale => @locale %>
  • <%= t ".legal_babble.contributors_nz_html", :locale => @locale %>
  • <%= t ".legal_babble.contributors_si_html", :locale => @locale %>
  • +
  • <%= t ".legal_babble.contributors_es_html", :locale => @locale %>
  • <%= t ".legal_babble.contributors_za_html", :locale => @locale %>
  • <%= t ".legal_babble.contributors_gb_html", :locale => @locale %>