]> git.openstreetmap.org Git - rails.git/commitdiff
Merge pull request #5677 from tomhughes/user-list-enhancements
authorAndy Allan <git@gravitystorm.co.uk>
Sat, 15 Feb 2025 17:37:48 +0000 (17:37 +0000)
committerGitHub <noreply@github.com>
Sat, 15 Feb 2025 17:37:48 +0000 (17:37 +0000)
User list enhancements

1  2 
config/locales/en.yml

diff --combined config/locales/en.yml
index 2f7cae65e83b4e55036d8ceca56e2809a1c95763,03458b00d566626d6e0c25b894de1fbeabbce70c..42669ca9e3f5ba19ac77998c7cc3b0130dc7aa0f
@@@ -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:
          agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
          link: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
          link text: "what is this?"
 +        not_agreed_with_pd: "You haven't declared that you consider your edits to be in the Public Domain."
 +        pd_link_text: "declare"
        save changes button: Save Changes
        delete_account: Delete Account...
      go_public:
          read_ct: "I have read and agree to the above contributor terms"
          tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text."
          read_tou: "I have read and agree to the Terms of Use"
 -        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
 -        consider_pd_why: "what's this?"
 -        consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
          guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
          readable_summary: human readable summary
          informal_translations: informal translations
          terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
          terms_declined_link: this wiki page
          terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
 +    pd_declarations:
 +      show:
 +        title: Consider my contributions to be in the Public Domain
 +        consider_pd: "I consider my contributions to be in the Public Domain"
 +        consider_pd_why: "Why would I want my contributions to be Public Domain?"
 +        consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
 +        confirm: Confirm
 +      create:
 +        successfully_declared: "You have successfully declared that you consider your edits to be in the Public Domain."
 +        already_declared: "You have already declared that you consider your edits to be in the Public Domain."
 +        did_not_confirm: "You didn't confirm that you consider your edits to be in the Public Domain."
    browse:
      deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
      edited_ago_by_html: "Edited %{time_ago} by %{user}"
        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"
        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"
        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
    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.'
          privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
          privacy_policy_title: OSMF privacy policy including section on email addresses
          html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
 -      consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
 -      consider_pd: "public domain"
 -      consider_pd_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
        or: "or"
        use external auth: "or sign up with a third party"
      no_such_user:
        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
        show:
          title: Users
          heading: Users
-         empty: No matching users found
+         select_status: Select Status
+         states:
+           pending: Pending
+           active: Active
+           confirmed: Confirmed
+           suspended: Suspended
+           deleted: Deleted
+         ip_address: IP Address
+         search: Search
        page:
          found_users:
            one: "%{count} user found"
            other: "%{count} users found"
          confirm: Confirm Selected Users
          hide: Hide Selected Users
+         empty: No matching users found
        user:
          summary_html: "%{name} created from %{ip_address} on %{date}"
          summary_no_ip_html: "%{name} created on %{date}"
        index:
          heading_html: "%{user}'s Comments"
          changesets: "Changesets"
 -        diary_entries: "Diary entries"
 +        diary_entries: "Diary Entries"
          no_comments: "No comments"
      changeset_comments:
        index:
        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"