nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Indicates in the setting that the email is not visibile to the other users #5315

Browse source
This commit is contained in:
Akash Agrawall 2015-02-20 05:42:21 +05:30 committed by Dennis Schubert
parent ce16a122fc
commit 8c7aa38aba
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/users/edit.html.haml
View file

@ -25,6 +25,7 @@
.span6 .span6
%h3 %h3
= t('.your_email') = t('.your_email')
%small= t('.your_email_private')
= form_for 'user', :url => user_path, :html => { :method => :put } do |f| = form_for 'user', :url => user_path, :html => { :method => :put } do |f|
= f.error_messages = f.error_messages
.form-inline .form-inline

1
config/locales/diaspora/en.yml
View file

@ -1312,6 +1312,7 @@ en:
change: "Change" change: "Change"
your_handle: "Your diaspora* ID" your_handle: "Your diaspora* ID"
your_email: "Your email" your_email: "Your email"
your_email_private: "Your email will never be seen by other users"
change_email: "Change email" 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}." 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" change_password: "Change password"