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

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

Browse source
This commit is contained in:
Tom Hughes 2017-07-06 19:15:55 +01:00
commit d4a461dc26
2 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/views/user/view.html.erb
View file

@ -141,14 +141,14 @@
<p class='deemphasize'>
<small>
<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time.to_date, :format => :long %>
|
<%= t 'user.view.ct status' %>
<% if not @this_user.terms_agreed.nil? -%>
<%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed) %>
<% elsif not @this_user.terms_seen? -%>
<%= t 'user.view.ct undecided' %>
<% else -%>
<%= t 'user.view.ct declined' %>
<% unless @this_user.terms_agreed %>
|
<%= t 'user.view.ct status' %>
<% if @this_user.terms_seen? -%>
<%= t 'user.view.ct declined' %>
<% else -%>
<%= t 'user.view.ct undecided' %>
<% end -%>
<% end -%>
</small>
</p>