...

Cap-go · Oct 8, 2024 · 367ba16 · 367ba16
1 parent 59cd31c
commit 367ba16
Show file tree

Hide file tree

Showing 70 changed files with 571 additions and 695 deletions.
diff --git a/src/env.d.ts b/src/env.d.ts
@@ -10,3 +10,9 @@ interface Window {
   $bentoChat: any
   bentoChatSDK: any
 }
+
+declare namespace App {
+  interface Locals {
+    locale: import('./services/locale').Locales
+  }
+}
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -4,13 +4,11 @@ import Header from '@/components/Header.vue'
 import MessengerAffiliateVue from '@/components/MessengerAffliate.vue'
 import SEO from '@/components/SEO.astro'
 import '@/css/global.css'
-import { defaultLocale, type Locales } from '@/services/locale'
 import { pwaInfo } from 'virtual:pwa-info'
 
 const { content } = Astro.props
 
 const isLocalhost = Astro.url.origin.includes('localhost:')
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
 ---
 
 <!doctype html>
@@ -21,9 +19,9 @@ const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
   </head>
   <body>
     <div class="overflow-x-hidden bg-gray-900 text-white">
-      <Header locale={pageLocale} client:load />
+      <Header locale={Astro.locals.locale} client:load />
       <slot />
-      <Footer locale={pageLocale} client:load />
+      <Footer locale={Astro.locals.locale} client:load />
     </div>
     {
       !isLocalhost && (

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -0,0 +1,7 @@
+import { defineMiddleware } from 'astro:middleware'
+import { defaultLocale, type Locales } from './services/locale'
+
+export const onRequest = defineMiddleware((context, next) => {
+  context.locals.locale = (context.currentLocale || defaultLocale) as Locales
+  return next()
+})
diff --git a/src/pages/about.astro b/src/pages/about.astro
@@ -1,15 +1,13 @@
 ---
 import { useRuntimeConfig } from '@/config/app'
 import Layout from '@/layouts/Layout.astro'
-import { defaultLocale, type Locales } from '@/services/locale'
 import translations from '@/services/translations'
 import VueAbout from '@/vue-pages/about.vue'
 
 const config = useRuntimeConfig()
 const brand = config.public.brand
 
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
-const description = translations['about_capgo'][pageLocale]
+const description = translations['about_capgo'][Astro.locals.locale]
 
 const content = {
   description,
@@ -18,4 +16,4 @@ const content = {
 }
 ---
 
-<Layout content={content}><VueAbout locale={pageLocale} client:load /></Layout>
+<Layout content={content}><VueAbout locale={Astro.locals.locale} client:load /></Layout>
diff --git a/src/pages/app_mobile.astro b/src/pages/app_mobile.astro
@@ -3,14 +3,12 @@ import Layout from '@/layouts/Layout.astro'
 import VueAppmobile from '@/vue-pages/app_mobile.vue'
 import { useRuntimeConfig } from '@/config/app'
 import translations from '@/services/translations'
-import { defaultLocale, type Locales } from '@/services/locale'
 
 const config = useRuntimeConfig()
 const brand = config.public.brand
 
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
-const title = [brand, translations['Capacitor_Sanbox_App'][pageLocale]].join(' | ')
-const description = translations['Capacitor_Sanbox_App_description'][pageLocale]
+const title = [brand, translations['Capacitor_Sanbox_App'][Astro.locals.locale]].join(' | ')
+const description = translations['Capacitor_Sanbox_App_description'][Astro.locals.locale]
 
 const content = {
   title,
@@ -19,4 +17,4 @@ const content = {
 }
 ---
 
-<Layout content={content}><VueAppmobile locale={pageLocale} client:load /></Layout>
+<Layout content={content}><VueAppmobile locale={Astro.locals.locale} client:load /></Layout>
diff --git a/src/pages/aup.astro b/src/pages/aup.astro
@@ -2,100 +2,98 @@
 import Layout from '@/layouts/Layout.astro'
 import { useRuntimeConfig } from '@/config/app'
 import translations from '@/services/translations'
-import { defaultLocale, type Locales } from '@/services/locale'
 
 const config = useRuntimeConfig()
 const brand = config.public.brand
 
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
-const title = [brand, translations['aup'][pageLocale]].join(' | ')
-const description = translations['read_our_aup'][pageLocale]
+const title = [brand, translations['aup'][Astro.locals.locale]].join(' | ')
+const description = translations['read_our_aup'][Astro.locals.locale]
 
 const content = { title, description }
 ---
 
 <Layout content={content}>
   <div class="prose prose-sm m-auto px-3 text-left">
-    <h1>{translations['aup'][pageLocale]}</h1>
-    <p><em>{translations['last_update'][pageLocale]}: 07/09/2024</em></p>
+    <h1>{translations['aup'][Astro.locals.locale]}</h1>
+    <p><em>{translations['last_update'][Astro.locals.locale]}: 07/09/2024</em></p>
     <p>
-      {translations['aup_intro'][pageLocale]}
+      {translations['aup_intro'][Astro.locals.locale]}
     </p>
-    <h2>{translations['aup_no_illegal_use'][pageLocale]}</h2>
+    <h2>{translations['aup_no_illegal_use'][Astro.locals.locale]}</h2>
     <p>
-      {translations['aup_no_illegal_use_desc'][pageLocale]}
+      {translations['aup_no_illegal_use_desc'][Astro.locals.locale]}
     </p>
     <ul>
       <li>
-        <strong>{translations['illegal_activities'][pageLocale]}</strong>
-        {translations['illegal_activities_desc'][pageLocale]}
+        <strong>{translations['illegal_activities'][Astro.locals.locale]}</strong>
+        {translations['illegal_activities_desc'][Astro.locals.locale]}
       </li>
       <li>
-        <strong>{translations['infringing_content'][pageLocale]}</strong>
-        {translations['infringing_content_desc'][pageLocale]}
+        <strong>{translations['infringing_content'][Astro.locals.locale]}</strong>
+        {translations['infringing_content_desc'][Astro.locals.locale]}
       </li>
       <li>
-        <strong>{translations['offensive_content'][pageLocale]}</strong>
-        {translations['offensive_content_desc'][pageLocale]}
+        <strong>{translations['offensive_content'][Astro.locals.locale]}</strong>
+        {translations['offensive_content_desc'][Astro.locals.locale]}
       </li>
       <li>
-        <strong>{translations['harmful_content'][pageLocale]}</strong>
-        {translations['harmful_content_desc'][pageLocale]}
+        <strong>{translations['harmful_content'][Astro.locals.locale]}</strong>
+        {translations['harmful_content_desc'][Astro.locals.locale]}
       </li>
       <li>
-        <strong>{translations['platform_compliance'][pageLocale]}</strong>
-        {translations['platform_compliance_desc'][pageLocale]}
+        <strong>{translations['platform_compliance'][Astro.locals.locale]}</strong>
+        {translations['platform_compliance_desc'][Astro.locals.locale]}
       </li>
     </ul>
-    <h2>{translations['aup_no_security_violations'][pageLocale]}</h2>
+    <h2>{translations['aup_no_security_violations'][Astro.locals.locale]}</h2>
     <p>
-      {translations['aup_no_security_violations_desc'][pageLocale]}
+      {translations['aup_no_security_violations_desc'][Astro.locals.locale]}
     </p>
     <ul>
       <li>
-        <strong>{translations['unauthorized_access'][pageLocale]}</strong>
-        {translations['unauthorized_access_desc'][pageLocale]}
+        <strong>{translations['unauthorized_access'][Astro.locals.locale]}</strong>
+        {translations['unauthorized_access_desc'][Astro.locals.locale]}
       </li>
-      <li><strong>{translations['interception'][pageLocale]}</strong></li>
+      <li><strong>{translations['interception'][Astro.locals.locale]}</strong></li>
       <li>
-        <strong>{translations['falsification_of_origin'][pageLocale]}</strong>
-        {translations['falsification_of_origin_desc'][pageLocale]}
+        <strong>{translations['falsification_of_origin'][Astro.locals.locale]}</strong>
+        {translations['falsification_of_origin_desc'][Astro.locals.locale]}
       </li>
     </ul>
-    <h2>{translations['aup_no_network_abuse'][pageLocale]}</h2>
-    <p>{translations['aup_no_network_abuse_desc'][pageLocale]}</p>
+    <h2>{translations['aup_no_network_abuse'][Astro.locals.locale]}</h2>
+    <p>{translations['aup_no_network_abuse_desc'][Astro.locals.locale]}</p>
     <ul>
-      <li><strong>{translations['monitoring_crawling'][pageLocale]}</strong>{translations['monitoring_crawling_desc'][pageLocale]}</li>
+      <li><strong>{translations['monitoring_crawling'][Astro.locals.locale]}</strong>{translations['monitoring_crawling_desc'][Astro.locals.locale]}</li>
       <li>
-        <strong>{translations['denial_of_service'][pageLocale]}</strong>
-        {translations['denial_of_service_desc'][pageLocale]}
+        <strong>{translations['denial_of_service'][Astro.locals.locale]}</strong>
+        {translations['denial_of_service_desc'][Astro.locals.locale]}
       </li>
       <li>
-        <strong>{translations['intentional_interference'][pageLocale]}</strong>
-        {translations['intentional_interference_desc'][pageLocale]}
+        <strong>{translations['intentional_interference'][Astro.locals.locale]}</strong>
+        {translations['intentional_interference_desc'][Astro.locals.locale]}
       </li>
       <li>
-        <strong>{translations['operation_of_network_services'][pageLocale]}</strong>
-        {translations['operation_of_network_services_desc'][pageLocale]}
+        <strong>{translations['operation_of_network_services'][Astro.locals.locale]}</strong>
+        {translations['operation_of_network_services_desc'][Astro.locals.locale]}
       </li>
       <li>
-        <strong>{translations['avoiding_system_restrictions'][pageLocale]}</strong>
-        {translations['avoiding_system_restrictions_desc'][pageLocale]}
+        <strong>{translations['avoiding_system_restrictions'][Astro.locals.locale]}</strong>
+        {translations['avoiding_system_restrictions_desc'][Astro.locals.locale]}
       </li>
     </ul>
-    <h2>{translations['aup_no_email_abuse'][pageLocale]}</h2>
-    <p>{translations['aup_no_email_abuse_desc'][pageLocale]}</p>
-    <h2>{translations['aup_monitoring_enforcement'][pageLocale]}</h2>
-    <p>{translations['aup_monitoring_enforcement_desc'][pageLocale]}</p>
+    <h2>{translations['aup_no_email_abuse'][Astro.locals.locale]}</h2>
+    <p>{translations['aup_no_email_abuse_desc'][Astro.locals.locale]}</p>
+    <h2>{translations['aup_monitoring_enforcement'][Astro.locals.locale]}</h2>
+    <p>{translations['aup_monitoring_enforcement_desc'][Astro.locals.locale]}</p>
     <ul>
-      <li>{translations['investigate_violations'][pageLocale]}</li>
-      <li>{translations['remove_modify_content'][pageLocale]}</li>
+      <li>{translations['investigate_violations'][Astro.locals.locale]}</li>
+      <li>{translations['remove_modify_content'][Astro.locals.locale]}</li>
     </ul>
     <p>
-      {translations['report_violations_desc'][pageLocale]}
-      {translations['report_violations_desc_2'][pageLocale]}
+      {translations['report_violations_desc'][Astro.locals.locale]}
+      {translations['report_violations_desc_2'][Astro.locals.locale]}
     </p>
-    <h2>{translations['aup_reporting_violations'][pageLocale]}</h2>
-    <p set:html={translations['aup_reporting_violations_desc'][pageLocale]} />
+    <h2>{translations['aup_reporting_violations'][Astro.locals.locale]}</h2>
+    <p set:html={translations['aup_reporting_violations_desc'][Astro.locals.locale]} />
   </div>
 </Layout>
diff --git a/src/pages/blog/[slug].astro b/src/pages/blog/[slug].astro
@@ -1,7 +1,6 @@
 ---
 import { useRuntimeConfig } from '@/config/app'
 import Layout from '@/layouts/Layout.astro'
-import { defaultLocale, type Locales } from '@/services/locale'
 import VueBlogSlug from '@/vue-pages/blog/[slug].vue'
 import type { GetStaticPaths, MarkdownInstance } from 'astro'
 
@@ -71,10 +70,8 @@ content['ldJSON'] = {
     },
   },
 }
-
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
 ---
 
 <Layout content={content}>
-  <VueBlogSlug locale={pageLocale} toc={data.getHeadings()} related={related} Content={markdown} client:load {...data.frontmatter} />
+  <VueBlogSlug locale={Astro.locals.locale} toc={data.getHeadings()} related={related} Content={markdown} client:load {...data.frontmatter} />
 </Layout>
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro
@@ -2,10 +2,8 @@
 import Layout from '@/layouts/Layout.astro'
 import { useRuntimeConfig } from '@/config/app'
 import VueBlogIndex from '@/vue-pages/blog/index.vue'
-import { defaultLocale, type Locales } from '@/services/locale'
 
 const config = useRuntimeConfig()
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
 const content: { title?: string; description?: string; image?: string; author?: string; ldJSON?: Object } = {}
 const posts = (await Astro.glob('@/content/blog/**/*.md'))
   .filter((i) => i.frontmatter.published)
@@ -16,5 +14,5 @@ if (config.public.blog_description) content['description'] = config.public.blog_
 ---
 
 <Layout content={content}>
-  <VueBlogIndex locale={pageLocale} Content={posts} client:load />
+  <VueBlogIndex locale={Astro.locals.locale} Content={posts} client:load />
 </Layout>
diff --git a/src/pages/confirm_email.astro b/src/pages/confirm_email.astro
@@ -1,9 +1,6 @@
 ---
 import Layout from '@/layouts/Layout.astro'
-import { defaultLocale, type Locales } from '@/services/locale'
 import VueConfirmEmail from '@/vue-pages/confirm_email.vue'
-
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
 ---
 
-<Layout><VueConfirmEmail locale={pageLocale} client:load /></Layout>
+<Layout><VueConfirmEmail locale={Astro.locals.locale} client:load /></Layout>
diff --git a/src/pages/consulting.astro b/src/pages/consulting.astro
@@ -3,16 +3,14 @@ import Layout from '@/layouts/Layout.astro'
 import VueConsulting from '@/vue-pages/consulting.vue'
 import { useRuntimeConfig } from '@/config/app'
 import translations from '@/services/translations'
-import { defaultLocale, type Locales } from '@/services/locale'
 
 const config = useRuntimeConfig()
 const brand = config.public.brand
 
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
-const title = [brand, translations['consulting'][pageLocale]].join(' | ')
-const description = translations['consulting_description'][pageLocale]
+const title = [brand, translations['consulting'][Astro.locals.locale]].join(' | ')
+const description = translations['consulting_description'][Astro.locals.locale]
 
 const content = { title, description }
 ---
 
-<Layout content={content}><VueConsulting locale={pageLocale} client:load /></Layout>
+<Layout content={content}><VueConsulting locale={Astro.locals.locale} client:load /></Layout>
diff --git a/src/pages/contributing.astro b/src/pages/contributing.astro
@@ -3,16 +3,14 @@ import Layout from '@/layouts/Layout.astro'
 import VueContributing from '@/vue-pages/contributing.vue'
 import { useRuntimeConfig } from '@/config/app'
 import translations from '@/services/translations'
-import { defaultLocale, type Locales } from '@/services/locale'
 
 const config = useRuntimeConfig()
 const brand = config.public.brand
 
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
-const title = [brand, translations['contributing'][pageLocale]].join(' | ')
-const description = translations['contributing_description'][pageLocale]
+const title = [brand, translations['contributing'][Astro.locals.locale]].join(' | ')
+const description = translations['contributing_description'][Astro.locals.locale]
 
 const content = { title, description }
 ---
 
-<Layout content={content}><VueContributing locale={pageLocale} client:load /></Layout>
+<Layout content={content}><VueContributing locale={Astro.locals.locale} client:load /></Layout>
diff --git a/src/pages/disclaimer.astro b/src/pages/disclaimer.astro
@@ -3,16 +3,14 @@ import Layout from '@/layouts/Layout.astro'
 import VueDisclaimer from '@/vue-pages/disclaimer.vue'
 import { useRuntimeConfig } from '@/config/app'
 import translations from '@/services/translations'
-import { defaultLocale, type Locales } from '@/services/locale'
 
 const config = useRuntimeConfig()
 const brand = config.public.brand
 
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
-const title = [brand, translations['disclaimer'][pageLocale]].join(' | ')
-const description = translations['read_our_disclaimer'][pageLocale]
+const title = [brand, translations['disclaimer'][Astro.locals.locale]].join(' | ')
+const description = translations['read_our_disclaimer'][Astro.locals.locale]
 
 const content = { title, description }
 ---
 
-<Layout content={content}><VueDisclaimer locale={pageLocale} client:load /></Layout>
+<Layout content={content}><VueDisclaimer locale={Astro.locals.locale} client:load /></Layout>
diff --git a/src/pages/dp.astro b/src/pages/dp.astro
@@ -3,16 +3,14 @@ import VueDataPolicy from '@/vue-pages/data_policy.vue'
 import Layout from '@/layouts/Layout.astro'
 import { useRuntimeConfig } from '@/config/app'
 import translations from '@/services/translations'
-import { defaultLocale, type Locales } from '@/services/locale'
 
 const config = useRuntimeConfig()
 const brand = config.public.brand
 
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
-const title = [brand, translations['dp'][pageLocale]].join(' | ')
-const description = translations['dp'][pageLocale]
+const title = [brand, translations['dp'][Astro.locals.locale]].join(' | ')
+const description = translations['dp'][Astro.locals.locale]
 
 const content = { title, description }
 ---
 
-<Layout content={content}><VueDataPolicy locale={pageLocale} client:load /></Layout>
+<Layout content={content}><VueDataPolicy locale={Astro.locals.locale} client:load /></Layout>
diff --git a/src/pages/dpa.astro b/src/pages/dpa.astro
@@ -2,17 +2,15 @@
 import VueDpa from '@/vue-pages/dpa.vue'
 import Layout from '@/layouts/Layout.astro'
 import { useRuntimeConfig } from '@/config/app'
-import { defaultLocale, type Locales } from '@/services/locale'
 import translations from '@/services/translations'
 
 const config = useRuntimeConfig()
 const brand = config.public.brand
 
-const pageLocale = (Astro.currentLocale || defaultLocale) as Locales
-const title = [brand, translations['data_processing_agreement'][pageLocale]].join(' | ')
-const description = translations['read_our_data_processing_agreement'][pageLocale]
+const title = [brand, translations['data_processing_agreement'][Astro.locals.locale]].join(' | ')
+const description = translations['read_our_data_processing_agreement'][Astro.locals.locale]
 
 const content = { title, description }
 ---
 
-<Layout content={content}><VueDpa locale={pageLocale} client:load /></Layout>
+<Layout content={content}><VueDpa locale={Astro.locals.locale} client:load /></Layout>