Display CT status on the user page

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 0264065ee6634659cc3ec16c32856935e36efb55..2fa271a02be8ea630779692789c604a13f2f0b6c 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -78,6 +78,16 @@
 
 <p><b><%= t 'user.view.mapper since' %></b> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %></p>
 
+<p><b><%= t 'user.view.ct status' %></b>
+<% 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' %>
+<% end -%>
+</p>
+
 <% if @user and @user.administrator? -%>
   <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>  
   <% unless @this_user.creation_ip.nil? -%>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5ed8267eca3094e26367bcf71f0546ada481c4ab..f24bc490f4d8e21469dfb65b577ceba7eb4772f0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1654,6 +1654,10 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
+      ct status: "Contributor terms:"
+      ct undecided: Undecided
+      ct declined: Declined
+      ct accepted: Accepted %{ago} ago
       latest edit: "Latest edit %{ago}:"
       email address: "Email address:"
       created from: "Created from:"