fix(client): fallback page lang to site lang (close #1365) (#1380)

vordimous · web-flow · commit debd65d68d89 · 2023-07-11T15:33:55.000+08:00
diff --git a/packages/client/src/resolvers.ts b/packages/client/src/resolvers.ts
@@ -92,7 +92,8 @@ export const resolvers = reactive({
    *
    * It would be used as the `lang` attribute of `<html>` tag
    */
-  resolvePageLang: (page: PageData): PageLang => page.lang || 'en',
+  resolvePageLang: (page: PageData, siteLocale: SiteLocaleData): PageLang =>
+    page.lang || siteLocale.lang || 'en-US',
 
   /**
    * Resolve layout component of current page
diff --git a/packages/client/src/setupGlobalComputed.ts b/packages/client/src/setupGlobalComputed.ts
@@ -82,7 +82,9 @@ export const setupGlobalComputed = (
       siteLocaleData.value
     )
   )
-  const pageLang = computed(() => resolvers.resolvePageLang(pageData.value))
+  const pageLang = computed(() =>
+    resolvers.resolvePageLang(pageData.value, siteLocaleData.value)
+  )
   const pageLayout = computed(() =>
     resolvers.resolvePageLayout(pageData.value, layouts.value)
   )

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ export const resolvers = reactive({`
`92`	`92`	`*`
`93`	`93`	* It would be used as the `lang` attribute of `<html>` tag
`94`	`94`	`*/`
`95`		`- resolvePageLang: (page: PageData): PageLang => page.lang \|\| 'en',`
	`95`	`+ resolvePageLang: (page: PageData, siteLocale: SiteLocaleData): PageLang =>`
	`96`	`+ page.lang \|\| siteLocale.lang \|\| 'en-US',`
`96`	`97`
`97`	`98`	`/**`
`98`	`99`	`* Resolve layout component of current page`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,9 @@ export const setupGlobalComputed = (`
`82`	`82`	`siteLocaleData.value`
`83`	`83`	`)`
`84`	`84`	`)`
`85`		`- const pageLang = computed(() => resolvers.resolvePageLang(pageData.value))`
	`85`	`+ const pageLang = computed(() =>`
	`86`	`+ resolvers.resolvePageLang(pageData.value, siteLocaleData.value)`
	`87`	`+ )`
`86`	`88`	`const pageLayout = computed(() =>`
`87`	`89`	`resolvers.resolvePageLayout(pageData.value, layouts.value)`
`88`	`90`	`)`