From e05b549f8c2c633b951a6aa19e725a4d5d8a5551 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 9 Dec 2011 09:34:29 +0000 Subject: [PATCH] Display CT status on the user page --- app/views/user/view.html.erb | 10 ++++++++++ config/locales/en.yml | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 0264065ee..2fa271a02 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -78,6 +78,16 @@

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

+

<%= 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' %> +<% end -%> +

+ <% if @user and @user.administrator? -%>

<%= t 'user.view.email address' %> <%= @this_user.email %>

<% unless @this_user.creation_ip.nil? -%> diff --git a/config/locales/en.yml b/config/locales/en.yml index 5ed8267ec..f24bc490f 100644 --- 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:" -- 2.43.2