fix: remove url localization

Co-authored-by: Luis Emidio <luisfuturist@gmail.com>

Author: vinicenter

app/components/framework/A.vue

@@ -1,31 +1,21 @@
 <script setup lang="ts">
-import { localizeUrl } from '@psitta/core'
-import { useLocale } from '@psitta/vue'
-
 interface Props {
   activeClass?: string
   href?: string
+  // Localize is not used anymore, but kept for compatibility.
   localize?: boolean | undefined
   locale?: string
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   localize: undefined,
 })
-
-const locale = useLocale()
-
-const normalHref = computed(() => {
-  return props.localize ?? true
-    ? localizeUrl(props.href, props.locale || locale.value)
-    : props.href
-})
 </script>
 
 <template>
   <NuxtLink
     :active-class="activeClass || 'is-active'"
-    :to="normalHref"
+    :to="href"
   >
     <slot />
   </NuxtLink>

app/middleware/psitta.global.ts

@@ -1,32 +1,21 @@
-import { detectLocaleFromAcceptLanguage, detectLocaleFromCookie, detectLocaleFromNavigator, detectLocaleFromPathname, getConfig } from '@psitta/core'
-import type { RouteLocationNormalized } from 'vue-router'
+import { detectLocaleFromAcceptLanguage, detectLocaleFromCookie, detectLocaleFromNavigator, getConfig } from '@psitta/core'
 
-export default defineNuxtRouteMiddleware((to: RouteLocationNormalized) => {
+export default defineNuxtRouteMiddleware(() => {
   const { defaultLocale } = getConfig()
-  const pathname = to.fullPath
 
-  const { urlWithoutLocale, locale } = detectLocaleFromPathname(pathname)
+  const cookie = useCookie('locale')
 
-  if (!locale) {
-    const cookie = useCookie('locale').value
-
-    let locale = detectLocaleFromCookie(cookie || undefined)
+  let locale = detectLocaleFromCookie(cookie.value || undefined)
 
-    if (!locale) {
-      // eslint-disable-next-line nuxt/prefer-import-meta, node/prefer-global/process
-      const acceptLanguage = process.server ? null : detectLocaleFromNavigator()?.language
-
-      const header = useRequestHeader('accept-language')
-      locale = header
-        ? detectLocaleFromAcceptLanguage(header)?.language || defaultLocale
-        : acceptLanguage || defaultLocale
-    }
+  if (!locale) {
+    // eslint-disable-next-line nuxt/prefer-import-meta, node/prefer-global/process
+    const acceptLanguage = process.server ? null : detectLocaleFromNavigator()?.language
 
-    if (locale !== defaultLocale && pathname === urlWithoutLocale) {
-      if (pathname.startsWith('/api/'))
-        return
+    const header = useRequestHeader('accept-language')
+    locale = header
+      ? detectLocaleFromAcceptLanguage(header)?.language || defaultLocale
+      : acceptLanguage || defaultLocale
 
-      return navigateTo(`/${locale}${urlWithoutLocale}`, { replace: true })
-    }
+    cookie.value = locale
   }
 })

app/modals/LocaleModal.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { getConfig } from '@psitta/core'
 import { useForm } from 'vee-validate'
-import { detectLocaleFromPathname, getConfig } from '@psitta/core'
 import { LOCALES } from '~/constants/base'
 
 const { defaultLocale } = getConfig()
@@ -18,26 +18,17 @@ onMounted(() => {
 const isOpen = defineModel({ default: false })
 const loading = ref(false)
 
-const route = useRoute()
-
-const { urlWithoutLocale } = detectLocaleFromPathname(route.path)
-
 const submit = form.handleSubmit(async (data) => {
   const locale = data.locale
 
-  const localeCookie = useCookie('locale', { path: '/' })
+  const localeCookie = useCookie('locale')
   localeCookie.value = locale
 
   loading.value = true
 
   const scrollX = window.scrollX
   const scrollY = window.scrollY
 
-  if (locale === defaultLocale)
-    await navigateTo(urlWithoutLocale, { replace: true })
-  else
-    await navigateTo(`/${locale}${urlWithoutLocale}`, { replace: true })
-
   requestAnimationFrame(() => {
     setTimeout(() => {
       window.scrollTo(scrollX, scrollY)

…[locale]]/(auth)/deactivated-account.vue app/pages/(auth)/deactivated-account.vueapp/pages/[[locale]]/(auth)/deactivated-account.vue renamed to app/pages/(auth)/deactivated-account.vue app/pages/[[locale]]/(auth)/deactivated-account.vue renamed to app/pages/(auth)/deactivated-account.vue

@@ -1,17 +1,11 @@
 <script setup lang="ts">
-import { getConfig } from '@psitta/core'
 import { T, t, useLocale } from '@psitta/vue'
 import { AccordionRoot } from 'reka-ui'
 import { SubscriptionStatus } from '~~/db/schema'
 
 definePageMeta({
   layout: 'site',
   layoutTransition: false,
-  validate(route) {
-    if (!route.params.locale)
-      return true
-    return getConfig().locales.includes(route.params.locale as string)
-  },
 })
 
 useAutoRedirect()