Skip to content

Commit 77e954e

Browse files
committed
correct format and translation
1 parent f2a47f9 commit 77e954e

File tree

6 files changed

+17
-24
lines changed

6 files changed

+17
-24
lines changed

crates/handlers/src/views/login.rs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ pub(crate) async fn post(
187187
.unwrap_or(&form.username);
188188

189189
// First, lookup the user
190-
let Some(user) = get_user_by_email_or_by_username(site_config, &mut repo, username).await? else {
190+
let Some(user) = get_user_by_email_or_by_username(site_config, &mut repo, username).await?
191+
else {
191192
let form_state = form_state.with_error_on_form(FormError::InvalidCredentials);
192193
PASSWORD_LOGIN_COUNTER.add(1, &[KeyValue::new(RESULT, "error")]);
193194
return render(
@@ -343,27 +344,18 @@ async fn get_user_by_email_or_by_username(
343344
username_or_email: &str,
344345
) -> Result<Option<mas_data_model::User>, Box<dyn std::error::Error>> {
345346
if site_config.login_with_email_allowed && username_or_email.contains('@') {
346-
let maybe_user_email = repo
347-
.user_email()
348-
.find_by_email(username_or_email)
349-
.await?;
347+
let maybe_user_email = repo.user_email().find_by_email(username_or_email).await?;
350348

351349
if let Some(user_email) = maybe_user_email {
352-
let user = repo
353-
.user()
354-
.lookup(user_email.user_id)
355-
.await?;
350+
let user = repo.user().lookup(user_email.user_id).await?;
356351

357352
if user.is_some() {
358353
return Ok(user);
359354
}
360-
};
355+
}
361356
}
362357

363-
let user = repo
364-
.user()
365-
.find_by_username(username_or_email)
366-
.await?;
358+
let user = repo.user().find_by_username(username_or_email).await?;
367359

368360
Ok(user)
369361
}

crates/storage/src/user/email.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ pub trait UserEmailRepository: Send + Sync {
9595

9696
/// Lookup an [`UserEmail`] by its email address
9797
///
98-
/// Returns `None` if no matching [`UserEmail`] was found or if multiple [`UserEmail`] are found
98+
/// Returns `None` if no matching [`UserEmail`] was found or if multiple
99+
/// [`UserEmail`] are found
99100
///
100101
/// # Parameters
101102
/// * `email`: The email address to lookup

templates/pages/login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h1 class="title">{{ _("mas.login.headline") }}</h1>
4343
<input type="hidden" name="csrf" value="{{ csrf_token }}" />
4444

4545
{% if features.login_with_email_allowed %}
46-
{% call(f) field.field(label=_("common.username_or_email"), name="username", form_state=form) %}
46+
{% call(f) field.field(label=_("mas.login.username_or_email"), name="username", form_state=form) %}
4747
<input {{ field.attributes(f) }} class="cpd-text-control" type="text" autocomplete="username" autocorrect="off" autocapitalize="off" required />
4848
{% endcall %}
4949
{% else %}

translations/de.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
"mxid": "Matrix-ID",
3333
"password": "Passwort",
3434
"password_confirm": "Passwort wiederholen",
35-
"username": "Benutzername",
36-
"username_or_email": "Benutzername oder E-Mail-Adresse"
35+
"username": "Benutzername"
3736
},
3837
"error": {
3938
"unexpected": "Unerwarteter Fehler"

translations/en.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@
100100
"username": "Username",
101101
"@username": {
102102
"context": "pages/login.html:50:37-57, pages/register/index.html:30:35-55, pages/register/password.html:34:33-53, pages/upstream_oauth2/do_register.html:101:35-55, pages/upstream_oauth2/do_register.html:106:39-59"
103-
},
104-
"username_or_email": "Username or Email Address",
105-
"@username_or_email": {
106-
"context": "pages/login.html:46:37-66"
107103
}
108104
},
109105
"error": {
@@ -440,6 +436,10 @@
440436
"no_login_methods": "No login methods available.",
441437
"@no_login_methods": {
442438
"context": "pages/login.html:100:11-42"
439+
},
440+
"username_or_email": "Username or Email",
441+
"@username_or_email": {
442+
"context": "pages/login.html:46:37-69"
443443
}
444444
},
445445
"navbar": {
@@ -751,6 +751,8 @@
751751
}
752752
}
753753
},
754+
"username_or_email": "",
755+
"@username_or_email": {},
754756
"verify_email": {
755757
"6_digit_code": "6-digit code",
756758
"@6_digit_code": {

translations/fr.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
"mxid": "Matrix ID",
3333
"password": "Mot de passe",
3434
"password_confirm": "Confirmer le mot de passe",
35-
"username": "Nom d’utilisateur",
36-
"username_or_email": "Nom d’utilisateur ou adresse e-mail"
35+
"username": "Nom d’utilisateur"
3736
},
3837
"error": {
3938
"unexpected": "Erreur inattendue"

0 commit comments

Comments
 (0)