From 5db196315c72612bfce4017bf6c698dbf3d03b02 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 20 Mar 2013 16:55:56 -0400
Subject: [PATCH] Improve message when you change your password

---
 app/views/users/password_reset.html.erb | 16 ++++++----------
 config/locales/server.en.yml            |  1 +
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb
index 9830f4af4bd..b7b95a9e126 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]%>
-    <div class='alert alert-success'>
-      <%=flash[:success]%>
-    </div>
     <p>
-    <%- 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 %>
     </p>
   <% else %>
     <%if @user.present? %>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f5ff79b2455..490f8ec3f63 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."