X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7051e924f518f050a195cd7658d5af558842b87..91a4fd6b5ab7a077211a7608248b3878f226d405:/app/views/site/about.html.erb diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index 12d9a0608..f6f6ba137 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -4,11 +4,14 @@
-

<%= t ".copyright_html" %>

+

+ <%= t ".heading_html", :copyright => tag.span(t(".copyright_symbol_html")), + :br => tag.br %> +

-
+

<%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name") %>

@@ -22,16 +25,44 @@ <% end %> <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %> -

<%= t "site.about.community_driven_html", :diary_path => diary_entries_path %>

+

+ <%= t "site.about.community_driven_1_html", :osm_blog_link => link_to(t("site.about.community_driven_osm_blog"), + t("site.about.community_driven_osm_blog_url")), + :user_diaries_link => link_to(t("site.about.community_driven_user_diaries"), + diary_entries_path), + :community_blogs_link => link_to(t("site.about.community_driven_community_blogs"), + t("site.about.community_driven_community_blogs_url")), + :osm_foundation_link => link_to(t("site.about.community_driven_osm_foundation"), + t("site.about.community_driven_osm_foundation_url")) %> +

<% end %> <%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %> -

<%= t "site.about.open_data_html", :copyright_path => copyright_path %>

+

+ <%= t "site.about.open_data_1_html", :open_data => tag.i(t("site.about.open_data_open_data")), + :copyright_license_link => link_to(t("site.about.open_data_copyright_license"), + copyright_path) %>

<% end %> <%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %> -

<%= t "site.about.legal_1_html" %>

-

<%= t "site.about.legal_2_html" %>

+

+ <%= t "site.about.legal_1_1_html", :openstreetmap_foundation_link => link_to(t("site.about.legal_1_1_openstreetmap_foundation"), + t("site.about.legal_1_1_openstreetmap_foundation_url")), + :terms_of_use_link => link_to(t("site.about.legal_1_1_terms_of_use"), + t("site.about.legal_1_1_terms_of_use_url")), + :aup_link => link_to(t("site.about.legal_1_1_aup"), + t("site.about.legal_1_1_aup_url")), + :privacy_policy_link => link_to(t("site.about.legal_1_1_privacy_policy"), + t("site.about.legal_1_1_privacy_policy_url")) %> +

+

+ <%= t "site.about.legal_2_1_html", :contact_the_osmf_link => link_to(t("site.about.legal_2_1_contact_the_osmf"), + t("site.about.legal_2_1_contact_the_osmf_url")) %> +

+

+ <%= t "site.about.legal_2_2_html", :registered_trademarks_link => link_to(t("site.about.legal_2_2_registered_trademarks"), + t("site.about.legal_2_2_registered_trademarks_url")) %> +

<% end %> <%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %>