[fix] Redirect to default locale issue and missing translations

Linaro · Dec 4, 2024 · b57bc7f · b57bc7f
1 parent fc8dcf3
commit b57bc7f
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 20 deletions.
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -63,7 +63,6 @@ export default defineConfig({
     rollupOptions: {
       external: ["/pagefind/pagefind.js"],
     },
-    redirects: false,
   },
   vite: {
     optimizeDeps: { exclude: ['auth:config'] },
@@ -73,6 +72,7 @@ export default defineConfig({
     locales: LOCALES,
     routing: {
       prefixDefaultLocale: true,
+      redirectToDefaultLocale: true
     }
   }
 });
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -1,6 +1,14 @@
 {
   "header": {
-	"main": "Windows on Arm Ready Software"
+    "main": "Windows on Arm Ready Software",
+    "applications": "Windows on Arm Ready Applications",
+    "applications_desc": "Find applications ready for Windows on Arm",
+    "games": "Windows on Arm Ready Games",
+    "games_desc": "Find Games ready for Windows on Arm",
+    "contributing_app": "Windows on Arm - Contributing Applications form",
+    "contributing_app_desc": "Contributing form for Applications ready for Windows on Arm",
+    "contributing_game": "Windows on Arm - Contributing Games form",
+    "contributing_game_desc": "Contributing form for Games ready for Windows on Arm"
   },
   "bradcrumbs": {
 	"home": "Home",

diff --git a/public/locales/ja/translation.json b/public/locales/ja/translation.json
@@ -1,6 +1,14 @@
 {
   "header": {
-	"main": "Arm向けのWindows対応ソフトウェア"
+	"main": "Arm向けのWindows対応ソフトウェア",
+    "applications": "Windows on Arm 対応アプリケーション",
+    "applications_desc": "Windows on Arm に対応したアプリケーションを探す",
+    "games": "Windows on Arm 対応ゲーム",
+    "games_desc": "Windows on Arm に対応したゲームを探す",
+    "contributing_app": "Windows on Arm - アプリケーション提供フォーム",
+    "contributing_app_desc": "Windows on Arm 対応アプリケーションの提供フォーム",
+    "contributing_game": "Windows on Arm - ゲーム提供フォーム",
+    "contributing_game_desc": "Windows on Arm 対応ゲームの提供フォーム"
   },
   "bradcrumbs": {
 	"home": "ホーム",

diff --git a/public/locales/ko/translation.json b/public/locales/ko/translation.json
@@ -1,6 +1,14 @@
 {
   "header": {
-	"main": "Arm용 Windows 호환 소프트웨어"
+	  "main": "Arm용 Windows 호환 소프트웨어",
+    "applications": "Windows on Arm 지원 애플리케이션",
+    "applications_desc": "Windows on Arm에서 실행 가능한 애플리케이션 찾기",
+    "games": "Windows on Arm 지원 게임",
+    "games_desc": "Windows on Arm에서 실행 가능한 게임 찾기",
+    "contributing_app": "Windows on Arm - 애플리케이션 기여 양식",
+    "contributing_app_desc": "Windows on Arm 지원 애플리케이션 기여 양식",
+    "contributing_game": "Windows on Arm - 게임 기여 양식",
+    "contributing_game_desc": "Windows on Arm 지원 게임 기여 양식"
   },
   "bradcrumbs": {
 	"home": "홈",

diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
@@ -1,6 +1,14 @@
 {
   "header": {
-	"main": "适用于Arm的Windows就绪软件"
+    "main": "适用于Arm的Windows就绪软件",
+    "applications": "Windows on Arm 兼容应用程序",
+    "applications_desc": "查找适用于 Windows on Arm 的应用程序",
+    "games": "Windows on Arm 兼容游戏",
+    "games_desc": "查找适用于 Windows on Arm 的游戏",
+    "contributing_app": "Windows on Arm - 应用程序贡献表单",
+    "contributing_app_desc": "适用于 Windows on Arm 的应用程序贡献表单",
+    "contributing_game": "Windows on Arm - 游戏贡献表单",
+    "contributing_game_desc": "适用于 Windows on Arm 的游戏贡献表单"
   },
   "bradcrumbs": {
 	"home": "主页",

diff --git a/src/layouts/InfoLayout.astro b/src/layouts/InfoLayout.astro
@@ -5,8 +5,6 @@ import { LOCALES } from "../config/i18nConfig";
 import { t } from "i18next";
 
 const { frontmatter } = Astro.props;
-console.log("From InfoLayout");
-console.log(Astro.props);
 let title = frontmatter.title + " | " + t('header.main');
 let breadcrumbs = [{ href: `${Astro.url.pathname}`, title: frontmatter.title }];
 const localeSegment = Astro.url.pathname.startsWith('/') ? Astro.url.pathname.replace(/\/$/, '').slice(1) : Astro.url.pathname;

diff --git a/src/pages/[lang]/applications/[...slug].astro b/src/pages/[lang]/applications/[...slug].astro
@@ -3,7 +3,6 @@ import { type CollectionEntry, getCollection, getEntry } from "astro:content";
 import ProjectLayout from "../../../layouts/ProjectLayout.astro";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
-import i18next from "i18next";
 import { LOCALES } from "../../../config/i18nConfig";
 
 const execAsync = promisify(exec);

diff --git a/src/pages/[lang]/applications/index.astro b/src/pages/[lang]/applications/index.astro
@@ -23,8 +23,8 @@ const locale = updateLanguage(Astro.url);
 ---
 
 <BaseLayout
-  title={"Windows on Arm Ready Applications"}
-  description={`Find applications ready for Windows on Arm`}
+  title={t('header.applications')}
+  description={t('header.applications_desc')}
   breadcrumbs={[{ title: t('bradcrumbs.applications'), href: `/${locale}/applications` }]}
 >
   <div class="flex mx-auto mx-auto mt-12 text-3xl">

diff --git a/src/pages/[lang]/applications/search.astro b/src/pages/[lang]/applications/search.astro
@@ -15,8 +15,8 @@ const locale = updateLanguage(Astro.url);
 ---
 
 <BaseLayout
-  title={"Windows on Arm Ready Applications"}
-  description={`Find applications ready for Windows on Arm`}
+  title={t('header.applications')}
+  description={t('header.applications_desc')}
   breadcrumbs={[
     { title: t('bradcrumbs.applications'), href: `/${locale}/applications` },
     { title: t('bradcrumbs.search'), href: `/${locale}/applications/search` }

diff --git a/src/pages/[lang]/contributing/applications.astro b/src/pages/[lang]/contributing/applications.astro
@@ -15,8 +15,8 @@ const recaptcha_url = `https://www.google.com/recaptcha/api.js?hl=${locale}`;
 ---
 
 <BaseLayout
-  title={"Windows on Arm - Contributing Applications form"}
-  description={`Contributing form for Applications ready for Windows on Arm`}
+  title={t('header.contributing_app')}
+  description={t('header.contributing_app_desc')}
   breadcrumbs={[
     { title: t('bradcrumbs.contributing'), href: `/${locale}/contributing` }, 
     { title: t('application_form.title'), href: `/${locale}/contributing/applications` }

diff --git a/src/pages/[lang]/contributing/games.astro b/src/pages/[lang]/contributing/games.astro
@@ -15,8 +15,8 @@ const recaptcha_url = `https://www.google.com/recaptcha/api.js?hl=${locale}`;
 ---
 
 <BaseLayout
-  title={"Windows on Arm - Contributing Games form"}
-  description={`Contributing form for Games ready for Windows on Arm`}
+  title={t('header.contributing_game')}
+  description={t('header.contributing_game_desc')}
   breadcrumbs={[
     { title: t('bradcrumbs.contributing'), href: `/${locale}/contributing`, }, 
     { title: t('game_form.title'), href: `/${locale}/contributing/games` }

diff --git a/src/pages/[lang]/games/[...slug].astro b/src/pages/[lang]/games/[...slug].astro
@@ -4,7 +4,6 @@ import ProjectLayout from "../../../layouts/ProjectLayout.astro";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
 import { getEntry } from "astro:content";
-import i18next from "i18next";
 import { LOCALES } from "../../../config/i18nConfig";
 
 const execAsync = promisify(exec);

diff --git a/src/pages/[lang]/games/index.astro b/src/pages/[lang]/games/index.astro
@@ -15,8 +15,8 @@ const locale = updateLanguage(Astro.url);
 ---
 
 <BaseLayout
-  title={"Windows on Arm Ready Games"}
-  description={`Find Games ready for Windows on Arm`}
+  title={t('header.games')}
+  description={t('header.games_desc')}
   breadcrumbs={[{ title: t('bradcrumbs.games'), href: `/${locale}/games` }]}
 >
   <Search shouldRedirect={false} type="games" />

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -1,6 +1,5 @@
 ---
 import { DEFAULT_LOCALE } from "../config/i18nConfig";
-Astro.redirect(`/${DEFAULT_LOCALE}/`);
 ---
 
 <html>