cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2018-09-10 18:58:27 +01:00
commit 0e0c89b95c
11 changed files with 70 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/locales/en.yml
View file

@ -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"

10
config/routes.rb
View file

@ -215,16 +215,16 @@ OpenStreetMap::Application.routes.draw do
# 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+/