correct format and translation

Author: mcalinghee

crates/handlers/src/views/login.rs

@@ -176,7 +176,8 @@ pub(crate) async fn post(
         .unwrap_or(&form.username);
 
     // First, lookup the user
-    let Some(user) = get_user_by_email_or_by_username(site_config, &mut repo, username).await? else {
+    let Some(user) = get_user_by_email_or_by_username(site_config, &mut repo, username).await?
+    else {
         let form_state = form_state.with_error_on_form(FormError::InvalidCredentials);
         return render(
             locale,
@@ -324,27 +325,18 @@ async fn get_user_by_email_or_by_username(
     username_or_email: &str,
 ) -> Result<Option<mas_data_model::User>, Box<dyn std::error::Error>> {
     if site_config.login_with_email_allowed && username_or_email.contains('@') {
-        let maybe_user_email = repo
-            .user_email()
-            .find_by_email(username_or_email)
-            .await?;
+        let maybe_user_email = repo.user_email().find_by_email(username_or_email).await?;
 
         if let Some(user_email) = maybe_user_email {
-            let user = repo
-                .user()
-                .lookup(user_email.user_id)
-                .await?;
+            let user = repo.user().lookup(user_email.user_id).await?;
 
             if user.is_some() {
                 return Ok(user);
             }
         };
     }
 
-    let user = repo
-        .user()
-        .find_by_username(username_or_email)
-        .await?;
+    let user = repo.user().find_by_username(username_or_email).await?;
 
     Ok(user)
 }

crates/storage/src/user/email.rs

@@ -95,7 +95,8 @@ pub trait UserEmailRepository: Send + Sync {
 
     /// Lookup an [`UserEmail`] by its email address
     ///
-    /// Returns `None` if no matching [`UserEmail`] was found or if multiple [`UserEmail`] are found
+    /// Returns `None` if no matching [`UserEmail`] was found or if multiple
+    /// [`UserEmail`] are found
     ///
     /// # Parameters
     /// * `email`: The email address to lookup

templates/pages/login.html

@@ -43,7 +43,7 @@ <h1 class="title">{{ _("mas.login.headline") }}</h1>
       <input type="hidden" name="csrf" value="{{ csrf_token }}" />
 
       {% if features.login_with_email_allowed %}
-        {% call(f) field.field(label=_("common.username_or_email"), name="username", form_state=form) %}
+        {% call(f) field.field(label=_("mas.login.username_or_email"), name="username", form_state=form) %}
           <input {{ field.attributes(f) }} class="cpd-text-control" type="text" autocomplete="username" autocorrect="off" autocapitalize="off" required />
         {% endcall %}
       {% else %}

translations/de.json

@@ -32,8 +32,7 @@
     "mxid": "Matrix-ID",
     "password": "Passwort",
     "password_confirm": "Passwort wiederholen",
-    "username": "Benutzername",
-    "username_or_email": "Benutzername oder E-Mail-Adresse"
+    "username": "Benutzername"
   },
   "error": {
     "unexpected": "Unerwarteter Fehler"

translations/en.json

@@ -100,10 +100,6 @@
     "username": "Username",
     "@username": {
       "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"
-    },
-    "username_or_email": "Username or Email Address",
-    "@username_or_email": {
-      "context": "pages/login.html:46:37-66"
     }
   },
   "error": {
@@ -436,7 +432,9 @@
       "no_login_methods": "No login methods available.",
       "@no_login_methods": {
         "context": "pages/login.html:100:11-42"
-      }
+      },
+      "username_or_email": "Username or Email",
+      "@username_or_email": {}
     },
     "navbar": {
       "my_account": "My account",
@@ -747,6 +745,10 @@
         }
       }
     },
+    "username_or_email": "",
+    "@username_or_email": {
+      "context": "pages/login.html:46:37-63"
+    },
     "verify_email": {
       "6_digit_code": "6-digit code",
       "@6_digit_code": {

translations/fr.json

@@ -32,8 +32,7 @@
     "mxid": "Matrix ID",
     "password": "Mot de passe",
     "password_confirm": "Confirmer le mot de passe",
-    "username": "Nom d’utilisateur",
-    "username_or_email": "Nom d’utilisateur ou adresse e-mail"
+    "username": "Nom d’utilisateur"
   },
   "error": {
     "unexpected": "Erreur inattendue"