X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7c4dff7445568b9791f79b5c201c808eb83d100e..7fb984f9152d18844502df46d934da9c6deda05c:/app/views/site/about.html.erb?ds=sidebyside diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index abf4c60c8..277fb1384 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -1,45 +1,77 @@ -<%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %> -
+ <%= t ".heading_html", :copyright => tag.span(t(".copyright_symbol_html")), + :br => tag.br %> +
+<%= t ".lede_text", :locale => @locale %>
+<%= t ".lede_text" %>
- <%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %> -<%= t "site.about.local_knowledge_html", :locale => @locale %>
- <% end %> + <%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %> +<%= t "site.about.local_knowledge_html" %>
+ <% end %> - <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %> -<%= t "site.about.community_driven_html", :locale => @locale, :diary_path => diary_entries_path %>
- <% end %> + <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %> ++ <%= 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", :locale => @locale, :copyright_path => copyright_path %>
- <% end %> + <%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %> ++ <%= 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", :locale => @locale %>
-<%= t "site.about.legal_2_html", :locale => @locale %>
- <% end %> + <%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %> ++ <%= 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 %> -<%= t "layouts.hosting_partners_html", :locale => @locale, - :ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"), - :fastly => link_to(t("layouts.partners_fastly", :locale => @locale), "https://www.fastly.com/"), - :bytemark => link_to(t("layouts.partners_bytemark", :locale => @locale), "https://www.bytemark.co.uk"), - :partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %> -
- <% end %> -<%= t "layouts.hosting_partners_html", :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"), + :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"), + :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"), + :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %> +
+ <% end %> +