From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Sep 2018 17:58:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1985'
X-Git-Tag: live~2907
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0e0c89b95c16abd7bc548bea7bff03cbb715b3b3?hp=-c

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

0e0c89b95c16abd7bc548bea7bff03cbb715b3b3
diff --combined config/locales/en.yml
index bebfedfde,d7837f2ff..7636bad03
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -253,7 -253,7 +253,7 @@@ en
      new:
        title: New Diary Entry
        publish_button: "Publish"
-     list:
+     index:
        title: "Users' diaries"
        title_friends: "Friends' diaries"
        title_nearby: "Nearby Users' diaries"
@@@ -2168,7 -2168,7 +2168,7 @@@
        not_a_friend: "%{name} is not one of your friends."
      filter:
        not_an_administrator: "You need to be an administrator to perform that action."
 -    list:
 +    index:
        title: Users
        heading: Users
        showing:
diff --combined config/routes.rb
index 35c46d8c1,77857aeac..e60994863
--- a/config/routes.rb
+++ b/config/routes.rb
@@@ -215,16 -215,16 +215,16 @@@ OpenStreetMap::Application.routes.draw 
  
    # 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" => "diary_entry#list"
-   get "/diary/:language" => "diary_entry#list"
-   get "/diary" => "diary_entry#list"
+   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+/
@@@ -242,8 -242,8 +242,8 @@@
    get "/user/:display_name/delete" => "user#delete", :as => :delete_user
  
    # user lists
 -  match "/users" => "user#list", :via => [:get, :post]
 -  match "/users/:status" => "user#list", :via => [:get, :post]
 +  match "/users" => "user#index", :via => [:get, :post]
 +  match "/users/:status" => "user#index", :via => [:get, :post]
  
    # geocoder
    get "/search" => "geocoder#search"