X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d7eb387a7c3573f1a1d17df00adcaa1fb9b9fa5..44eea9dcaf42cdd0737ae9344e357901c9fe31b6:/app/views/site/copyright.html.erb diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 160dfea7c..25504948f 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -2,15 +2,15 @@ <% if @locale == 'en' %> - <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %> -
- <%= raw t 'license_page.native.text', - :native_link => link_to(t('license_page.native.native_link'), + <%= raw t '.native.text', + :native_link => link_to(t('.native.native_link'), :controller => 'site', :action => 'copyright', :copyright_locale => nil), - :mapping_link => link_to(t('license_page.native.mapping_link'), + :mapping_link => link_to(t('.native.mapping_link'), :controller => 'site', :action => 'index') %>
@@ -18,11 +18,11 @@ <% end %> <% else %> - <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %> -- <%= raw t 'license_page.foreign.text', - :english_original_link => link_to(t('license_page.foreign.english_link'), + <%= raw t '.foreign.text', + :english_original_link => link_to(t('.foreign.english_link'), :controller => 'site', :action => 'copyright', :copyright_locale => 'en') %> @@ -31,41 +31,47 @@ <% end %> <% end %> -
<%= t "license_page.legal_babble.intro_1_html", :locale => @locale %>
-<%= t "license_page.legal_babble.intro_2_html", :locale => @locale %>
-<%= t "license_page.legal_babble.intro_3_html", :locale => @locale %>
+<%= 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 "license_page.legal_babble.credit_1_html", :locale => @locale %>
-<%= t "license_page.legal_babble.credit_2_html", :locale => @locale %>
-<%= t "license_page.legal_babble.credit_3_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 %>
<%= image_tag("attribution_example.png", - :alt => t('license_page.legal_babble.attribution_example.alt'), + :alt => t('.legal_babble.attribution_example.alt'), :border => 0, - :title => t('license_page.legal_babble.attribution_example.title')) %> + :title => t('.legal_babble.attribution_example.title')) %> -
<%= t "license_page.legal_babble.more_1_html", :locale => @locale %>
-<%= t "license_page.legal_babble.more_2_html", :locale => @locale %>
+<%= t ".legal_babble.more_1_html", :locale => @locale %>
+<%= t ".legal_babble.more_2_html", :locale => @locale %>
-<%= t "license_page.legal_babble.contributors_intro_html", :locale => @locale %>
+<%= t ".legal_babble.contributors_intro_html", :locale => @locale %>
<%= t "license_page.legal_babble.contributors_footer_1_html", :locale => @locale %>
-<%= t "license_page.legal_babble.contributors_footer_2_html", :locale => @locale %>
+<%= t ".legal_babble.contributors_footer_1_html", :locale => @locale %>
+<%= t ".legal_babble.contributors_footer_2_html", :locale => @locale %>
-<%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %>
-<%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %>
\ No newline at end of file +<%= t ".legal_babble.infringement_1_html", :locale => @locale %>
+<%= t ".legal_babble.infringement_2_html", :locale => @locale %>
+ +<%= t ".legal_babble.trademarks_1_html", :locale => @locale %>