Merge branch 'master' into feature/add-communities-page

diff --combined app/views/layouts/_header.html.erb
index fbb053f1976a14c7b8906bed2850b55a56c727d8,a20474b57a2ed9624bb40265635e414e93b08c43..bd1c10c392fc4019a702db0f513d54316d884c11
--- 1/app/views/layouts/_header.html.erb
--- 2/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@@ -50,9 -50,6 +50,9 @@@
        <li class="compact-hide nav-item <%= current_page_class(diary_entries_path) %>">
          <%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "nav-link" %>
        </li>
 +      <li class="compact-hide nav-item <%= current_page_class(communities_path) %>">
 +        <%= link_to t("layouts.communities"), communities_path, :class => "nav-link" %>
 +      </li>
        <li class="compact-hide nav-item <%= current_page_class(copyright_path) %>">
          <%= link_to t("layouts.copyright"), copyright_path, :class => "nav-link" %>
        </li>
@@@ -75,7 -72,6 +75,7 @@@
            <% end %>
            <li class="<%= current_page_class(traces_path) %>"><%= link_to t("layouts.gps_traces"), traces_path, :class => "dropdown-item" %></li>
            <li class="<%= current_page_class(diary_entries_path) %>"><%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "dropdown-item" %></li>
 +          <li class="<%= current_page_class(communities_path) %>"><%= link_to t("layouts.communities"), communities_path, :class => "dropdown-item" %></li>
            <li class="<%= current_page_class(copyright_path) %>"><%= link_to t("layouts.copyright"), copyright_path, :class => "dropdown-item" %></li>
            <li class="<%= current_page_class(help_path) %>"><%= link_to t("layouts.help"), help_path, :class => "dropdown-item" %></li>
            <li class="<%= current_page_class(about_path) %>"><%= link_to t("layouts.about"), about_path, :class => "dropdown-item" %></li>
@@@ -99,7 -95,7 +99,7 @@@
              <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
            <% end %>
            <%= link_to t("users.show.my profile"), user_path(current_user), :class => "dropdown-item" %>
-           <%= link_to t("users.show.my settings"), { :controller => "users", :action => "account", :display_name => current_user.display_name }, { :class => "dropdown-item" } %>
+           <%= link_to t("users.show.my settings"), user_account_path(current_user), :class => "dropdown-item" %>
            <%= link_to t("users.show.my_preferences"), preferences_path, :class => "dropdown-item" %>
            <div class="dropdown-divider"></div>
            <%= yield :greeting %>

diff --combined config/locales/en.yml
index 4210beda34be9076d1478dccbedb31be8d0ddb89,5b1686c6b81b6eddf6c2f63304d00b9428bcde85..d361dc852dbccd4c08c7c1d4839a9b4619c692b7
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1431,7 -1431,6 +1431,7 @@@ en
      help: Help
      about: About
      copyright: Copyright
 +    communities: Communities
      community: Community
      community_blogs: "Community Blogs"
      community_blogs_title: "Blogs from members of the OpenStreetMap community"
@@@ -2061,7 -2060,7 +2061,7 @@@
      potlatch:
        removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
        desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
-       id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
+       id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.
      sidebar:
        search_results: Search Results
        close: Close
@@@ -2198,30 -2197,6 +2198,30 @@@
            Just go to <a href='%{map_url}'>the map</a> and click the note icon:
            <span class='icon note'></span>. This will add a marker to the map, which you can move
            by dragging. Add your message, then click save, and other mappers will investigate.
 +    communities:
 +      title: Communities
 +      lede_text: |
 +        People from all over the world contribute to or use OpenStreetMap.
 +        Whilst some are content to participate as individuals, others have formed communities.
 +        These groups come in a range of sizes and represent geographies from small towns to large multi-country regions.
 +        They can also be formal or informal.
 +      local_chapters:
 +        title: Local Chapters
 +        about_text: |
 +          Local Chapters are country-level or region-level groups that have taken the formal step of
 +          establishing not-for-profit legal entities. They represent the area's map and mappers when
 +          dealing with local government, business, and media. They have also formed an affiliation
 +          with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright
 +          governing body.
 +        list_text: |
 +          So far we have the following formally established foundation Local Chapters:
 +      other_groups:
 +        title: Other Groups
 +        about_html: |
 +          There is no need to formally establish a group to the same extent as the Local Chapters.
 +          Indeed many groups exist very sucessfully as an informal gathering of people or as a
 +          community group. Anyone can set up or join these. Read more on the
 +          <a href="https://wiki.openstreetmap.org/wiki/User_group">Communities wiki page</a>.
    traces:
      visibility:
        private: "Private (only shared as anonymous, unordered points)"
@@@ -2530,8 -2505,8 +2530,8 @@@
        spam score: "Spam Score:"
        description: Description
        user location: User location
-       if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users."
-       settings_link_text: settings
+       no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
+       edit_your_profile: Edit your profile
        my friends: My friends
        no friends: You have not added any friends yet.
        km away: "%{count}km away"