cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/1894'

Browse source
This commit is contained in:
Tom Hughes 2018-06-06 14:30:27 +01:00
commit 3da3b93f80
3 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/diary_entry_controller.rb
View file

@ -155,8 +155,8 @@ class DiaryEntryController < ApplicationController
if user
@entries = user.diary_entries
@title = I18n.t("diary_entry.feed.user.title", :user => user.display_name)
@description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
@title = t("diary_entry.feed.user.title", :user => user.display_name)
@description = t("diary_entry.feed.user.description", :user => user.display_name)
@link = url_for :controller => "diary_entry", :action => "list", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL
else
head :not_found
@ -167,12 +167,12 @@ class DiaryEntryController < ApplicationController
if params[:language]
@entries = @entries.where(:language_code => params[:language])
@title = I18n.t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
@description = I18n.t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
@title = t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
@description = t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
@link = url_for :controller => "diary_entry", :action => "list", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL
else
@title = I18n.t("diary_entry.feed.all.title")
@description = I18n.t("diary_entry.feed.all.description")
@title = t("diary_entry.feed.all.title")
@description = t("diary_entry.feed.all.description")
@link = url_for :controller => "diary_entry", :action => "list", :host => SERVER_URL, :protocol => SERVER_PROTOCOL
end
end

14
app/views/browse/not_found.html.erb
View file

@ -1,12 +1,4 @@
<%
browse_not_found_type = {
'node' => I18n.t('.type.node'),
'way' => I18n.t('.type.way'),
'relation' => I18n.t('.type.relation'),
'changeset' => I18n.t('.type.changeset'),
};
%>
<h2>
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
<%= t '.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %></h2>
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
<%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
</h2>

10
app/views/browse/timeout.html.erb
View file

@ -1,12 +1,4 @@
<%
browse_timeout_type = {
'node' => I18n.t('.type.node'),
'way' => I18n.t('.type.way'),
'relation' => I18n.t('.type.relation'),
'changeset' => I18n.t('.type.changeset'),
};
%>
<div class="browse-section">
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
<%= t '.sorry', :type=> browse_timeout_type[@type] , :id => params[:id] %>
<%= t '.sorry', :type => t(".type.#{@type}"), :id => params[:id] %>
</div>