aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremydurand <jeremydurand24@hotmail.fr>2016-05-30 14:35:24 +0200
committerPierrick Le Gall <plg@piwigo.org>2016-05-30 14:35:24 +0200
commit022bfd2493ebb97e0c6d5c66430ab2b8874c82b2 (patch)
treedf979a03fda91af6654ac30490bf0e6ceb3deccc
parentbd0d2ae6459c63ed7f7060589297bf63ae1cc619 (diff)
fixes #487 replace "Invalid password" by "Invalid username or password" (#489)
* fixes #487 replace "Invalid password" by "Invalid username or password" * missing space before exclamation mark
-rw-r--r--identification.php6
-rw-r--r--language/en_UK/common.lang.php3
-rw-r--r--language/fr_FR/common.lang.php3
3 files changed, 7 insertions, 5 deletions
diff --git a/identification.php b/identification.php
index be22eb571..3e5ab1560 100644
--- a/identification.php
+++ b/identification.php
@@ -50,7 +50,7 @@ if (isset($_POST['login']))
$page['errors'][] = l10n('Cookies are blocked or not supported by your browser. You must enable cookies to connect.');
}
else
- {
+ {
if ($conf['insensitive_case_logon'] == true)
{
$_POST['username'] = search_case_username($_POST['username']);
@@ -58,14 +58,14 @@ if (isset($_POST['login']))
$redirect_to = isset($_POST['redirect']) ? urldecode($_POST['redirect']) : '';
$remember_me = isset($_POST['remember_me']) and $_POST['remember_me']==1;
-
+
if ( try_log_user($_POST['username'], $_POST['password'], $remember_me) )
{
redirect(empty($redirect_to) ? get_gallery_home_url() : $redirect_to);
}
else
{
- $page['errors'][] = l10n('Invalid password!');
+ $page['errors'][] = l10n('Invalid username or password!');
}
}
}
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 51ce58551..282a289b1 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -426,4 +426,5 @@ $lang['Album name, A &rarr; Z'] = 'Album name, A &rarr; Z';
$lang['Album name, Z &rarr; A'] = 'Album name, Z &rarr; A';
$lang['Link: %s'] = 'Link: %s';
$lang['Your authentication key is no longer valid.'] = 'Your authentication key is no longer valid.';
-?> \ No newline at end of file
+$lang['Invalid username or password!'] = 'Invalid username or password!';
+?>
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index c70dbf183..a54fc4256 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -425,4 +425,5 @@ $lang['Photo description'] = 'Description de la photo';
$lang['Album name, A &rarr; Z'] = 'Nom de l\'album, A &rarr; Z';
$lang['Album name, Z &rarr; A'] = 'Nom de l\'album, Z &rarr; A';
$lang['Link: %s'] = 'Lien: %s';
-$lang['Your authentication key is no longer valid.'] = 'Votre clef d\'identification n\'est plus valide.'; \ No newline at end of file
+$lang['Your authentication key is no longer valid.'] = 'Votre clef d\'identification n\'est plus valide.';
+$lang['Invalid username or password!'] = 'Nom d\'utilisateur ou mot de passe invalide !';