From: Tom Hughes <tom@compton.nu>
Date: Sat, 15 Feb 2025 17:36:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5681'
X-Git-Tag: live~226
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4635fcf04a2d56160519cc5c20c578ec30d6dbcd?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/pull/5681'
---

4635fcf04a2d56160519cc5c20c578ec30d6dbcd
diff --combined app/views/layouts/_header.html.erb
index 1f5856908,2e5af50b4..f09812972
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@@ -27,43 -27,59 +27,43 @@@
        </ul>
      </div>
    </nav>
 -  <nav class='secondary d-flex gap-2 align-items-center'>
 -    <ul class='nav flex-nowrap'>
 +  <nav class='secondary d-flex gap-2 flex-grow-1 align-items-center'>
 +    <ul id='secondary-nav-menu' class='nav flex-grow-1' data-turbo-permanent>
        <% if Settings.status != "database_offline" && can?(:index, Issue) %>
 -        <li class="compact-hide nav-item">
 +        <li class="nav-item">
            <%= link_to issues_path(:status => "open"), :class => header_nav_link_class(issues_path) do %>
              <%= t("layouts.issues") %>
              <%= open_issues_count %>
            <% end -%>
          </li>
        <% end %>
 -      <li class="compact-hide nav-item">
 +      <li class="nav-item">
          <%= link_to t("layouts.history"), history_path, :class => header_nav_link_class(history_path) %>
        </li>
 -      <li class="compact-hide nav-item">
 +      <li class="nav-item">
          <%= link_to t("layouts.export"), export_path, :class => header_nav_link_class(export_path) %>
        </li>
 -      <li class="compact-hide nav-item">
 +      <li class="nav-item">
          <%= link_to t("layouts.gps_traces"), traces_path, :class => header_nav_link_class(traces_path) %>
        </li>
 -      <li class="compact-hide nav-item">
 +      <li class="nav-item">
          <%= link_to t("layouts.user_diaries"), diary_entries_path, :class => header_nav_link_class(diary_entries_path) %>
        </li>
 -      <li class="compact-hide nav-item">
 +      <li class="nav-item">
          <%= link_to t("layouts.communities"), communities_path, :class => header_nav_link_class(communities_path) %>
        </li>
 -      <li class="compact-hide nav-item">
 +      <li class="nav-item">
          <%= link_to t("layouts.copyright"), copyright_path, :class => header_nav_link_class(copyright_path) %>
        </li>
 -      <li class="compact-hide nav-item">
 +      <li class="nav-item">
          <%= link_to t("layouts.help"), help_path, :class => header_nav_link_class(help_path) %>
        </li>
 -      <li class="compact-hide nav-item">
 +      <li class="nav-item">
          <%= link_to t("layouts.about"), about_path, :class => header_nav_link_class(about_path) %>
        </li>
 -      <li id="compact-secondary-nav" class="dropdown nav-item">
 +      <li id="compact-secondary-nav" class="dropdown nav-item ms-auto">
          <button class="dropdown-toggle nav-link btn btn-outline-secondary border-0 bg-body text-secondary" type="button" data-bs-toggle="dropdown"><%= t "layouts.more" %></button>
          <ul class="dropdown-menu">
 -          <% if Settings.status != "database_offline" && can?(:index, Issue) %>
 -            <li>
 -              <%= link_to issues_path(:status => "open"), :class => "dropdown-item" do %>
 -                <%= t("layouts.issues") %>
 -                <%= open_issues_count %>
 -              <% end -%>
 -            </li>
 -          <% end %>
 -          <li><%= link_to t("layouts.history"), history_path, :class => "dropdown-item" %></li>
 -          <li><%= link_to t("layouts.export"), export_path, :class => "dropdown-item" %></li>
 -          <li><%= link_to t("layouts.gps_traces"), traces_path, :class => "dropdown-item" %></li>
 -          <li><%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "dropdown-item" %></li>
 -          <li><%= link_to t("layouts.communities"), communities_path, :class => "dropdown-item" %></li>
 -          <li><%= link_to t("layouts.copyright"), copyright_path, :class => "dropdown-item" %></li>
 -          <li><%= link_to t("layouts.help"), help_path, :class => "dropdown-item" %></li>
 -          <li><%= link_to t("layouts.about"), about_path, :class => "dropdown-item" %></li>
          </ul>
        </li>
      </ul>
@@@ -85,12 -101,10 +85,12 @@@
              <span class='badge count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
            <% end %>
            <%= link_to t("users.show.my profile"), current_user, :class => "dropdown-item" %>
-           <%= link_to t("users.show.my settings"), edit_account_path, :class => "dropdown-item" %>
+           <%= link_to t("users.show.my_account"), edit_account_path, :class => "dropdown-item" %>
            <%= link_to t("users.show.my_preferences"), preferences_path, :class => "dropdown-item" %>
            <div class="dropdown-divider"></div>
 -          <%= yield :greeting %>
 +          <% if current_user.home_location? %>
 +            <%= link_to t("layouts.home"), account_home_path, :class => "dropdown-item" %>
 +          <% end %>
            <%= link_to t("layouts.logout"), logout_path(:referer => request.fullpath), :method => "post", :class => "geolink dropdown-item" %>
          </div>
        </div>
diff --combined config/locales/en.yml
index 6c0a78038,eb87f790a..2f7cae65e
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -246,7 -246,7 +246,7 @@@ en
    accounts:
      edit:
        title: "Edit account"
-       my settings: My Settings
+       my_account: My Account
        current email address: "Current Email Address"
        external auth: "External Authentication"
        openid:
@@@ -1922,7 -1922,7 +1922,7 @@@
        failure: Couldn't update profile.
    sessions:
      new:
 -      tab_title: "Log in"
 +      tab_title: "Log In"
        login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
        email or username: "Email Address or Username"
        password: "Password"
@@@ -2653,8 -2653,8 +2653,8 @@@
        need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
      settings_menu:
        account_settings: Account Settings
 -      oauth2_applications: OAuth 2 applications
 -      oauth2_authorizations: OAuth 2 authorizations
 +      oauth2_applications: OAuth 2 Applications
 +      oauth2_authorizations: OAuth 2 Authorizations
        muted_users: Muted Users
      auth_providers:
        openid_url: "OpenID URL"
@@@ -2713,7 -2713,6 +2713,7 @@@
        write_gpx: Upload GPS traces
        write_notes: Modify notes
        write_redactions: Redact map data
 +      write_blocks: Create and revoke user blocks
        read_email: Read user email address
        consume_messages: Read, update status and delete user messages
        send_messages: Send private messages to other users
@@@ -2771,7 -2770,7 +2771,7 @@@
    users:
      new:
        title: "Sign Up"
 -      tab_title: "Sign up"
 +      tab_title: "Sign Up"
        signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
        please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
@@@ -2810,7 -2809,7 +2810,7 @@@
        my notes: My Notes
        my messages: My Messages
        my profile: My Profile
-       my settings: My Settings
+       my_account: My Account
        my comments: My Comments
        my_preferences: My Preferences
        my_dashboard: My Dashboard
@@@ -2904,7 -2903,7 +2904,7 @@@
        index:
          heading_html: "%{user}'s Comments"
          changesets: "Changesets"
 -        diary_entries: "Diary entries"
 +        diary_entries: "Diary Entries"
          no_comments: "No comments"
      changeset_comments:
        index:
@@@ -3317,9 -3316,6 +3317,9 @@@
        show_address: Show address
        query_features: Query features
        centre_map: Centre map here
 +    home:
 +      marker_title: My home location
 +      not_set: Home location is not set for your account
    redactions:
      edit:
        heading: "Edit Redaction"