Merge branch 'master' into openstreetbugs

app/views/browse/_node_details.html.erb

@@ -1,4 +1,4 @@
-<table>
+<table id="<%= node_details.version %>">
 
   <%= render :partial => "common_details", :object => node_details %>
 

app/views/browse/_relation_details.html.erb

@@ -1,4 +1,4 @@
-<table>
+<table id="<%= relation_details.version %>">
 
   <%= render :partial => "common_details", :object => relation_details %>
 

app/views/browse/_way_details.html.erb

@@ -1,4 +1,4 @@
-<table>
+<table id="<%= way_details.version %>">
 
   <%= render :partial => "common_details", :object => way_details %>
 

app/views/diary_entry/_diary_entry.html.erb

@@ -1,5 +1,7 @@
 <b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br />
+<div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
 <%= htmlize(diary_entry.body) %>
+</div>
 <% if diary_entry.latitude and diary_entry.longitude %>
 <%= render :partial => "location", :object => diary_entry %>
 <br />