Localisation updates from https://translatewiki.net.

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index eb8a0dcd5efa82a3774a3eac8ade762795519440..7d9c8dbec9f5778d7b61ff602b9275b62baf281c 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,91 +1,93 @@
 OpenStreetMap::Application.routes.draw do
   # API
   get "api/capabilities" => "api#capabilities"
 OpenStreetMap::Application.routes.draw do
   # API
   get "api/capabilities" => "api#capabilities"

-  get "api/0.6/capabilities" => "api#capabilities"
-  get "api/0.6/permissions" => "api#permissions"
-
-  put "api/0.6/changeset/create" => "changeset#create"
-  post "api/0.6/changeset/:id/upload" => "changeset#upload", :id => /\d+/
-  get "api/0.6/changeset/:id/download" => "changeset#download", :as => :changeset_download, :id => /\d+/
-  post "api/0.6/changeset/:id/expand_bbox" => "changeset#expand_bbox", :id => /\d+/
-  get "api/0.6/changeset/:id" => "changeset#read", :as => :changeset_read, :id => /\d+/
-  post "api/0.6/changeset/:id/subscribe" => "changeset#subscribe", :as => :changeset_subscribe, :id => /\d+/
-  post "api/0.6/changeset/:id/unsubscribe" => "changeset#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/
-  put "api/0.6/changeset/:id" => "changeset#update", :id => /\d+/
-  put "api/0.6/changeset/:id/close" => "changeset#close", :id => /\d+/
-  get "api/0.6/changesets" => "changeset#query"
-  post "api/0.6/changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/
-  post "api/0.6/changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/
-  post "api/0.6/changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/
-
-  put "api/0.6/node/create" => "node#create"
-  get "api/0.6/node/:id/ways" => "way#ways_for_node", :id => /\d+/
-  get "api/0.6/node/:id/relations" => "relation#relations_for_node", :id => /\d+/
-  get "api/0.6/node/:id/history" => "old_node#history", :id => /\d+/
-  post "api/0.6/node/:id/:version/redact" => "old_node#redact", :version => /\d+/, :id => /\d+/
-  get "api/0.6/node/:id/:version" => "old_node#version", :id => /\d+/, :version => /\d+/
-  get "api/0.6/node/:id" => "node#read", :id => /\d+/
-  put "api/0.6/node/:id" => "node#update", :id => /\d+/
-  delete "api/0.6/node/:id" => "node#delete", :id => /\d+/
-  get "api/0.6/nodes" => "node#nodes"
-
-  put "api/0.6/way/create" => "way#create"
-  get "api/0.6/way/:id/history" => "old_way#history", :id => /\d+/
-  get "api/0.6/way/:id/full" => "way#full", :id => /\d+/
-  get "api/0.6/way/:id/relations" => "relation#relations_for_way", :id => /\d+/
-  post "api/0.6/way/:id/:version/redact" => "old_way#redact", :version => /\d+/, :id => /\d+/
-  get "api/0.6/way/:id/:version" => "old_way#version", :id => /\d+/, :version => /\d+/
-  get "api/0.6/way/:id" => "way#read", :id => /\d+/
-  put "api/0.6/way/:id" => "way#update", :id => /\d+/
-  delete "api/0.6/way/:id" => "way#delete", :id => /\d+/
-  get "api/0.6/ways" => "way#ways"
-
-  put "api/0.6/relation/create" => "relation#create"
-  get "api/0.6/relation/:id/relations" => "relation#relations_for_relation", :id => /\d+/
-  get "api/0.6/relation/:id/history" => "old_relation#history", :id => /\d+/
-  get "api/0.6/relation/:id/full" => "relation#full", :id => /\d+/
-  post "api/0.6/relation/:id/:version/redact" => "old_relation#redact", :version => /\d+/, :id => /\d+/
-  get "api/0.6/relation/:id/:version" => "old_relation#version", :id => /\d+/, :version => /\d+/
-  get "api/0.6/relation/:id" => "relation#read", :id => /\d+/
-  put "api/0.6/relation/:id" => "relation#update", :id => /\d+/
-  delete "api/0.6/relation/:id" => "relation#delete", :id => /\d+/
-  get "api/0.6/relations" => "relation#relations"
-
-  get "api/0.6/map" => "api#map"
-
-  get "api/0.6/trackpoints" => "api#trackpoints"
-
-  get "api/0.6/changes" => "api#changes"
-
-  get "api/0.6/search" => "search#search_all"
-  get "api/0.6/ways/search" => "search#search_ways"
-  get "api/0.6/relations/search" => "search#search_relations"
-  get "api/0.6/nodes/search" => "search#search_nodes"
-
-  get "api/0.6/user/:id" => "user#api_read", :id => /\d+/
-  get "api/0.6/user/details" => "user#api_details"
-  get "api/0.6/user/gpx_files" => "user#api_gpx_files"
-
-  get "api/0.6/user/preferences" => "user_preference#read"
-  get "api/0.6/user/preferences/:preference_key" => "user_preference#read_one"
-  put "api/0.6/user/preferences" => "user_preference#update"
-  put "api/0.6/user/preferences/:preference_key" => "user_preference#update_one"
-  delete "api/0.6/user/preferences/:preference_key" => "user_preference#delete_one"
-
-  post "api/0.6/gpx/create" => "trace#api_create"
-  get "api/0.6/gpx/:id" => "trace#api_read", :id => /\d+/
-  put "api/0.6/gpx/:id" => "trace#api_update", :id => /\d+/
-  delete "api/0.6/gpx/:id" => "trace#api_delete", :id => /\d+/
-  get "api/0.6/gpx/:id/details" => "trace#api_read", :id => /\d+/
-  get "api/0.6/gpx/:id/data" => "trace#api_data"
-
-  # AMF (ActionScript) API
-  post "api/0.6/amf/read" => "amf#amf_read"
-  post "api/0.6/amf/write" => "amf#amf_write"
-  get "api/0.6/swf/trackpoints" => "swf#trackpoints"
-
-  # Map notes API
+

   scope "api/0.6" do
   scope "api/0.6" do

+    get "capabilities" => "api#capabilities"
+    get "permissions" => "api#permissions"
+
+    put "changeset/create" => "changeset#create"
+    post "changeset/:id/upload" => "changeset#upload", :id => /\d+/
+    get "changeset/:id/download" => "changeset#download", :as => :changeset_download, :id => /\d+/
+    post "changeset/:id/expand_bbox" => "changeset#expand_bbox", :id => /\d+/
+    get "changeset/:id" => "changeset#read", :as => :changeset_read, :id => /\d+/
+    post "changeset/:id/subscribe" => "changeset#subscribe", :as => :changeset_subscribe, :id => /\d+/
+    post "changeset/:id/unsubscribe" => "changeset#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/
+    put "changeset/:id" => "changeset#update", :id => /\d+/
+    put "changeset/:id/close" => "changeset#close", :id => /\d+/
+    get "changesets" => "changeset#query"
+    post "changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/
+    post "changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/
+    post "changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/
+
+    put "node/create" => "node#create"
+    get "node/:id/ways" => "way#ways_for_node", :id => /\d+/
+    get "node/:id/relations" => "relation#relations_for_node", :id => /\d+/
+    get "node/:id/history" => "old_node#history", :id => /\d+/
+    post "node/:id/:version/redact" => "old_node#redact", :version => /\d+/, :id => /\d+/
+    get "node/:id/:version" => "old_node#version", :id => /\d+/, :version => /\d+/
+    get "node/:id" => "node#read", :id => /\d+/
+    put "node/:id" => "node#update", :id => /\d+/
+    delete "node/:id" => "node#delete", :id => /\d+/
+    get "nodes" => "node#nodes"
+
+    put "way/create" => "way#create"
+    get "way/:id/history" => "old_way#history", :id => /\d+/
+    get "way/:id/full" => "way#full", :id => /\d+/
+    get "way/:id/relations" => "relation#relations_for_way", :id => /\d+/
+    post "way/:id/:version/redact" => "old_way#redact", :version => /\d+/, :id => /\d+/
+    get "way/:id/:version" => "old_way#version", :id => /\d+/, :version => /\d+/
+    get "way/:id" => "way#read", :id => /\d+/
+    put "way/:id" => "way#update", :id => /\d+/
+    delete "way/:id" => "way#delete", :id => /\d+/
+    get "ways" => "way#ways"
+
+    put "relation/create" => "relation#create"
+    get "relation/:id/relations" => "relation#relations_for_relation", :id => /\d+/
+    get "relation/:id/history" => "old_relation#history", :id => /\d+/
+    get "relation/:id/full" => "relation#full", :id => /\d+/
+    post "relation/:id/:version/redact" => "old_relation#redact", :version => /\d+/, :id => /\d+/
+    get "relation/:id/:version" => "old_relation#version", :id => /\d+/, :version => /\d+/
+    get "relation/:id" => "relation#read", :id => /\d+/
+    put "relation/:id" => "relation#update", :id => /\d+/
+    delete "relation/:id" => "relation#delete", :id => /\d+/
+    get "relations" => "relation#relations"
+
+    get "map" => "api#map"
+
+    get "trackpoints" => "api#trackpoints"
+
+    get "changes" => "api#changes"
+
+    get "search" => "search#search_all", :as => "api_search"
+    get "ways/search" => "search#search_ways"
+    get "relations/search" => "search#search_relations"
+    get "nodes/search" => "search#search_nodes"
+
+    get "user/:id" => "users#api_read", :id => /\d+/
+    get "user/details" => "users#api_details"
+    get "user/gpx_files" => "users#api_gpx_files"
+    get "users" => "users#api_users", :as => :api_users
+
+    get "user/preferences" => "user_preferences#read"
+    get "user/preferences/:preference_key" => "user_preferences#read_one"
+    put "user/preferences" => "user_preferences#update"
+    put "user/preferences/:preference_key" => "user_preferences#update_one"
+    delete "user/preferences/:preference_key" => "user_preferences#delete_one"
+
+    post "gpx/create" => "traces#api_create"
+    get "gpx/:id" => "traces#api_read", :id => /\d+/
+    put "gpx/:id" => "traces#api_update", :id => /\d+/
+    delete "gpx/:id" => "traces#api_delete", :id => /\d+/
+    get "gpx/:id/details" => "traces#api_read", :id => /\d+/
+    get "gpx/:id/data" => "traces#api_data"
+
+    # AMF (ActionScript) API
+    post "amf/read" => "amf#amf_read"
+    post "amf/write" => "amf#amf_write"
+    get "swf/trackpoints" => "swf#trackpoints"
+
+    # Map notes API

     resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" } do
       collection do
         get "search"
     resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" } do
       collection do
         get "search"


@@ -117,11 +119,11 @@ OpenStreetMap::Application.routes.draw do
   get "/changeset/:id/comments/feed" => "changeset#comments_feed", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }
   get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note"
   get "/note/new" => "browse#new_note"
   get "/changeset/:id/comments/feed" => "changeset#comments_feed", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }
   get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note"
   get "/note/new" => "browse#new_note"

-  get "/user/:display_name/history" => "changeset#list"
+  get "/user/:display_name/history" => "changeset#index"

   get "/user/:display_name/history/feed" => "changeset#feed", :defaults => { :format => :atom }
   get "/user/:display_name/notes" => "notes#mine"
   get "/user/:display_name/history/feed" => "changeset#feed", :defaults => { :format => :atom }
   get "/user/:display_name/notes" => "notes#mine"

-  get "/history/friends" => "changeset#list", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
-  get "/history/nearby" => "changeset#list", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
+  get "/history/friends" => "changeset#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
+  get "/history/nearby" => "changeset#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }

 
   get "/browse/way/:id",                :to => redirect(:path => "/way/%{id}")
   get "/browse/way/:id/history",        :to => redirect(:path => "/way/%{id}/history")
 
   get "/browse/way/:id",                :to => redirect(:path => "/way/%{id}")
   get "/browse/way/:id/history",        :to => redirect(:path => "/way/%{id}/history")


@@ -148,37 +150,37 @@ OpenStreetMap::Application.routes.draw do
   get "/fixthemap" => "site#fixthemap"
   get "/help" => "site#help"
   get "/about" => "site#about"
   get "/fixthemap" => "site#fixthemap"
   get "/help" => "site#help"
   get "/about" => "site#about"

-  get "/history" => "changeset#list"
+  get "/history" => "changeset#index"

   get "/history/feed" => "changeset#feed", :defaults => { :format => :atom }
   get "/history/comments/feed" => "changeset#comments_feed", :as => :changesets_comments_feed, :defaults => { :format => "rss" }
   get "/export" => "site#export"
   get "/history/feed" => "changeset#feed", :defaults => { :format => :atom }
   get "/history/comments/feed" => "changeset#comments_feed", :as => :changesets_comments_feed, :defaults => { :format => "rss" }
   get "/export" => "site#export"

-  match "/login" => "user#login", :via => [:get, :post]
-  match "/logout" => "user#logout", :via => [:get, :post]
+  match "/login" => "users#login", :via => [:get, :post]
+  match "/logout" => "users#logout", :via => [:get, :post]

   get "/offline" => "site#offline"
   get "/key" => "site#key"
   get "/id" => "site#id"
   get "/query" => "browse#query"
   get "/offline" => "site#offline"
   get "/key" => "site#key"
   get "/id" => "site#id"
   get "/query" => "browse#query"

-  get "/user/new" => "user#new"
-  post "/user/new" => "user#create"
-  get "/user/terms" => "user#terms"
-  post "/user/save" => "user#save"
-  get "/user/:display_name/confirm/resend" => "user#confirm_resend"
-  match "/user/:display_name/confirm" => "user#confirm", :via => [:get, :post]
-  match "/user/confirm" => "user#confirm", :via => [:get, :post]
-  match "/user/confirm-email" => "user#confirm_email", :via => [:get, :post]
-  post "/user/go_public" => "user#go_public"
-  match "/user/reset-password" => "user#reset_password", :via => [:get, :post]
-  match "/user/forgot-password" => "user#lost_password", :via => [:get, :post]
-  get "/user/suspended" => "user#suspended"
+  get "/user/new" => "users#new"
+  post "/user/new" => "users#create"
+  get "/user/terms" => "users#terms"
+  post "/user/save" => "users#save"
+  get "/user/:display_name/confirm/resend" => "users#confirm_resend"
+  match "/user/:display_name/confirm" => "users#confirm", :via => [:get, :post]
+  match "/user/confirm" => "users#confirm", :via => [:get, :post]
+  match "/user/confirm-email" => "users#confirm_email", :via => [:get, :post]
+  post "/user/go_public" => "users#go_public"
+  match "/user/reset-password" => "users#reset_password", :via => [:get, :post]
+  match "/user/forgot-password" => "users#lost_password", :via => [:get, :post]
+  get "/user/suspended" => "users#suspended"

 
   get "/index.html", :to => redirect(:path => "/")
   get "/create-account.html", :to => redirect(:path => "/user/new")
   get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password")
 
   # omniauth
 
   get "/index.html", :to => redirect(:path => "/")
   get "/create-account.html", :to => redirect(:path => "/user/new")
   get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password")
 
   # omniauth

-  get "/auth/failure" => "user#auth_failure"
-  match "/auth/:provider/callback" => "user#auth_success", :via => [:get, :post], :as => :auth_success
-  match "/auth/:provider" => "user#auth", :via => [:get, :post], :as => :auth
+  get "/auth/failure" => "users#auth_failure"
+  match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success
+  match "/auth/:provider" => "users#auth", :via => [:get, :post], :as => :auth

 
   # permalink
   get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/
 
   # permalink
   get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/


@@ -187,43 +189,43 @@ OpenStreetMap::Application.routes.draw do
   post "/preview/:type" => "site#preview", :as => :preview
 
   # traces
   post "/preview/:type" => "site#preview", :as => :preview
 
   # traces

-  get "/user/:display_name/traces/tag/:tag/page/:page" => "trace#list", :page => /[1-9][0-9]*/
-  get "/user/:display_name/traces/tag/:tag" => "trace#list"
-  get "/user/:display_name/traces/page/:page" => "trace#list", :page => /[1-9][0-9]*/
-  get "/user/:display_name/traces" => "trace#list"
-  get "/user/:display_name/traces/tag/:tag/rss" => "trace#georss", :defaults => { :format => :rss }
-  get "/user/:display_name/traces/rss" => "trace#georss", :defaults => { :format => :rss }
-  get "/user/:display_name/traces/:id" => "trace#view"
-  get "/user/:display_name/traces/:id/picture" => "trace#picture"
-  get "/user/:display_name/traces/:id/icon" => "trace#icon"
-  get "/traces/tag/:tag/page/:page" => "trace#list", :page => /[1-9][0-9]*/
-  get "/traces/tag/:tag" => "trace#list"
-  get "/traces/page/:page" => "trace#list", :page => /[1-9][0-9]*/
-  get "/traces" => "trace#list"
-  get "/traces/tag/:tag/rss" => "trace#georss", :defaults => { :format => :rss }
-  get "/traces/rss" => "trace#georss", :defaults => { :format => :rss }
-  get "/traces/mine/tag/:tag/page/:page" => "trace#mine", :page => /[1-9][0-9]*/
-  get "/traces/mine/tag/:tag" => "trace#mine"
-  get "/traces/mine/page/:page" => "trace#mine"
-  get "/traces/mine" => "trace#mine"
-  match "/trace/create" => "trace#create", :via => [:get, :post]
-  get "/trace/:id/data" => "trace#data", :id => /\d+/, :as => "trace_data"
-  match "/trace/:id/edit" => "trace#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"
-  post "/trace/:id/delete" => "trace#delete", :id => /\d+/
+  resources :traces, :except => [:show]
+  get "/user/:display_name/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/
+  get "/user/:display_name/traces/tag/:tag" => "traces#index"
+  get "/user/:display_name/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/
+  get "/user/:display_name/traces" => "traces#index"
+  get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
+  get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss }
+  get "/user/:display_name/traces/:id" => "traces#show"
+  get "/user/:display_name/traces/:id/picture" => "traces#picture"
+  get "/user/:display_name/traces/:id/icon" => "traces#icon"
+  get "/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/
+  get "/traces/tag/:tag" => "traces#index"
+  get "/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/
+  get "/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
+  get "/traces/rss" => "traces#georss", :defaults => { :format => :rss }
+  get "/traces/mine/tag/:tag/page/:page" => "traces#mine", :page => /[1-9][0-9]*/
+  get "/traces/mine/tag/:tag" => "traces#mine"
+  get "/traces/mine/page/:page" => "traces#mine"
+  get "/traces/mine" => "traces#mine"
+  get "/trace/create", :to => redirect(:path => "/traces/new")
+  get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
+  get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")
+  post "/trace/:id/delete" => "traces#delete", :id => /\d+/

 
   # diary pages
   match "/diary/new" => "diary_entry#new", :via => [:get, :post]
 
   # diary pages
   match "/diary/new" => "diary_entry#new", :via => [:get, :post]

-  get "/diary/friends" => "diary_entry#list", :friends => true, :as => "friend_diaries"
-  get "/diary/nearby" => "diary_entry#list", :nearby => true, :as => "nearby_diaries"
+  get "/diary/friends" => "diary_entry#index", :friends => true, :as => "friend_diaries"
+  get "/diary/nearby" => "diary_entry#index", :nearby => true, :as => "nearby_diaries"

   get "/user/:display_name/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
   get "/diary/:language/rss" => "diary_entry#rss", :defaults => { :format => :rss }
   get "/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
   get "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :page => /[1-9][0-9]*/
   get "/user/:display_name/diary/comments/" => "diary_entry#comments"
   get "/user/:display_name/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
   get "/diary/:language/rss" => "diary_entry#rss", :defaults => { :format => :rss }
   get "/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
   get "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :page => /[1-9][0-9]*/
   get "/user/:display_name/diary/comments/" => "diary_entry#comments"

-  get "/user/:display_name/diary" => "diary_entry#list"
-  get "/diary/:language" => "diary_entry#list"
-  get "/diary" => "diary_entry#list"
-  get "/user/:display_name/diary/:id" => "diary_entry#view", :id => /\d+/
+  get "/user/:display_name/diary" => "diary_entry#index"
+  get "/diary/:language" => "diary_entry#index"
+  get "/diary" => "diary_entry#index"
+  get "/user/:display_name/diary/:id" => "diary_entry#show", :id => /\d+/, :as => :diary_entry

   post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
   match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
   post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry
   post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
   match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
   post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry


@@ -232,16 +234,16 @@ OpenStreetMap::Application.routes.draw do
   post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
 
   # user pages
   post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
 
   # user pages

-  get "/user/:display_name" => "user#view", :as => "user"
-  match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend"
-  match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend"
-  match "/user/:display_name/account" => "user#account", :via => [:get, :post]
-  get "/user/:display_name/set_status" => "user#set_status", :as => :set_status_user
-  get "/user/:display_name/delete" => "user#delete", :as => :delete_user
+  get "/user/:display_name" => "users#show", :as => "user"
+  match "/user/:display_name/make_friend" => "users#make_friend", :via => [:get, :post], :as => "make_friend"
+  match "/user/:display_name/remove_friend" => "users#remove_friend", :via => [:get, :post], :as => "remove_friend"
+  match "/user/:display_name/account" => "users#account", :via => [:get, :post]
+  get "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user
+  get "/user/:display_name/delete" => "users#delete", :as => :delete_user

 
   # user lists
 
   # user lists

-  match "/users" => "user#list", :via => [:get, :post]
-  match "/users/:status" => "user#list", :via => [:get, :post]
+  match "/users" => "users#index", :via => [:get, :post]
+  match "/users/:status" => "users#index", :via => [:get, :post]

 
   # geocoder
   get "/search" => "geocoder#search"
 
   # geocoder
   get "/search" => "geocoder#search"


@@ -260,13 +262,18 @@ OpenStreetMap::Application.routes.draw do
   get "/export/embed" => "export#embed"
 
   # messages
   get "/export/embed" => "export#embed"
 
   # messages

-  get "/user/:display_name/inbox" => "message#inbox", :as => "inbox"
-  get "/user/:display_name/outbox" => "message#outbox", :as => "outbox"
-  match "/message/new/:display_name" => "message#new", :via => [:get, :post], :as => "new_message"
-  get "/message/read/:message_id" => "message#read", :as => "read_message"
-  post "/message/mark/:message_id" => "message#mark", :as => "mark_message"
-  match "/message/reply/:message_id" => "message#reply", :via => [:get, :post], :as => "reply_message"
-  post "/message/delete/:message_id" => "message#delete", :as => "delete_message"
+  resources :messages, :only => [:create, :show, :destroy] do
+    post :mark
+    match :reply, :via => [:get, :post]
+    collection do
+      get :inbox
+      get :outbox
+    end
+  end
+  get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox")
+  get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
+  get "/message/new/:display_name" => "messages#new", :as => "new_message"
+  get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")

 
   # oauth admin pages (i.e: for setting up new clients, etc...)
   scope "/user/:display_name" do
 
   # oauth admin pages (i.e: for setting up new clients, etc...)
   scope "/user/:display_name" do


@@ -288,6 +295,24 @@ OpenStreetMap::Application.routes.draw do
   resources :user_blocks
   match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
 
   resources :user_blocks
   match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
 

+  # issues and reports
+  resources :issues do
+    resources :comments, :controller => :issue_comments
+    member do
+      post "resolve"
+      post "assign"
+      post "ignore"
+      post "reopen"
+    end
+  end
+
+  resources :reports
+

   # redactions
   resources :redactions
   # redactions
   resources :redactions

+
+  # errors
+  match "/403", :to => "errors#forbidden", :via => :all
+  match "/404", :to => "errors#not_found", :via => :all
+  match "/500", :to => "errors#internal_server_error", :via => :all

 end
 end