cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2025-01-03 19:32:42 +00:00
commit 95b919c5d1
4 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

37
config/locales/en.yml
View file

@ -245,25 +245,6 @@ en:
entry:
comment: Comment
full: Full note
account:
deletions:
show:
title: Delete My Account
warning: Warning! The account deletion process is final, and cannot be reversed.
delete_account: Delete Account
delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
delete_profile: Your profile information, including your avatar, description and home location will be removed.
delete_display_name: Your display name will be removed, and can be reused by other accounts.
retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
retain_edits: Your edits to the map database, if any, will be retained.
retain_traces: Your uploaded traces, if any, will be retained.
retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
retain_changeset_discussions: Your changeset discussions, if any, will be retained.
retain_email: Your email address will be retained.
recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
confirm_delete: Are you sure?
cancel: Cancel
accounts:
edit:
title: "Edit account"
@ -305,6 +286,24 @@ en:
success: "User information updated successfully."
destroy:
success: "Account Deleted."
deletions:
show:
title: Delete My Account
warning: Warning! The account deletion process is final, and cannot be reversed.
delete_account: Delete Account
delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
delete_profile: Your profile information, including your avatar, description and home location will be removed.
delete_display_name: Your display name will be removed, and can be reused by other accounts.
retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
retain_edits: Your edits to the map database, if any, will be retained.
retain_traces: Your uploaded traces, if any, will be retained.
retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
retain_changeset_discussions: Your changeset discussions, if any, will be retained.
retain_email: Your email address will be retained.
recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
confirm_delete: Are you sure?
cancel: Cancel
browse:
deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
edited_ago_by_html: "Edited %{time_ago} by %{user}"

7
config/routes.rb
View file

@ -279,11 +279,10 @@ OpenStreetMap::Application.routes.draw do
get "/user/:display_name/account", :to => redirect(:path => "/account/edit")
post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user
resource :account, :only => [:edit, :update, :destroy]
namespace :account do
resource :deletion, :only => [:show]
resource :account, :only => [:edit, :update, :destroy] do
resource :deletion, :module => :accounts, :only => :show
end
resource :dashboard, :only => [:show]
resource :preferences, :only => [:show, :edit, :update]
resource :profile, :only => [:edit, :update]