From 35785067979a410f2a3f78927d50869ee398f349 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 8 Jun 2009 20:10:09 +0000 Subject: [PATCH] Add a title to the changeset lists. Closes #1938. --- app/controllers/changeset_controller.rb | 3 +++ app/views/changeset/list.rhtml | 2 +- app/views/changeset/list.rxml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 3af1f3ab9..8c20ddb4d 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -266,6 +266,7 @@ class ChangesetController < ApplicationController conditions = cond_merge conditions, ['false'] end elsif params[:format] == 'rhtml' + @title = t 'user.no_such_user.title' @not_found_user = params[:display_name] render :template => 'user/no_such_user', :status => :not_found end @@ -283,6 +284,8 @@ class ChangesetController < ApplicationController bbox_link = "#{bbox.to_s}" end + @title = t 'changeset.list.title' + if user and bbox @description = t 'changeset.list.description_user_bbox', :user => user.display_name, :bbox => bbox_link elsif user diff --git a/app/views/changeset/list.rhtml b/app/views/changeset/list.rhtml index fba45be50..c3d88bf6e 100644 --- a/app/views/changeset/list.rhtml +++ b/app/views/changeset/list.rhtml @@ -1,4 +1,4 @@ -

<%= t'changeset.list.title' %>

+

<%= @title %>

<%= @description %>

<%= render :partial => 'changeset_paging_nav' %> diff --git a/app/views/changeset/list.rxml b/app/views/changeset/list.rxml index f97516e61..0251367fc 100644 --- a/app/views/changeset/list.rxml +++ b/app/views/changeset/list.rxml @@ -2,7 +2,7 @@ xml.rss("version" => "2.0", "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", "xmlns:georss" => "http://www.georss.org/georss") do xml.channel do - xml.title t('changeset.list.title') + xml.title @title xml.description @description xml.link url_for(params.merge({ :only_path => false })) xml.image do -- 2.43.2