feat(core): compare user language to current locale in log in and my account pages

Author: Ismaestro

src/app/core/components/error-404/error-404.component.html

@@ -9,6 +9,7 @@ <h1 class="first-heading__title" i18n>Error 404: A Wild Error Appeared</h1>
       i18n-alt
       height="690"
       width="588"
+      priority
     />
   </div>
 </main>

src/app/core/services/language.service.ts

@@ -1,5 +1,4 @@
 import { inject, Injectable, LOCALE_ID } from '@angular/core';
-import { DEFAULT_LANGUAGE } from '~core/constants/language.constants';
 import { Router } from '@angular/router';
 import { Language } from '~core/enums/language.enum';
 import { Locale } from '~core/enums/locale.enum';
@@ -18,17 +17,24 @@ export class LanguageService {
     return Language.EN_US;
   }
 
-  navigateWithUserLanguage(userLanguage: string, path: string) {
-    const localeToRedirect = this.getLocaleFromUserLanguage(userLanguage);
-    if (userLanguage === this.localeId || userLanguage === (DEFAULT_LANGUAGE as string)) {
-      void this.router.navigate([path]);
+  navigateWithUserLanguage(language: Language, pathToRedirect: string) {
+    const localeToRedirect = this.getLocaleFromLanguage(language);
+    if (this.doesLocaleMatchLanguage(language)) {
+      void this.router.navigate([pathToRedirect]);
     } else {
-      window.location.href = `/${localeToRedirect}${path}`;
+      window.location.href = `/${localeToRedirect}${pathToRedirect}`;
     }
   }
 
-  private getLocaleFromUserLanguage(userLanguage: string) {
-    if (userLanguage === (Language.ES_ES as string)) {
+  private doesLocaleMatchLanguage(language: Language) {
+    if (this.localeId === (Locale.ES as string)) {
+      return language === Language.ES_ES;
+    }
+    return language === Language.EN_US;
+  }
+
+  private getLocaleFromLanguage(language: Language) {
+    if (language === Language.ES_ES) {
       return Locale.ES;
     }
     return Locale.EN;

src/app/features/authentication/pages/log-in/log-in.component.ts

@@ -71,10 +71,7 @@ export class LogInComponent {
           next: (user: User) => {
             this.isButtonLogInLoading = false;
             this.changeDetectorRef.markForCheck();
-            this.languageService.navigateWithUserLanguage(
-              user.language as string,
-              ROOT_URLS.myPokedex,
-            );
+            this.languageService.navigateWithUserLanguage(user.language, ROOT_URLS.myPokedex);
           },
           error: (response) => {
             this.isButtonLogInLoading = false;

src/app/features/authentication/pages/my-account/my-account.component.ts

@@ -130,13 +130,7 @@ export class MyAccountComponent implements OnInit {
           this.isButtonUpdateUserFormLoading = false;
           this.alertService.createSuccessAlert(translations.myAccountSuccessAlert);
           this.changeDetectorRef.markForCheck();
-
-          if (this.user?.language !== formValue.language) {
-            this.languageService.navigateWithUserLanguage(
-              formValue.language as string,
-              AUTH_URLS.myAccount,
-            );
-          }
+          this.languageService.navigateWithUserLanguage(formValue.language!, AUTH_URLS.myAccount);
         },
         error: () => {
           this.isButtonUpdateUserFormLoading = false;