codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve message when you change your password

Browse source
This commit is contained in:
Neil Lalonde 2013-03-20 16:55:56 -04:00
parent 23cee77310
commit 5db196315c
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/views/users/password_reset.html.erb
View file

@ -13,17 +13,13 @@
<% end %> <% end %>
<%if flash[:success]%> <%if flash[:success]%>
<div class='alert alert-success'>
<%=flash[:success]%>
</div>
<p> <p>
<%- if @requires_approval %> <%= flash[:success] %>
<%= t 'login.not_approved' %> <%- if @requires_approval %>
<% else %> <%= t 'login.not_approved' %>
<%= raw t 'activation.please_continue', link: link_to(SiteSetting.title, root_path) %> <% else %>
<% end %> <%= link_to( t('password_reset.continue', site_name: SiteSetting.title), root_path ) %>
<% end %>
</p> </p>
<% else %> <% else %>
<%if @user.present? %> <%if @user.present? %>

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

@ -183,6 +183,7 @@ en:
title: 'reset password' title: 'reset password'
success: "You successfully changed your password and are now logged in." success: "You successfully changed your password and are now logged in."
success_unapproved: "You successfully changed your password." success_unapproved: "You successfully changed your password."
continue: "Continue to %{site_name}"
change_email: change_email:
confirmed: "Your email has been updated." confirmed: "Your email has been updated."