Merge pull request #5449 from AntonKhorev/edit-preferences

Make preferences page editable without clicking 'Edit Preferences'

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
index 479d353463407ea17f90d4bbadf893ddcf541df3,5bda1b37c3383c450269275a4df15abbbf7d8bb7..d2b2830fdb1346654c9c70c57993f29809d4fe90
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -276,15 -275,14 +276,16 @@@ OpenStreetMap::Application.routes.draw 
    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
 +    scope :module => :accounts do
 +      resource :terms, :only => [:show, :update]
 +      resource :deletion, :only => :show
 +    end
    end
 +
    resource :dashboard, :only => [:show]
-   resource :preferences, :only => [:show, :edit, :update]
+   resource :preferences, :only => [:show, :update]
+   get "/preferences/edit", :to => redirect(:path => "/preferences")
    resource :profile, :only => [:edit, :update]
  
    # friendships