X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9df991e343d55776c0e645e373110f8039593d04..e890528aacd74420e445793b532271996e700577:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 3af1f3ab9..c02ced7c2 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -265,7 +265,8 @@ class ChangesetController < ApplicationController else conditions = cond_merge conditions, ['false'] end - elsif params[:format] == 'rhtml' + elsif request.format == :html + @title = t 'user.no_such_user.title' @not_found_user = params[:display_name] render :template => 'user/no_such_user', :status => :not_found end @@ -283,13 +284,25 @@ class ChangesetController < ApplicationController bbox_link = "#{bbox.to_s}" end + 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 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 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 else + @title = t 'changeset.list.title' + @heading = t 'changeset.list.heading' @description = t 'changeset.list.description' end