<%= t "about_page.lede_text" %>
-<%= t "about_page.local_knowledge_title" %>
-<%= t "about_page.local_knowledge_html" %>
-<%= t "site.about.community_driven_title" %>
++ <%= 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")) %> +
+<%= t "about_page.community_driven_title" %>
-<%= t "about_page.community_driven_html", :diary_path => diary_path %>
-<%= t "site.about.open_data_title" %>
++ <%= 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) %>
+<%= t "about_page.open_data_title" %>
-<%= t "about_page.open_data_html", :copyright_path => copyright_path %>
-<%= t "site.about.legal_title" %>
++ <%= 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")) %> +
+<%= t "about_page.legal_title" %>
-<%= t "about_page.legal_html" %>
-<%= t "about_page.partners_title" %>
-<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"), - :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), - :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %> -
-