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

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

Browse source
This commit is contained in:
Tom Hughes 2018-08-30 18:26:05 +01:00
commit a1b179fa38
11 changed files with 140 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/locales/en.yml
View file

@ -1723,9 +1723,11 @@ en:
visibility: "Visibility:"
visibility_help: "what does this mean?"
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
update:
updated: Trace updated
trace_optionals:
tags: "Tags"
view:
show:
title: "Viewing trace %{name}"
heading: "Viewing trace %{name}"
pending: "PENDING"
@ -1740,8 +1742,8 @@ en:
description: "Description:"
tags: "Tags:"
none: "None"
edit_track: "Edit this trace"
delete_track: "Delete this trace"
edit_trace: "Edit this trace"
delete_trace: "Delete this trace"
trace_not_found: "Trace not found!"
visibility: "Visibility:"
confirm_delete: "Delete this trace?"
@ -1765,7 +1767,7 @@ en:
by: "by"
in: "in"
map: "map"
list:
index:
public_traces: "Public GPS traces"
my_traces: "My GPS traces"
public_traces_from: "Public GPS traces from %{user}"

22
config/routes.rb
View file

@ -189,30 +189,30 @@ OpenStreetMap::Application.routes.draw do
post "/preview/:type" => "site#preview", :as => :preview
# traces
get "/user/:display_name/traces/tag/:tag/page/:page" => "traces#list", :page => /[1-9][0-9]*/
get "/user/:display_name/traces/tag/:tag" => "traces#list"
get "/user/:display_name/traces/page/:page" => "traces#list", :page => /[1-9][0-9]*/
get "/user/:display_name/traces" => "traces#list"
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#view"
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#list", :page => /[1-9][0-9]*/
get "/traces/tag/:tag" => "traces#list"
get "/traces/page/:page" => "traces#list", :page => /[1-9][0-9]*/
get "/traces" => "traces#list"
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"
resources :traces, :only => [:new, :create]
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"
match "/trace/:id/edit" => "traces#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"
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+/
# diary pages