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

Merge branch 'master' into cancancan

Browse source
This commit is contained in:
Andy Allan 2018-10-31 11:16:47 +01:00
commit f11221f05b
62 changed files with 885 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/redactions/show.html.erb
View file

@ -7,10 +7,10 @@
<b><%= t '.user' %></b>
<%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
</p>
<p class="richtext">
<div class="richtext">
<b><%= t '.description' %></b>
<%= @redaction.description.to_html %>
</p>
</div>
<% if current_user and current_user.moderator? %>
<div class="buttons">

1
app/views/site/copyright.html.erb
View file

@ -56,6 +56,7 @@
<p><%= t ".legal_babble.contributors_intro_html", :locale => @locale %></p>
<ul id="contributors">
<li><%= t ".legal_babble.contributors_at_html", :locale => @locale %></li>
<li><%= t ".legal_babble.contributors_au_html", :locale => @locale %></li>
<li><%= t ".legal_babble.contributors_ca_html", :locale => @locale %></li>
<li><%= t ".legal_babble.contributors_fi_html", :locale => @locale %></li>
<li><%= t ".legal_babble.contributors_fr_html", :locale => @locale %></li>

6
app/views/users/_contact.html.erb
View file

@ -14,16 +14,16 @@
<% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
<% distance = @user.distance(contact) %>
<% if distance < 1 %>
(<%= t 'user.show.m away', :count => (distance * 1000).round %>)
(<%= t 'users.show.m away', :count => (distance * 1000).round %>)
<% else %>
(<%= t 'user.show.km away', :count => distance.round %>)
(<%= t 'users.show.km away', :count => distance.round %>)
<% end %>
<% end %>
</p>
<p>
<% changeset = contact.changesets.first %>
<% if changeset %>
<%= t('user.show.latest edit', :ago => t('user.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
<%= t('users.show.latest edit', :ago => t('users.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
<% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>
"<%= link_to(comment,
{:controller => 'browse', :action => 'changeset', :id => changeset.id},

6
app/views/users/blocked.html.erb
View file

@ -1,10 +1,10 @@
<% content_for :heading do %>
<h1><%= t 'user.new.title' %></h1>
<h1><%= t 'users.new.title' %></h1>
<div class='header-illustration new-user-main'></div>
<div class='header-illustration new-user-arm'></div>
<% end %>
<div class="message">
<h1><%= t 'user.new.no_auto_account_create' %></h1>
<h2><%= raw t 'user.new.contact_webmaster', :webmaster => "mailto:#{SUPPORT_EMAIL}" %></h2>
<h1><%= t 'users.new.no_auto_account_create' %></h1>
<h2><%= raw t 'users.new.contact_webmaster', :webmaster => "mailto:#{SUPPORT_EMAIL}" %></h2>
</div>