Node.js based forum software built for the modern web
fix: show which login field is missing instead of a generic error (#14772)
palmoni5b15597000c4a
diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.jsonindex f71e365e6f..5a4d6a5d0a 100644--- a/public/language/en-GB/error.json+++ b/public/language/en-GB/error.json@@ -29,6 +29,8 @@"invalid-password": "Invalid Password","invalid-login-credentials": "Invalid login credentials","invalid-username-or-password": "Please specify both a username and password",+ "username-required": "Please enter your username",+ "password-required": "Please enter your password","invalid-search-term": "Invalid search term","invalid-url": "Invalid URL","invalid-event": "Invalid event: %1",diff --git a/public/src/client/login.js b/public/src/client/login.jsindex 0ec1afaaa2..69bb0640e0 100644--- a/public/src/client/login.js+++ b/public/src/client/login.js@@ -17,7 +17,7 @@ define('forum/login', ['hooks', 'translator', 'jquery-form'], function (hooks, tconst password = $('#password').val();errorEl.addClass('hidden').find('p').text('');if (!username || !password) {- errorEl.find('p').translateText('[[error:invalid-username-or-password]]');+ errorEl.find('p').translateText(!username ? '[[error:username-required]]' : '[[error:password-required]]');errorEl.removeClass('hidden');return;}