X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e2abf1254bbadf4827f3f74a0b890622fbf11b00..b06b6c2ce9b69d6996cbc0c75f83eda2ea785201:/app/controllers/changeset_controller.rb?ds=sidebyside
diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index d7f3d39c8..f02718cc9 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -278,22 +278,38 @@ class ChangesetController < ApplicationController
bbox = params[:minlon] + ',' + params[:minlat] + ',' + params[:maxlon] + ',' + params[:maxlat]
end
+ user_link = bbox_link = nil
+
if bbox
conditions = cond_merge conditions, conditions_bbox(bbox)
bbox = BoundingBox.from_s(bbox)
bbox_link = "#{bbox.to_s}"
end
- @title = t 'changeset.list.title'
+ if user
+ user_link = "#{user.display_name}"
+ end
if user and bbox
- @description = t 'changeset.list.description_user_bbox', :user => user.display_name, :bbox => bbox_link
+ @title = t 'changeset.list.title_user_bbox', :user => user.display_name, :bbox => bbox.to_s
+ @heading = t 'changeset.list.heading_user_bbox', :user => user.display_name, :bbox => bbox.to_s
+ @description = t 'changeset.list.description_user_bbox', :user => user_link, :bbox => bbox_link
+ @description_plain = t 'changeset.list.description_user_bbox', :user => user.display_name, :bbox => bbox.to_s
elsif user
- @description = t 'changeset.list.description_user', :user => user.display_name
+ @title = t 'changeset.list.title_user', :user => user.display_name
+ @heading = t 'changeset.list.heading_user', :user => user.display_name
+ @description = t 'changeset.list.description_user', :user => user_link
+ @description_plain = t 'changeset.list.description_user', :user => user.display_name
elsif bbox
+ @title = t 'changeset.list.title_bbox', :bbox => bbox.to_s
+ @heading = t 'changeset.list.heading_bbox', :bbox => bbox.to_s
@description = t 'changeset.list.description_bbox', :bbox => bbox_link
+ @description_plain = t 'changeset.list.description_bbox', :bbox => bbox.to_s
else
+ @title = t 'changeset.list.title'
+ @heading = t 'changeset.list.heading'
@description = t 'changeset.list.description'
+ @description_plain = @description
end
@edit_pages, @edits = paginate(:changesets,