diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb index 9830f4af4..b7b95a9e1 100644 --- a/app/views/users/password_reset.html.erb +++ b/app/views/users/password_reset.html.erb @@ -13,17 +13,13 @@ <% end %> <%if flash[:success]%> -
- <%- if @requires_approval %> - <%= t 'login.not_approved' %> - <% else %> - <%= raw t 'activation.please_continue', link: link_to(SiteSetting.title, root_path) %> - <% end %> - - + <%= flash[:success] %> + <%- if @requires_approval %> + <%= t 'login.not_approved' %> + <% else %> + <%= link_to( t('password_reset.continue', site_name: SiteSetting.title), root_path ) %> + <% end %>
<% else %> <%if @user.present? %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index f5ff79b24..490f8ec3f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -183,6 +183,7 @@ en: title: 'reset password' success: "You successfully changed your password and are now logged in." success_unapproved: "You successfully changed your password." + continue: "Continue to %{site_name}" change_email: confirmed: "Your email has been updated."