No address step before signing in when there's only one mail server
The server's own page asks for the username, so with a single server the sign-in page keeps only the own-device choice. With several servers the address still comes first, since its domain picks the server. One new string, in all nine catalogues.
This commit is contained in:
@@ -1243,6 +1243,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "Die Lesebestätigung konnte nicht gesendet werden: {error}",
|
||||
"Could not sign in.": "Anmeldung fehlgeschlagen.",
|
||||
"You'll enter your password on your mail server's sign-in page.": "Ihr Passwort geben Sie auf der Anmeldeseite Ihres Mailservers ein.",
|
||||
"You'll sign in on your mail server's own page.": "Sie melden sich auf der eigenen Seite Ihres Mailservers an.",
|
||||
"This sign-in didn't start in this browser. Try again.": "Diese Anmeldung wurde nicht in diesem Browser begonnen. Bitte versuchen Sie es erneut.",
|
||||
"The sign-in took too long. Try again.": "Die Anmeldung hat zu lange gedauert. Bitte versuchen Sie es erneut.",
|
||||
"Sign-in was cancelled.": "Die Anmeldung wurde abgebrochen.",
|
||||
|
||||
@@ -1216,6 +1216,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "No se pudo enviar la confirmación de lectura: {error}",
|
||||
"Could not sign in.": "No se pudo iniciar sesión.",
|
||||
"You'll enter your password on your mail server's sign-in page.": "Introducirá su contraseña en la página de inicio de sesión de su servidor de correo.",
|
||||
"You'll sign in on your mail server's own page.": "Iniciará sesión en la propia página de su servidor de correo.",
|
||||
"This sign-in didn't start in this browser. Try again.": "Este inicio de sesión no empezó en este navegador. Inténtelo de nuevo.",
|
||||
"The sign-in took too long. Try again.": "El inicio de sesión tardó demasiado. Inténtelo de nuevo.",
|
||||
"Sign-in was cancelled.": "Se canceló el inicio de sesión.",
|
||||
|
||||
@@ -1221,6 +1221,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "Impossible d’envoyer l’accusé de lecture : {error}",
|
||||
"Could not sign in.": "Connexion impossible.",
|
||||
"You'll enter your password on your mail server's sign-in page.": "Vous saisirez votre mot de passe sur la page de connexion de votre serveur de messagerie.",
|
||||
"You'll sign in on your mail server's own page.": "Vous vous connecterez sur la page de votre serveur de messagerie.",
|
||||
"This sign-in didn't start in this browser. Try again.": "Cette connexion n’a pas commencé dans ce navigateur. Réessayez.",
|
||||
"The sign-in took too long. Try again.": "La connexion a pris trop de temps. Réessayez.",
|
||||
"Sign-in was cancelled.": "La connexion a été annulée.",
|
||||
|
||||
@@ -1224,6 +1224,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "開封確認を送信できませんでした: {error}",
|
||||
"Could not sign in.": "サインインできませんでした。",
|
||||
"You'll enter your password on your mail server's sign-in page.": "パスワードはメールサーバーのサインインページで入力します。",
|
||||
"You'll sign in on your mail server's own page.": "メールサーバー自身のページでサインインします。",
|
||||
"This sign-in didn't start in this browser. Try again.": "このサインインはこのブラウザーで開始されたものではありません。もう一度お試しください。",
|
||||
"The sign-in took too long. Try again.": "サインインに時間がかかりすぎました。もう一度お試しください。",
|
||||
"Sign-in was cancelled.": "サインインはキャンセルされました。",
|
||||
|
||||
@@ -1214,6 +1214,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "De leesbevestiging kon niet worden verzonden: {error}",
|
||||
"Could not sign in.": "Aanmelden mislukt.",
|
||||
"You'll enter your password on your mail server's sign-in page.": "U voert uw wachtwoord in op de aanmeldpagina van uw mailserver.",
|
||||
"You'll sign in on your mail server's own page.": "U meldt zich aan op de eigen pagina van uw mailserver.",
|
||||
"This sign-in didn't start in this browser. Try again.": "Deze aanmelding is niet in deze browser begonnen. Probeer het opnieuw.",
|
||||
"The sign-in took too long. Try again.": "Het aanmelden duurde te lang. Probeer het opnieuw.",
|
||||
"Sign-in was cancelled.": "Het aanmelden is geannuleerd.",
|
||||
|
||||
@@ -1219,6 +1219,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "Não foi possível enviar a confirmação de leitura: {error}",
|
||||
"Could not sign in.": "Não foi possível entrar.",
|
||||
"You'll enter your password on your mail server's sign-in page.": "Você vai digitar sua senha na página de entrada do seu servidor de e-mail.",
|
||||
"You'll sign in on your mail server's own page.": "Você vai entrar na própria página do seu servidor de e-mail.",
|
||||
"This sign-in didn't start in this browser. Try again.": "Esta entrada não começou neste navegador. Tente de novo.",
|
||||
"The sign-in took too long. Try again.": "A entrada demorou demais. Tente de novo.",
|
||||
"Sign-in was cancelled.": "A entrada foi cancelada.",
|
||||
|
||||
@@ -1218,6 +1218,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "Не удалось отправить уведомление о прочтении: {error}",
|
||||
"Could not sign in.": "Не удалось войти.",
|
||||
"You'll enter your password on your mail server's sign-in page.": "Пароль вводится на странице входа вашего почтового сервера.",
|
||||
"You'll sign in on your mail server's own page.": "Вход выполняется на странице вашего почтового сервера.",
|
||||
"This sign-in didn't start in this browser. Try again.": "Этот вход начат не в этом браузере. Попробуйте ещё раз.",
|
||||
"The sign-in took too long. Try again.": "Вход занял слишком много времени. Попробуйте ещё раз.",
|
||||
"Sign-in was cancelled.": "Вход отменён.",
|
||||
|
||||
@@ -1212,6 +1212,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "Не вдалося надіслати сповіщення про прочитання: {error}",
|
||||
"Could not sign in.": "Не вдалося увійти.",
|
||||
"You'll enter your password on your mail server's sign-in page.": "Пароль вводиться на сторінці входу вашого поштового сервера.",
|
||||
"You'll sign in on your mail server's own page.": "Вхід виконується на сторінці вашого поштового сервера.",
|
||||
"This sign-in didn't start in this browser. Try again.": "Цей вхід розпочато не в цьому браузері. Спробуйте ще раз.",
|
||||
"The sign-in took too long. Try again.": "Вхід тривав занадто довго. Спробуйте ще раз.",
|
||||
"Sign-in was cancelled.": "Вхід скасовано.",
|
||||
|
||||
@@ -1223,6 +1223,7 @@ export const catalog: Catalog = {
|
||||
"Could not send the receipt: {error}": "无法发送已读回执:{error}",
|
||||
"Could not sign in.": "无法登录。",
|
||||
"You'll enter your password on your mail server's sign-in page.": "您将在邮件服务器的登录页面上输入密码。",
|
||||
"You'll sign in on your mail server's own page.": "您将在邮件服务器自己的页面上登录。",
|
||||
"This sign-in didn't start in this browser. Try again.": "此次登录不是在这个浏览器中发起的。请重试。",
|
||||
"The sign-in took too long. Try again.": "登录耗时过长。请重试。",
|
||||
"Sign-in was cancelled.": "登录已取消。",
|
||||
|
||||
+13
-4
@@ -33,6 +33,8 @@ export function LoginPage() {
|
||||
* and the password form if it never does.
|
||||
*/
|
||||
const [signIn, setSignIn] = useState<"oauth" | "password" | null>(null);
|
||||
/* With "oauth" and one mail server, its page asks for the username: no address here. */
|
||||
const [direct, setDirect] = useState(false);
|
||||
useEffect(() => {
|
||||
let live = true;
|
||||
fetch(withBase("/api/config"))
|
||||
@@ -42,6 +44,7 @@ export function LoginPage() {
|
||||
if (c.sourceUrl) setSourceUrl(c.sourceUrl as string);
|
||||
if (typeof c.appName === "string" && c.appName.trim()) setAppName(c.appName.trim());
|
||||
setSignIn(c.signIn === "oauth" ? "oauth" : "password");
|
||||
setDirect(c.signIn === "oauth" && c.signInDirect === true);
|
||||
})
|
||||
.catch(() => { /* the default stands */ })
|
||||
.finally(() => { if (live) setSignIn((m) => m ?? "password"); });
|
||||
@@ -58,10 +61,10 @@ export function LoginPage() {
|
||||
e.preventDefault();
|
||||
if (signIn === "oauth") {
|
||||
// Off to the mail server's page, which asks for the password there.
|
||||
if (!username.trim()) return;
|
||||
if (!direct && !username.trim()) return;
|
||||
setBusy(true);
|
||||
if (trustDevice) localStorage.setItem("ihasmail:lastUser", username.trim());
|
||||
const params = new URLSearchParams({ username: username.trim(), ...(trustDevice ? { remember: "1" } : {}) });
|
||||
if (trustDevice && !direct) localStorage.setItem("ihasmail:lastUser", username.trim());
|
||||
const params = new URLSearchParams({ ...(direct ? {} : { username: username.trim() }), ...(trustDevice ? { remember: "1" } : {}) });
|
||||
window.location.assign(withBase(`/api/auth/oauth/start?${params}`));
|
||||
return;
|
||||
}
|
||||
@@ -100,12 +103,18 @@ export function LoginPage() {
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
{!direct && (
|
||||
<div className="field">
|
||||
<label htmlFor="u">{t("Email or username")}</label>
|
||||
<input id="u" className="input" type="text" autoComplete="username" autoCapitalize="none" autoCorrect="off" spellCheck={false} value={username} onChange={(e) => setUsername(e.target.value)} autoFocus={!username} required />
|
||||
</div>
|
||||
)}
|
||||
{signIn === "oauth" ? (
|
||||
<p className="hint" style={{ marginBottom: 12 }}>{t("You'll enter your password on your mail server's sign-in page.")}</p>
|
||||
<p className="hint" style={{ marginBottom: 12 }}>
|
||||
{direct
|
||||
? t("You'll sign in on your mail server's own page.")
|
||||
: t("You'll enter your password on your mail server's sign-in page.")}
|
||||
</p>
|
||||
) : (
|
||||
<div className="field">
|
||||
<label htmlFor="p">{t("Password")}</label>
|
||||
|
||||
Reference in New Issue
Block a user