From dbff1d52101c4f69fdf5b5c488a5243238093540 Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Wed, 14 Jan 2009 16:03:50 +0000
Subject: [PATCH] en.lang: see ticket 2359801 - make login messages more
 generic

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@515 a1433add-5e2c-0410-b055-b7f2511e0802
---
 languages/en.lang | 3 +--
 login.php         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/languages/en.lang b/languages/en.lang
index e5740d42..e28b0b44 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -24,8 +24,7 @@ $PALANG['pLogin_welcome'] = 'Mail admins login here to administer your domain.';
 $PALANG['pLogin_username'] = 'Login (email)';
 $PALANG['pLogin_password'] = 'Password';
 $PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Your login is not correct. Make sure that you login with your email address!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Your password is not correct!</span>';
+$PALANG['pLogin_failed'] = '<span class="error_msg">Your email address or password are not correct.</span>';
 $PALANG['pLogin_login_users'] = 'Users click here to login to the user section.';
 
 $PALANG['pMenu_main'] = 'Main';
diff --git a/login.php b/login.php
index 39b992a9..607f7e66 100644
--- a/login.php
+++ b/login.php
@@ -71,14 +71,14 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
         if ($result['rows'] != 1)
         {
             $error = 1;
-            $tMessage = $PALANG['pLogin_password_incorrect'];
+            $tMessage = $PALANG['pLogin_failed'];
             $tUsername = $fUsername;
         }
     }
     else
     {
         $error = 1;
-        $tMessage = $PALANG['pLogin_username_incorrect'];
+        $tMessage = $PALANG['pLogin_failed'];
     }
 
     if ($error != 1)