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

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

Browse source
This commit is contained in:
Tom Hughes 2024-08-28 19:03:53 +01:00
commit 549a46c867
10 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
config/locales/en.yml
View file

@ -246,18 +246,6 @@ en:
entry:
comment: Comment
full: Full note
feeds:
changeset_comments:
comment:
comment: "New comment on changeset #%{changeset_id} by %{author}"
commented_at_by_html: "Updated %{when} by %{user}"
comments:
comment: "New comment on changeset #%{changeset_id} by %{author}"
index:
title_all: OpenStreetMap changeset discussion
title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
timeout:
sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
account:
deletions:
show:
@ -426,6 +414,18 @@ en:
old_relations:
not_found:
sorry: "Sorry, relation #%{id} version %{version} could not be found."
changeset_comments:
feeds:
comment:
comment: "New comment on changeset #%{changeset_id} by %{author}"
commented_at_by_html: "Updated %{when} by %{user}"
comments:
comment: "New comment on changeset #%{changeset_id} by %{author}"
show:
title_all: OpenStreetMap changeset discussion
title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
timeout:
sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
changesets:
changeset_paging_nav:
showing_page: "Page %{page}"

10
config/routes.rb
View file

@ -126,8 +126,8 @@ OpenStreetMap::Application.routes.draw do
resources :changesets, :path => "changeset", :id => /\d+/, :only => :show do
match :subscribe, :unsubscribe, :on => :member, :via => [:get, :post]
namespace :feeds, :path => "" do
resources :changeset_comments, :path => "comments/feed", :only => :index, :defaults => { :format => "rss" }
namespace :changeset_comments, :as => :comments, :path => :comments do
resource :feed, :only => :show, :defaults => { :format => "rss" }
end
end
resources :notes, :path => "note", :id => /\d+/, :only => [:show, :new]
@ -167,8 +167,10 @@ OpenStreetMap::Application.routes.draw do
get "/communities" => "site#communities"
get "/history" => "changesets#index"
get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }
namespace :feeds, :path => "" do
resources :changeset_comments, :path => "/history/comments/feed", :only => :index, :defaults => { :format => "rss" }
scope "/history" do
namespace :changeset_comments, :path => :comments, :as => :changesets_comments do
resource :feed, :only => :show, :defaults => { :format => "rss" }
end
end
get "/export" => "site#export"
get "/login" => "sessions#new"