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

diff --git a/app/controllers/account/deletions_controller.rb b/app/controllers/accounts/deletions_controller.rb
similarity index 92%
rename from app/controllers/account/deletions_controller.rb
rename to app/controllers/accounts/deletions_controller.rb
index 2e3c777fa362b7cd4a3070215715468e14c6388e..303da6cfb5d0d9bb9f0e7b1dde499a084d79abe5 100644 (file)
--- a/app/controllers/account/deletions_controller.rb
+++ b/app/controllers/accounts/deletions_controller.rb
@@ -1,4 +1,4 @@
-module Account
+module Accounts
   class DeletionsController < ApplicationController
     layout "site"
 

diff --git a/app/views/account/deletions/show.html.erb b/app/views/accounts/deletions/show.html.erb
similarity index 100%
rename from app/views/account/deletions/show.html.erb
rename to app/views/accounts/deletions/show.html.erb

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 72632d1e8af9a7a55cbfb3d020c8b544464e8a00..3fabe13c1ff39502935a9dbe39e7898bd40ded3d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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}"

diff --git a/config/routes.rb b/config/routes.rb
index d213030c6729466bb2f0b48144ff60e284c25063..6d6acc7db34654bfe024a1f1acb556476b8208f2 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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]