From 8c7aa38ababae1db2b1c56373bfe722ee63b2f99 Mon Sep 17 00:00:00 2001 From: Akash Agrawall Date: Fri, 20 Feb 2015 05:42:21 +0530 Subject: [PATCH] Indicates in the setting that the email is not visibile to the other users #5315 --- app/views/users/edit.html.haml | 1 + config/locales/diaspora/en.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 2c211e366..08bf521df 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -25,6 +25,7 @@ .span6 %h3 = t('.your_email') + %small= t('.your_email_private') = form_for 'user', :url => user_path, :html => { :method => :put } do |f| = f.error_messages .form-inline diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index bfdbeea0c..997872afa 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -1312,6 +1312,7 @@ en: change: "Change" your_handle: "Your diaspora* ID" your_email: "Your email" + your_email_private: "Your email will never be seen by other users" change_email: "Change email" email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}." change_password: "Change password"