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

diff --combined app/views/changeset/history.html.erb
index ec3adcb024134292bd5650083f1311f9fffd1e25,bd8c247037dadfb005a898e338d72b84acbb25bd..ba745cb032489d833ddcf36b997fb6b3c0a49b0f
--- 1/app/views/changeset/history.html.erb
--- 2/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@@ -5,9 -5,9 +5,9 @@@
  <% end -%>
  
  <%
-    set_title(changeset_list_title(params, current_user))
+    set_title(changeset_index_title(params, current_user))
     if params[:display_name]
-      @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
 -     @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe
++     @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
     else
       @heading = @title
     end

diff --combined app/views/changeset/index.atom.builder
index 33b28441718461243ece4a115e1bab5f5a87c1f0,b21d777284c6690533d20e2226fa95d5b17a0cf5..801b9cd398852e0e44223edb41359aa67fea8879
--- 1/app/views/changeset/list.atom.builder
--- 2/app/views/changeset/index.atom.builder
+++ b/app/views/changeset/index.atom.builder
@@@ -1,8 -1,8 +1,8 @@@
  atom_feed(:language => I18n.locale, :schema_date => 2009,
            :id => url_for(@params.merge(:only_path => false)),
-           :root_url => url_for(@params.merge(:action => :list, :format => nil, :only_path => false)),
+           :root_url => url_for(@params.merge(:action => :index, :format => nil, :only_path => false)),
            "xmlns:georss" => "http://www.georss.org/georss") do |feed|
-   feed.title changeset_list_title(params, current_user)
+   feed.title changeset_index_title(params, current_user)
  
    feed.updated @edits.map { |e| [e.created_at, e.closed_at].max }.max
    feed.icon image_url("favicon.ico")
@@@ -32,7 -32,7 +32,7 @@@
        if changeset.user.data_public?
          entry.author do |author|
            author.name changeset.user.display_name
 -          author.uri url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
 +          author.uri user_url(changeset.user, :only_path => false)
          end
        end
  
@@@ -51,7 -51,7 +51,7 @@@
              table.tr do |tr|
                tr.th t("browse.changeset.belongs_to")
                tr.td do |td|
 -                td.a h(changeset.user.display_name), :href => url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
 +                td.a h(changeset.user.display_name), :href => user_url(changeset.user, :only_path => false)
                end
              end
            end

diff --combined app/views/user/show.html.erb
index 0e99a2861279ec4286bad18b39975d1643bd6cd5,0b48d28d2ee98faeef39030041c67c27e0d9f4d1..0b48d28d2ee98faeef39030041c67c27e0d9f4d1
--- 1/app/views/user/show.html.erb
--- 2/app/views/user/view.html.erb
+++ b/app/views/user/show.html.erb
@@@ -7,7 -7,7 +7,7 @@@
          <!-- Displaying user's own profile page to themself -->
          <ul class='secondary-actions clearfix'>
            <li>
-             <%= link_to t('.my edits'), :controller => 'changeset', :action => 'list', :display_name => current_user.display_name %>
+             <%= link_to t('.my edits'), :controller => 'changeset', :action => 'index', :display_name => current_user.display_name %>
              <span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
            </li>
            <li>
@@@ -49,7 -49,7 +49,7 @@@
          <ul class='secondary-actions clearfix'>
  
            <li>
-             <%= link_to t('.edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
+             <%= link_to t('.edits'), :controller => 'changeset', :action => 'index', :display_name => @user.display_name %>
              <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
            </li>
            <li>

diff --combined config/locales/en.yml
index 872a31f6db38cb48c76a2ab276283678146d953b,92de0848304dd9538418c1b1cab4c9b3ca605214..7682204d5ea71c7bddc1b23a6621afe2e6d13d01
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -228,7 -228,7 +228,7 @@@ en
        user: "User"
        comment: "Comment"
        area: "Area"
-     list:
+     index:
        title: "Changesets"
        title_user: "Changesets by %{user}"
        title_friend: "Changesets by my friends"
@@@ -276,7 -276,7 +276,7 @@@
        use_map_link: "use map"
        save_button: "Save"
        marker_text: Diary entry location
 -    view:
 +    show:
        title: "%{user}'s diary | %{title}"
        user_title: "%{user}'s diary"
        leave_a_comment: "Leave a comment"
@@@ -2006,7 -2006,7 +2006,7 @@@
        heading: "The user %{user} does not exist"
        body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
        deleted: "deleted"
 -    view:
 +    show:
        my diary: My Diary
        new diary entry: new diary entry
        my edits: My Edits

diff --combined config/routes.rb
index 579dced162150f35de09c88c03bb2a9c5e07fc29,c0b0044555938c8e4b95bad86c1b2add9e82d50a..da7e0de71105a0e1195fae05019ecbd6a61a6a7d
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -119,11 -119,11 +119,11 @@@ OpenStreetMap::Application.routes.draw 
    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 "/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")
@@@ -150,7 -150,7 +150,7 @@@
    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"
@@@ -208,8 -208,10 +208,8 @@@
    get "/traces/mine/tag/:tag" => "traces#mine"
    get "/traces/mine/page/:page" => "traces#mine"
    get "/traces/mine" => "traces#mine"
 -  post "/trace/create" => "traces#create" # remove after deployment
    get "/trace/create", :to => redirect(:path => "/traces/new")
    get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
 -  post "trace/:id/edit" => "traces#update" # remove after deployment
    get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")
    post "/trace/:id/delete" => "traces#delete", :id => /\d+/
  
@@@ -225,7 -227,7 +225,7 @@@
    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+/, :as => :diary_entry
 +  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
@@@ -234,7 -236,7 +234,7 @@@
    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"
 +  get "/user/:display_name" => "user#show", :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]