From 022bfd2493ebb97e0c6d5c66430ab2b8874c82b2 Mon Sep 17 00:00:00 2001 From: jeremydurand Date: Mon, 30 May 2016 14:35:24 +0200 Subject: 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 --- identification.php | 6 +++--- language/en_UK/common.lang.php | 3 ++- language/fr_FR/common.lang.php | 3 ++- 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 → Z'] = 'Album name, A → Z'; $lang['Album name, Z → A'] = 'Album name, Z → 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 → Z'] = 'Nom de l\'album, A → Z'; $lang['Album name, Z → A'] = 'Nom de l\'album, Z → 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 !'; -- cgit v1.2.3