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

Fix #2402

Browse source 
1. Modified about routes
2. Accept the new params in site#about
3. Update about.html.erb
This commit is contained in:
Mayank Tankhiwale 2019-11-23 20:26:19 +05:30
parent 48d5d0730b
commit 9f7ec064e4
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/site_controller.rb
View file

@ -108,7 +108,9 @@ class SiteController < ApplicationController
def help; end
def about; end
def about
@locale = params[:about_locale] || I18n.locale
end
def export; end

32
app/views/site/about.html.erb
View file

@ -1,41 +1,41 @@
<div class='attr'>
<div class='byosm'>
<%= t ".copyright_html" %>
<%= t ".copyright_html", :locale => @locale %>
</div>
<div class='user-image'></div>
<h1><%= raw t ".used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %></h1>
<h1><%= raw t ".used_by", :name => "<span class='user-name'>OpenStreetMap</span>", :locale => @locale %></h1>
</div>
<div class='text'>
<div class='section'>
<p><strong><%= t ".lede_text" %></strong></p>
<h2><div class='icon local'></div><%= t ".local_knowledge_title" %></h2>
<p><%= t ".local_knowledge_html" %></p>
<p><strong><%= t ".lede_text", :locale => @locale %></strong></p>
<h2><div class='icon local'></div><%= t ".local_knowledge_title", :locale => @locale %></h2>
<p><%= t ".local_knowledge_html", :locale => @locale %></p>
</div>
<div class='section'>
<h2><div class='icon community'></div><%= t ".community_driven_title" %></h2>
<p><%= t ".community_driven_html", :diary_path => diary_entries_path %></p>
<h2><div class='icon community'></div><%= t ".community_driven_title", :locale => @locale %></h2>
<p><%= t ".community_driven_html", :locale => @locale, :diary_path => diary_entries_path %></p>
</div>
<div class='section' id='open-data'>
<h2><div class='icon open'></div><%= t ".open_data_title" %></h2>
<p><%= t ".open_data_html", :copyright_path => copyright_path %></p>
<h2><div class='icon open'></div><%= t ".open_data_title", :locale => @locale %></h2>
<p><%= t ".open_data_html", :locale => @locale, :copyright_path => copyright_path %></p>
</div>
<div class='section' id='legal'>
<h2><div class='icon legal'></div><%= t ".legal_title" %></h2>
<p><%= t ".legal_html" %></p>
<h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
<p><%= t ".legal_html", :locale => @locale %></p>
</div>
<div class='section' id='partners'>
<h2><div class='icon partners'></div><%= t ".partners_title" %></h2>
<p><%= t "layouts.hosting_partners_html",
:ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
:bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
:partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
<h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
<p><%= t "layouts.hosting_partners_html", :locale => @locale,
:ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"),
:bytemark => link_to(t("layouts.partners_bytemark", :locale => @locale), "https://www.bytemark.co.uk"),
:partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %>
</p>
</div>
</div>

1
config/routes.rb
View file

@ -146,6 +146,7 @@ OpenStreetMap::Application.routes.draw do
get "/welcome" => "site#welcome"
get "/fixthemap" => "site#fixthemap"
get "/help" => "site#help"
get "/about/:about_locale" => "site#about"
get "/about" => "site#about"
get "/history" => "changesets#index"
get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }