Merge pull request #34 from retrozinndev/devel

💥 fix: intl in 404 if available check
retrozinndev · Jun 21, 2024 · ee6acb5 · ee6acb5
2 parents 09e6dd4 + 2520682
commit ee6acb5
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.5.14",
     "@astrojs/check": "^0.5.10",
-    "typescript": "^5.4.3"
+    "astro": "^4.5.14",
+    "typescript": "^5.4.5"
   }
-}
+}
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
@@ -15,13 +15,13 @@ export const en = {
         projects: "Get in touch with my projects"
     },
 
-    not_found: {
+    404: {
         title: "404 - Not found!",
         description: {
             l1: "Looks like I haven't developed this yet!",
-            l2: "Feel free to suggest me anything, talk to me on any of",
-            socials: "my socials!"
-        }
+            l2: "Feel free to suggest me anything, talk to me on any of"
+        },
+        socials: "my socials!"
     },
 
     footer: {

diff --git a/src/i18n/pt.ts b/src/i18n/pt.ts
@@ -15,13 +15,13 @@ export const pt = {
         projects: "Veja os meus projetos"
     },
 
-    not_found: {
+    404: {
         title: "404 - Não encontrado!",
         description: {
             l1: "Parece que eu ainda não desenvolvi essa página!",
-            l2: "Se quiser sugerir alguma ideia, me chame em qualquer uma das",
-            socials: "minhas redes sociais!"
-        }
+            l2: "Se quiser sugerir alguma ideia, me chame em qualquer uma das"
+        },
+        socials: "minhas redes sociais!"
     },
 
     footer: {

diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
@@ -1,10 +1,9 @@
 
-import { i18n, defaultLang } from "./ui.ts";
+import { languages, i18n, defaultLang } from "./ui.ts";
 
 export function getLanguageFromURL(url: URL): string {
-    var splittedURL = url.pathname.split("/");
-    var currentIntl = splittedURL[1]; // Gets the second URL part
-    var domain = splittedURL[0].replace("/", "");
+    var splittedURL: string[] = url.pathname.split("/");
+    var currentIntl: string = splittedURL[1]; // Gets the second URL part
 
     if(currentIntl in i18n) 
         return currentIntl as keyof typeof i18n;
@@ -25,3 +24,7 @@ export function useTranslations(lang: keyof typeof i18n): Function {
         return translation || defaultTranslation || "Couldn't find key to translate.";
     }
 }
+
+export function getLanguages() {
+    return languages;
+}
diff --git a/src/pages/404.astro b/src/pages/404.astro
@@ -1,13 +1,16 @@
 ---
-import { getLanguageFromURL, useTranslations } from "../i18n/utils";
+import { getLanguages, getLanguageFromURL, useTranslations } from "../i18n/utils";
 import "../styles/global.css";
 import NavBar from "../components/NavBar.astro";
 
-Astro.params.lang = getLanguageFromURL(Astro.url);
+Astro.params.lang = "en";
+const langs: string[] = getLanguages();
 
-if(Astro.params.lang === undefined) {
-    Astro.params.lang = "en";
-}
+langs.forEach(intl => {
+    if(getLanguageFromURL(Astro.url) == intl) {
+        Astro.params.lang = intl;
+    }
+});
 
 const tr = useTranslations(Astro.params.lang as never);
 ---
@@ -24,10 +27,10 @@ const tr = useTranslations(Astro.params.lang as never);
 <body>
     <div class="center">
         <div class="not-found">
-            <h1> { tr("not_found.title") } </h1>
+            <h1> { tr("404.title") } </h1>
             <p>
-                { tr("not_found.description.l1") } <br>
-                { tr("not_found.description.l2") } <a href={ `/${Astro.params.lang}/#socials` }>{ tr("not_found.description.socials") }</a>
+                { tr("404.description.l1") } <br>
+                { tr("404.description.l2") } <a href={ `/${Astro.params.lang}/#socials` }>{ tr("404.socials") }</a>
             </p>
         </div>
     </div>