SF.net SVN: postfixadmin:[515] trunk

[<Gin...@us...>]

Revision: 515
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=515&view=rev
Author:   GingerDog
Date:     2009-01-14 16:03:50 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------
en.lang: see ticket 2359801 - make login messages more generic

Modified Paths:
--------------
    trunk/languages/en.lang
    trunk/login.php

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2009-01-14 13:13:25 UTC (rev 514)
+++ trunk/languages/en.lang	2009-01-14 16:03:50 UTC (rev 515)
@@ -24,8 +24,7 @@
 $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';

Modified: trunk/login.php
===================================================================
--- trunk/login.php	2009-01-14 13:13:25 UTC (rev 514)
+++ trunk/login.php	2009-01-14 16:03:50 UTC (rev 515)
@@ -71,14 +71,14 @@
         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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.