in the description. So adjust the code that creates the changeset
browser title/description to emit a XHTML and plaintext version with
the HTML and Atom output can use, respectively.
Also:
* Split up @title into @title and @heading as elsewhere
* Turn the username on the user / user+bbox browser into a link to the userpage
* Say "Changesets" instead of "Recent changes". Unlike Wikipedia the changes on OSM aren't guaranteed to be recent, they're just going to be the latest
bbox = params[:minlon] + ',' + params[:minlat] + ',' + params[:maxlon] + ',' + params[:maxlat]
end
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 = "<a href='#{url_for(:controller => "site", :action => "index", :minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => "yes")}'>#{bbox.to_s}</a>"
end
if bbox
conditions = cond_merge conditions, conditions_bbox(bbox)
bbox = BoundingBox.from_s(bbox)
bbox_link = "<a href='#{url_for(:controller => "site", :action => "index", :minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => "yes")}'>#{bbox.to_s}</a>"
end
- @title = t 'changeset.list.title'
+ if user
+ user_link = "<a href='#{url_for(:controller => "user", :action => "view", :display_name => user.display_name)}'>#{user.display_name}</a>"
+ end
- @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
- @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
+ @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 = t 'changeset.list.description_bbox', :bbox => bbox_link
+ @description_plain = t 'changeset.list.description_bbox', :bbox => bbox.to_s
+ @title = t 'changeset.list.title'
+ @heading = t 'changeset.list.heading'
@description = t 'changeset.list.description'
@description = t 'changeset.list.description'
+ @description_plain = @description
end
@edit_pages, @edits = paginate(:changesets,
end
@edit_pages, @edits = paginate(:changesets,
feed.title @title
feed.subtitle :type => 'xhtml' do |xhtml|
feed.title @title
feed.subtitle :type => 'xhtml' do |xhtml|
+ xhtml.p @description_plain
end
feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max
end
feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max
+<h1><%= @heading %></h1>
<p><%= @description %></p>
<%= render :partial => 'changeset_paging_nav' %>
<p><%= @description %></p>
<%= render :partial => 'changeset_paging_nav' %>
area: "Area"
list:
title: "Changesets"
area: "Area"
list:
title: "Changesets"
- description: "Recent edits"
- description_user: "Recent edits by {{user}}"
- description_bbox: "Recent edits within {{bbox}}"
- description_user_bbox: "Recent edits by {{user}} within {{bbox}}"
+ title_user: "Changesets by {{user}}"
+ title_bbox: "Changesets within {{bbox}}"
+ title_user_bbox: "Changesets by {{user}} within {{bbox}}"
+
+ heading: "Changesets"
+ heading_user: "Changesets by {{user}}"
+ heading_bbox: "Changesets within {{bbox}}"
+ heading_user_bbox: "Changesets by {{user}} within {{bbox}}"
+
+ description: "Recent changes"
+ description_user: "Changesets by {{user}}"
+ description_bbox: "Changesets within {{bbox}}"
+ description_user_bbox: "Changesets by {{user}} within {{bbox}}"
diary_entry:
new:
title: New Diary Entry
diary_entry:
new:
title: New Diary Entry
area: "Svæði"
list:
title: "Breytingarsett"
area: "Svæði"
list:
title: "Breytingarsett"
+ title_user: "Breytingar eftir {{user}}"
+ title_bbox: "Breytingar innan {{bbox}}"
+ title_user_bbox: "Breytingar eftir {{user}} innan {{bbox}}"
+
+ heading: "Breytingarsett"
+ heading_user: "Breytingar eftir {{user}}"
+ heading_bbox: "Breytingar innan {{bbox}}"
+ heading_user_bbox: "Breytingar eftir {{user}} innan {{bbox}}"
+
description: "Nýlegar breytingar"
description: "Nýlegar breytingar"
- description_user: "Nýlegar breytingar eftir {{user}}"
- description_bbox: "Nýlegar breytingar innan {{bbox}}"
- description_user_bbox: "Nýlegar breytingar eftir {{user}} innan {{bbox}}"
+ description_user: "Breytingar eftir {{user}}"
+ description_bbox: "Breytingar innan {{bbox}}"
+ description_user_bbox: "Breytingar eftir {{user}} innan {{bbox}}"
diary_entry:
new:
title: "Ný bloggfærsla"
diary_entry:
new:
title: "Ný bloggfærsla"