fix: improve root lang detection

vuepress-theme-hope · Apr 1, 2022 · ff65e00 · ff65e00
1 parent a32409b
commit ff65e00
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/demo/theme/src/.vuepress/config.ts b/demo/theme/src/.vuepress/config.ts
@@ -18,18 +18,18 @@ export default defineHopeConfig({
     ],
   ],
 
-  locales: {
-    "/": {
-      lang: "en-US",
-      title: "Theme Demo",
-      description: "A demo for vuepress-theme-hope",
-    },
-    "/zh/": {
-      lang: "zh-CN",
-      title: "主题演示",
-      description: "vuepress-theme-hope 的演示",
-    },
-  },
+  // locales: {
+  //   "/": {
+  //     lang: "en-US",
+  //     title: "Theme Demo",
+  //     description: "A demo for vuepress-theme-hope",
+  //   },
+  //   "/zh/": {
+  //     lang: "zh-CN",
+  //     title: "主题演示",
+  //     description: "vuepress-theme-hope 的演示",
+  //   },
+  // },
 
   themeConfig,
 });
diff --git a/packages/feed2/src/node/injectHead.ts b/packages/feed2/src/node/injectHead.ts
@@ -29,7 +29,7 @@ export const injectLinkstoHead = (
           type,
           href: resolveUrl(options["/"].hostname, base, fileName),
           title: `${
-            siteData.title || siteData.locales["/"].title || ""
+            siteData.title || siteData.locales["/"]?.title || ""
           } ${name} Feed`,
         },
       ];
@@ -78,9 +78,9 @@ export const injectLinkstoHead = (
               type,
               href: resolveUrl(localeOptions.hostname, base, fileName),
               title: `${
-                siteData.locales[pathLocale].title ||
+                siteData.locales[pathLocale]?.title ||
                 siteData.title ||
-                siteData.locales["/"].title ||
+                siteData.locales["/"]?.title ||
                 ""
               } ${name} Feed`,
             },

diff --git a/packages/seo2/src/node/seo.ts b/packages/seo2/src/node/seo.ts
@@ -34,9 +34,9 @@ export const generateSeo = (
   const { siteData } = app;
 
   const title =
-    siteData.locales[page.pathLocale].title ||
+    siteData.locales[page.pathLocale]?.title ||
     siteData.title ||
-    siteData.locales["/"].title ||
+    siteData.locales["/"]?.title ||
     "";
   const author =
     pageAuthor === false ? [] : getAuthor(pageAuthor || options.author);

diff --git a/packages/shared/src/node/locales/helpers.ts b/packages/shared/src/node/locales/helpers.ts
@@ -60,14 +60,7 @@ export const getRootLang = (app: App): string => {
   if (siteLocales?.["/"] && siteLocales["/"]?.lang)
     return siteLocales["/"].lang;
 
-  // infer from themeLocale
-  const options = app.options as AppOptions<BaseThemeConfig>;
-  const themeLocales = options.themeConfig.locales;
-
-  if (themeLocales?.["/"] && themeLocales["/"]?.lang)
-    return themeLocales["/"].lang;
-
-  return "en-US";
+  return app.siteData.lang;
 };
 
 /**