fix(theme/i18n): 404 page not showing localized text (#3833)

pull/3834/head
Divyansh Singh 8 months ago committed by GitHub
parent 0048787206
commit cc11b8e41e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -23,7 +23,7 @@ jobs:
strategy: strategy:
matrix: matrix:
node_version: [18, 20, 21] node_version: [18, 20, 22]
steps: steps:
- name: Checkout - name: Checkout

@ -1,44 +1,55 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref } from 'vue' import { computed, onMounted, ref } from 'vue'
import { withBase } from 'vitepress' import { withBase } from 'vitepress'
import { useData } from './composables/data' import { useData } from './composables/data'
import { useLangs } from './composables/langs' import { useLangs } from './composables/langs'
const { site, theme } = useData() const { site } = useData()
const { localeLinks } = useLangs({ removeCurrent: false }) const { localeLinks } = useLangs({ removeCurrent: false })
const root = ref('/') const locale = ref({
link: '/',
index: 'root'
})
onMounted(() => { onMounted(() => {
const path = window.location.pathname const path = window.location.pathname
.replace(site.value.base, '') .replace(site.value.base, '')
.replace(/(^.*?\/).*$/, '/$1') .replace(/(^.*?\/).*$/, '/$1')
if (localeLinks.value.length) { if (localeLinks.value.length) {
root.value = locale.value =
localeLinks.value.find(({ link }) => link.startsWith(path))?.link || localeLinks.value.find(({ link }) => link.startsWith(path)) ||
localeLinks.value[0].link localeLinks.value[0]
} }
}) })
const notFound = computed(() => ({
code: 404,
title: 'PAGE NOT FOUND',
quote:
"But if you don't change your direction, and if you keep looking, you may end up where you are heading.",
linkLabel: 'go to home',
linkText: 'Take me home',
...(locale.value.index === 'root'
? site.value.themeConfig?.notFound
: site.value.locales?.[locale.value.index]?.themeConfig?.notFound)
}))
</script> </script>
<template> <template>
<div class="NotFound"> <div class="NotFound">
<p class="code">{{ theme.notFound?.code ?? '404' }}</p> <p class="code">{{ notFound.code }}</p>
<h1 class="title">{{ theme.notFound?.title ?? 'PAGE NOT FOUND' }}</h1> <h1 class="title">{{ notFound.title }}</h1>
<div class="divider" /> <div class="divider" />
<blockquote class="quote"> <blockquote class="quote">{{ notFound.quote }}</blockquote>
{{
theme.notFound?.quote ??
"But if you don't change your direction, and if you keep looking, you may end up where you are heading."
}}
</blockquote>
<div class="action"> <div class="action">
<a <a
class="link" class="link"
:href="withBase(root)" :href="withBase(locale.link)"
:aria-label="theme.notFound?.linkLabel ?? 'go to home'" :aria-label="notFound.linkLabel"
> >
{{ theme.notFound?.linkText ?? 'Take me home' }} {{ notFound.linkText }}
</a> </a>
</div> </div>
</div> </div>

@ -8,6 +8,7 @@ export function useLangs({
} = {}) { } = {}) {
const { site, localeIndex, page, theme, hash } = useData() const { site, localeIndex, page, theme, hash } = useData()
const currentLang = computed(() => ({ const currentLang = computed(() => ({
index: localeIndex.value,
label: site.value.locales[localeIndex.value]?.label, label: site.value.locales[localeIndex.value]?.label,
link: link:
site.value.locales[localeIndex.value]?.link || site.value.locales[localeIndex.value]?.link ||
@ -19,6 +20,7 @@ export function useLangs({
removeCurrent && currentLang.value.label === value.label removeCurrent && currentLang.value.label === value.label
? [] ? []
: { : {
index: key,
text: value.label, text: value.label,
link: link:
normalizeLink( normalizeLink(

Loading…
Cancel
Save