Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Account module to Accounts #5461

Merged
merged 1 commit into from
Jan 3, 2025
+22 −24
Merged

Rename Account module to Accounts #5461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ntrollers/account/deletions_controller.rb → ...trollers/accounts/deletions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Account
module Accounts
class DeletionsController < ApplicationController
layout "site"

Expand Down
0 app/views/account/deletions/show.html.erb → app/views/accounts/deletions/show.html.erb
View file
Open in desktop
File renamed without changes.
37 changes: 18 additions & 19 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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}"
Expand Down
7 changes: 3 additions & 4 deletions config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,10 @@
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]
Expand Down
Loading