Merge "Display help on OATHToken field"

i18n/en.json

@@ -46,6 +46,7 @@
 	"action-oathauth-enable": "enable two-factor authentication",
 	"oathauth-auth-token-label": "Two-factor token or recovery code",
 	"oathauth-auth-token-help": "The one-time password used as the second factor of two-factor authentication.",
+	"oathauth-auth-token-help-ui": "Enter either a code from your authentication device, or a recovery code",
 	"oathauth-auth-ui": "Please enter a code from your two-factor authentication application (such as Google Authenticator).",
 	"oathauth-throttled": "Too many verification attempts! Please wait $1.",
 	"oathauth-login-failed": "Verification failed.",

i18n/qqq.json

@@ -61,6 +61,7 @@
 	"action-oathauth-enable": "{{doc-action|oathauth-enable}}",
 	"oathauth-auth-token-label": "Label of the second-factor field on special pages and in the API\n{{Identical|Token}}",
 	"oathauth-auth-token-help": "Extended help message for the second factor field in the API.",
+	"oathauth-auth-token-help-ui": "Label for token field during login",
 	"oathauth-auth-ui": "Shown on top of the login form when second factor is required",
 	"oathauth-throttled": "Error message when throttling limit is hit.\n\nParameters:\n* $1 - throttle block duration",
 	"oathauth-login-failed": "Error message when verifying the second factor failed.",

src/Hook/HookHandler.php

@@ -85,6 +85,7 @@ class HookHandler implements
 			'persistent' => false,
 			'autocomplete' => 'one-time-code',
 			'spellcheck' => false,
+			'help-message' => 'oathauth-auth-token-help-ui',
 		];
 		return true;
 	}