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

diff --combined config/locales/en.yml
index ba70cbfb6580cb9042b6a732fbda4ecbb58a1f0b,80558e6724eaa32097f5848cb5272c3e6e021bd4..50c9cc754da25a053298903e39272b3e9f4697d0
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -622,15 -622,6 +622,6 @@@ en
        heading: Unsubscribe from the following diary entry discussion?
        button: Unsubscribe from discussion
    diary_comments:
-     index:
-       title: "Diary Comments added by %{user}"
-       heading: "%{user}'s Diary Comments"
-       subheading_html: "Diary Comments added by %{user}"
-       no_comments: "No diary comments"
-     page:
-       post: Post
-       when: When
-       comment: Comment
      new:
        heading: Add a comment to the following diary entry discussion?
    doorkeeper:
@@@ -1948,6 -1939,9 +1939,9 @@@
        preview: Preview
        help: Help
      pagination:
+       changeset_comments:
+         older: Older Comments
+         newer: Newer Comments
        diary_comments:
          older: Older Comments
          newer: Newer Comments
@@@ -2616,14 -2610,13 +2610,14 @@@
      offline:
        heading: "GPX Storage Offline"
        message: "The GPX file storage and upload system is currently unavailable."
 -    georss:
 -      title: "OpenStreetMap GPS Traces"
 -    description:
 -      description_with_count:
 -        one: "GPX file with %{count} point from %{user}"
 -        other: "GPX file with %{count} points from %{user}"
 -      description_without_count: "GPX file from %{user}"
 +    feeds:
 +      show:
 +        title: "OpenStreetMap GPS Traces"
 +      description:
 +        description_with_count:
 +          one: "GPX file with %{count} point from %{user}"
 +          other: "GPX file with %{count} points from %{user}"
 +        description_without_count: "GPX file from %{user}"
    application:
      permission_denied: You do not have permission to access that action
      require_cookies:
@@@ -2882,6 -2875,26 +2876,26 @@@
        user:
          summary_html: "%{name} created from %{ip_address} on %{date}"
          summary_no_ip_html: "%{name} created on %{date}"
+     comments:
+       index:
+         heading_html: "%{user}'s Comments"
+         changesets: "Changesets"
+         diary_entries: "Diary entries"
+         no_comments: "No comments"
+     changeset_comments:
+       index:
+         title: "Changeset Comments added by %{user}"
+       page:
+         changeset: Changeset
+         when: When
+         comment: Comment
+     diary_comments:
+       index:
+         title: "Diary Comments added by %{user}"
+       page:
+         post: Post
+         when: When
+         comment: Comment
      suspended:
        title: Account Suspended
        heading: Account Suspended

diff --combined config/routes.rb
index 6efd17759e273e8a0d27d3e79634214d7cc34eb9,eb107ab263e423165ccb1cf752d3256455995383..242423996f5687e75b13ac1cdb05f9c62f21accf
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -64,11 -64,11 +64,11 @@@ OpenStreetMap::Application.routes.draw 
      get "relations" => "relations#index"
  
      get "map" => "map#index"
 -
 -    get "trackpoints" => "tracepoints#index"
    end
  
    namespace :api, :path => "api/0.6" do
 +    resources :tracepoints, :path => "trackpoints", :only => :index
 +
      resources :users, :only => :index
      resources :users, :path => "user", :id => /\d+/, :only => :show
      resources :user_traces, :path => "user/gpx_files", :module => :users, :controller => :traces, :only => :index
@@@ -211,30 -211,30 +211,30 @@@
    post "/preview/:type" => "site#preview", :as => :preview
  
    # traces
 -  resources :traces, :except => [:show]
 +  resources :traces, :id => /\d+/, :except => [:show]
    get "/user/:display_name/traces/tag/:tag/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/traces/tag/%{tag}")
    get "/user/:display_name/traces/tag/:tag" => "traces#index"
    get "/user/:display_name/traces/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/traces")
    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", :as => "show_trace"
 -  scope "/user/:display_name/traces/:trace_id", :module => :traces do
 +  get "/user/:display_name/traces/:id" => "traces#show", :id => /\d+/, :as => "show_trace"
 +  scope "/user/:display_name/traces/:trace_id", :module => :traces, :trace_id => /\d+/ do
      get "picture" => "pictures#show", :as => "trace_picture"
      get "icon" => "icons#show", :as => "trace_icon"
    end
    get "/traces/tag/:tag/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces/tag/%{tag}")
    get "/traces/tag/:tag" => "traces#index"
    get "/traces/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces")
 -  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", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces/mine/tag/%{tag}")
    get "/traces/mine/tag/:tag" => "traces#mine"
    get "/traces/mine/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/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")
 +  get "/trace/:id/edit", :id => /\d+/, :to => redirect(:path => "/traces/%{id}/edit")
 +
 +  namespace :traces, :path => "" do
 +    resource :feed, :path => "(/user/:display_name)/traces(/tag/:tag)/rss", :only => :show, :defaults => { :format => :rss }
 +  end
  
    # diary pages
    resources :diary_entries, :path => "diary", :only => [:new, :create, :index] do
@@@ -246,8 -246,6 +246,6 @@@
    get "/user/:display_name/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss }
    get "/diary/:language/rss" => "diary_entries#rss", :defaults => { :format => :rss }
    get "/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss }
-   get "/user/:display_name/diary/comments/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary/comments")
-   get "/user/:display_name/diary/comments" => "diary_comments#index", :as => :diary_comments
    get "/user/:display_name/diary" => "diary_entries#index"
    get "/diary/:language" => "diary_entries#index"
    scope "/user/:display_name" do
@@@ -269,12 -267,15 +267,15 @@@
    resources :users, :path => "user", :param => :display_name, :only => [:new, :create, :show] do
      resource :role, :controller => "user_roles", :path => "roles/:role", :only => [:create, :destroy]
      scope :module => :users do
+       resources :diary_comments, :only => :index
+       resources :changeset_comments, :only => :index
        resource :issued_blocks, :path => "blocks_by", :only => :show
        resource :received_blocks, :path => "blocks", :only => [:show, :edit, :destroy]
        resource :status, :only => :update
      end
    end
    get "/user/:display_name/account", :to => redirect(:path => "/account/edit")
+   get "/user/:display_name/diary/comments(/:page)", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary_comments")
  
    resource :account, :only => [:edit, :update, :destroy] do
      scope :module => :accounts do