From 3782ae164722ed69d97c22c43ff06eef4ffb494f Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 17 Dec 2013 18:05:58 -0500
Subject: [PATCH] don't show profile fields if they are hidden. closes #660.
 also added missing language keys to EN

---
 public/language/en/user.json |  5 ++++-
 public/templates/account.tpl | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/public/language/en/user.json b/public/language/en/user.json
index 1b58f198de..caa4a59b57 100644
--- a/public/language/en/user.json
+++ b/public/language/en/user.json
@@ -32,5 +32,8 @@
 	"show_email": "Show My Email",
 
 	"has_no_follower": "This user doesn't have any followers :(",
-	"follows_no_one": "This user isn't following anyone :("
+	"follows_no_one": "This user isn't following anyone :(",
+
+	"email_hidden": "Email Hidden",
+	"hidden": "hidden"
 }
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 200fd854c2..039e5478f5 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -29,25 +29,39 @@
 		<div class="col-md-4">
 			<div class="inline-block">
 				<div class="account-bio-block">
-					<span class="account-bio-label">[[user:email]]</span><i class="fa fa-eye-slash {emailClass}" title="Email hidden"></i>
+					<span class="account-bio-label">[[user:email]]</span><i class="fa fa-eye-slash {emailClass}" title="[[user:email_hidden]]"></i>
+					<!-- IF email -->
 					<span>{email}</span>
+					<!-- ELSE -->
+					<i class="fa fa-eye-slash" title="[[user:email_hidden]]"></i> [[user:hidden]]
+					<!-- ENDIF email -->
 					<br/>
 
+
+					<!-- IF fullname -->
 					<span class="account-bio-label">[[user:fullname]]</span>
 					<span>{fullname}</span>
 					<br/>
+					<!-- ENDIF fullname -->
 
+					<!-- IF website -->
 					<span class="account-bio-label">[[user:website]]</span>
 					<span><a href="{website}">{websiteName}</a></span>
 					<br/>
+					<!-- ENDIF website -->
 
+					<!-- IF location -->
 					<span class="account-bio-label">[[user:location]]</span>
 					<span>{location}</span>
 					<br/>
+					<!-- ENDIF location -->
 
+					<!-- IF age -->
 					<span class="account-bio-label">[[user:age]]</span>
 					<span>{age}</span>
 					<br/>
+					<!-- ENDIF age -->
+
 					<hr/>
 					<span class="account-bio-label">[[user:joined]]</span>
 					<span class="timeago" title="{joindate}"></span>
@@ -74,10 +88,12 @@
 					<br/>
 
 					<hr/>
+					<!-- IF signature -->
 					<span class="account-bio-label">[[user:signature]]</span>
 					<div class="post-signature">
 						<span id='signature'>{signature}</span>
 					</div>
+					<!-- ENDIF signature -->
 				</div>
 			</div>
 		</div>