@jet-w/astro-blog 0.2.5 → 0.2.6

package/src/layouts/SlidesLayout.astro

@@ -3,7 +3,7 @@ import { siteConfig } from '@jet-w/astro-blog/config';
 import '@jet-w/astro-blog/styles/slides.css';
 import type { I18nConfig } from '../config/i18n';
 import { defaultI18nConfig } from '../config/i18n';
-import { getLocaleFromPath, getLocaleConfig } from '../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, removeBase } from '../utils/i18n';
 
 export interface Props {
   title: string;
@@ -33,8 +33,14 @@ const {
   i18nConfig = defaultI18nConfig,
 } = Astro.props;
 
-// Get current locale
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const localeData = localeConfig.locale;
 const localeSiteConfig = localeConfig.site;
@@ -65,7 +71,7 @@ const revealConfig = JSON.stringify({
     <meta charset="UTF-8" />
     <meta name="description" content={description} />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href={`${base}favicon.svg`} />
     <meta name="generator" content={Astro.generator} />
     <title>{fullTitle}</title>
 
@@ -75,11 +81,11 @@ const revealConfig = JSON.stringify({
     <meta property="og:description" content={description} />
 
     <!-- Reveal.js CSS -->
-    <link rel="stylesheet" href="/slides/reveal.css" />
-    <link rel="stylesheet" href={`/slides/theme/${theme}.css`} id="theme" />
+    <link rel="stylesheet" href={`${base}slides/reveal.css`} />
+    <link rel="stylesheet" href={`${base}slides/theme/${theme}.css`} id="theme" />
 
     <!-- Reveal.js 代码高亮主题 -->
-    <link rel="stylesheet" href="/slides/plugin/highlight/monokai.css" />
+    <link rel="stylesheet" href={`${base}slides/plugin/highlight/monokai.css`} />
 
     <!-- KaTeX for math -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.9/dist/katex.min.css" />
@@ -117,7 +123,7 @@ const revealConfig = JSON.stringify({
     </a>
 
     <!-- 检测嵌入模式并隐藏返回按钮，设置返回链接为父路径 -->
-    <script is:inline>
+    <script is:inline define:vars={{ baseUrl: base }}>
       (function() {
         var btn = document.getElementById('slides-back-btn');
         if (!btn) return;
@@ -138,17 +144,29 @@ const revealConfig = JSON.stringify({
         }
         // 获取父路径
         var parentPath = path.substring(0, path.lastIndexOf('/'));
-        // 如果父路径为空，返回首页
-        btn.href = parentPath || '/';
+        // 如果父路径为空，返回base URL
+        btn.href = parentPath || baseUrl;
       })();
     </script>
 
-    <!-- Reveal.js -->
-    <script is:inline src="/slides/reveal.js"></script>
-    <script is:inline src="/slides/plugin/markdown/markdown.js"></script>
-    <script is:inline src="/slides/plugin/highlight/highlight.js"></script>
-    <script is:inline src="/slides/plugin/notes/notes.js"></script>
-    <script is:inline src="/slides/plugin/math/math.js"></script>
+    <!-- Reveal.js - dynamically loaded with base URL -->
+    <script is:inline define:vars={{ baseUrl: base }}>
+      (function() {
+        var scripts = [
+          baseUrl + 'slides/reveal.js',
+          baseUrl + 'slides/plugin/markdown/markdown.js',
+          baseUrl + 'slides/plugin/highlight/highlight.js',
+          baseUrl + 'slides/plugin/notes/notes.js',
+          baseUrl + 'slides/plugin/math/math.js'
+        ];
+        scripts.forEach(function(src) {
+          var script = document.createElement('script');
+          script.src = src;
+          script.async = false;
+          document.head.appendChild(script);
+        });
+      })();
+    </script>
 
     <!-- Mermaid -->
     <script is:inline src="https://cdn.jsdelivr.net/npm/mermaid@10/dist/mermaid.min.js"></script>

package/src/pages/archives/[year]/[month]/page/[page].astro

@@ -3,6 +3,9 @@ import { getCollection } from 'astro:content';
 import PageLayout from '@jet-w/astro-blog/layouts/PageLayout.astro';
 import PostCard from '@jet-w/astro-blog/components/blog/PostCard.astro';
 import Pagination from '@jet-w/astro-blog/components/ui/Pagination.astro';
+import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
+import { defaultI18nConfig } from '../../../../../config/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../../../../utils/i18n';
 
 export async function getStaticPaths() {
   const postsPerPage = 10;
@@ -57,8 +60,23 @@ export async function getStaticPaths() {
 const { year, month, page: currentPage, totalPages } = Astro.props;
 const postsPerPage = 10;
 
+// Get i18n config
+const i18nConfig = virtualI18nConfig || defaultI18nConfig;
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
+const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
+const ui = localeConfig.ui;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
+
 // 获取该月的所有文章
-const allPosts = await getCollection('posts', ({ data }) => !data.draft);
+const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);
+
+// Filter posts by current locale
+const allPosts = filterPostsByLocale(allPostsCollection, currentLocale, i18nConfig);
 
 const filteredPosts = allPosts
   .filter(post => {
@@ -80,29 +98,32 @@ const posts = filteredPosts.slice(startIndex, endIndex);
 
 // 月份名称
 const monthNames = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'];
-const monthName = monthNames[month - 1];
+const monthNamesEn = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+const monthName = currentLocale.startsWith('en') ? monthNamesEn[month - 1] : monthNames[month - 1];
+const archiveTitle = currentLocale.startsWith('en') ? `${monthName} ${year}` : `${year}年${monthName}`;
 ---
 
 <PageLayout
-  title={`归档: ${year}年${month}月 - 第 ${currentPage} 页`}
-  description={`${year}年${month}月的所有文章归档 - 第 ${currentPage} 页`}
+  title={`${ui.archives}: ${archiveTitle} - ${ui.page} ${currentPage}`}
+  description={`${ui.archives} ${archiveTitle} - ${ui.page} ${currentPage}`}
   showSidebar={true}
+  i18nConfig={i18nConfig}
 >
   <!-- 面包屑导航 -->
   <nav class="flex items-center space-x-2 text-sm text-slate-600 dark:text-slate-400 mb-8">
-    <a href="/" class="hover:text-primary-500 transition-colors">首页</a>
+    <a href={`${localePrefix}/`} class="hover:text-primary-500 transition-colors">{ui.home}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <a href="/archives" class="hover:text-primary-500 transition-colors">归档</a>
+    <a href={`${localePrefix}/archives`} class="hover:text-primary-500 transition-colors">{ui.archives}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <a href={`/archives/${year}/${String(month).padStart(2, '0')}`} class="hover:text-primary-500 transition-colors">{year}年{month}月</a>
+    <a href={`${localePrefix}/archives/${year}/${String(month).padStart(2, '0')}`} class="hover:text-primary-500 transition-colors">{archiveTitle}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <span class="text-slate-900 dark:text-slate-100">第 {currentPage} 页</span>
+    <span class="text-slate-900 dark:text-slate-100">{ui.page} {currentPage}</span>
   </nav>
 
   <!-- 页面头部 -->
@@ -114,20 +135,20 @@ const monthName = monthNames[month - 1];
     </div>
 
     <h1 class="text-4xl font-bold text-slate-900 dark:text-slate-100 mb-4">
-      {year}年{monthName}
+      {archiveTitle}
     </h1>
 
     <p class="text-xl text-slate-600 dark:text-slate-400 mb-8">
-      共 {totalPosts} 篇文章
+      {totalPosts} {ui.posts}
     </p>
 
     <!-- 归档统计 -->
     <div class="inline-flex items-center space-x-6 text-sm text-slate-500 dark:text-slate-400 bg-slate-50 dark:bg-slate-800 px-6 py-3 rounded-lg">
-      <span>{year}年{month}月</span>
+      <span>{archiveTitle}</span>
       <span>•</span>
-      <span>{totalPosts} 篇文章</span>
+      <span>{totalPosts} {ui.posts}</span>
       <span>•</span>
-      <span>第 {currentPage} / {totalPages} 页</span>
+      <span>{ui.page} {currentPage} / {totalPages}</span>
     </div>
   </div>
 
@@ -147,6 +168,9 @@ const monthName = monthNames[month - 1];
             image: post.data.image
           }}
           layout="horizontal"
+          localePrefix={localePrefix}
+          locale={localeConfig.locale.dateLocale}
+          ui={ui}
         />
       ))}
     </div>
@@ -154,13 +178,13 @@ const monthName = monthNames[month - 1];
     <div class="text-center py-16">
       <div class="text-6xl mb-4">📅</div>
       <h3 class="text-xl font-semibold text-slate-900 dark:text-slate-100 mb-2">
-        暂无文章
+        {ui.noPostsFound}
       </h3>
       <p class="text-slate-600 dark:text-slate-400 mb-6">
-        {year}年{month}月暂无发布的文章
+        {ui.noPostsFound}
       </p>
-      <a href="/archives" class="btn-secondary">
-        浏览所有归档
+      <a href={`${localePrefix}/archives`} class="btn-secondary">
+        {ui.archives}
       </a>
     </div>
   )}
@@ -170,7 +194,7 @@ const monthName = monthNames[month - 1];
     <Pagination
       currentPage={currentPage}
       totalPages={totalPages}
-      baseUrl={`/archives/${year}/${String(month).padStart(2, '0')}`}
+      baseUrl={`${localePrefix}/archives/${year}/${String(month).padStart(2, '0')}`}
     />
   )}
 </PageLayout>

package/src/pages/archives/[year]/[month].astro

@@ -40,10 +40,15 @@ const { year, month, count } = Astro.props;
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const { removeBase } = await import('../../../utils/i18n');
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取该月的所有文章

package/src/pages/archives/index.astro

@@ -3,14 +3,18 @@ import { getCollection } from 'astro:content';
 import PageLayout from '@jet-w/astro-blog/layouts/PageLayout.astro';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
 import { defaultI18nConfig } from '../../config/i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取所有非草稿文章

package/src/pages/categories/[category]/page/[page].astro

@@ -3,6 +3,9 @@ import { getCollection } from 'astro:content';
 import PageLayout from '@jet-w/astro-blog/layouts/PageLayout.astro';
 import PostCard from '@jet-w/astro-blog/components/blog/PostCard.astro';
 import Pagination from '@jet-w/astro-blog/components/ui/Pagination.astro';
+import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
+import { defaultI18nConfig } from '../../../../config/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../../../utils/i18n';
 
 export async function getStaticPaths() {
   const postsPerPage = 10;
@@ -53,8 +56,23 @@ export async function getStaticPaths() {
 const { categorySlug, categoryName, page: currentPage, totalPages } = Astro.props;
 const postsPerPage = 10;
 
+// Get i18n config
+const i18nConfig = virtualI18nConfig || defaultI18nConfig;
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
+const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
+const ui = localeConfig.ui;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
+
 // 获取所有文章并筛选包含该分类的文章
-const allPosts = await getCollection('posts', ({ data }) => !data.draft);
+const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);
+
+// Filter posts by current locale
+const allPosts = filterPostsByLocale(allPostsCollection, currentLocale, i18nConfig);
 
 // 筛选包含该分类的文章
 const filteredPosts = allPosts
@@ -95,25 +113,26 @@ const relatedCategories = Array.from(relatedCategoryMap.entries())
 ---
 
 <PageLayout
-  title={`分类: ${categoryName} - 第 ${currentPage} 页`}
-  description={`浏览所有 ${categoryName} 相关的文章 - 第 ${currentPage} 页`}
+  title={`${ui.inCategory}: ${categoryName} - ${ui.page} ${currentPage}`}
+  description={`${ui.inCategory} ${categoryName} - ${ui.page} ${currentPage}`}
   showSidebar={true}
+  i18nConfig={i18nConfig}
 >
   <!-- 面包屑导航 -->
   <nav class="flex items-center space-x-2 text-sm text-slate-600 dark:text-slate-400 mb-8">
-    <a href="/" class="hover:text-primary-500 transition-colors">首页</a>
+    <a href={`${localePrefix}/`} class="hover:text-primary-500 transition-colors">{ui.home}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <a href="/categories" class="hover:text-primary-500 transition-colors">分类</a>
+    <a href={`${localePrefix}/categories`} class="hover:text-primary-500 transition-colors">{ui.allCategories}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <a href={`/categories/${categorySlug}`} class="hover:text-primary-500 transition-colors">{categoryName}</a>
+    <a href={`${localePrefix}/categories/${categorySlug}`} class="hover:text-primary-500 transition-colors">{categoryName}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <span class="text-slate-900 dark:text-slate-100">第 {currentPage} 页</span>
+    <span class="text-slate-900 dark:text-slate-100">{ui.page} {currentPage}</span>
   </nav>
 
   <!-- 页面头部 -->
@@ -129,16 +148,16 @@ const relatedCategories = Array.from(relatedCategoryMap.entries())
     </h1>
 
     <p class="text-xl text-slate-600 dark:text-slate-400 mb-8 max-w-2xl mx-auto">
-      浏览 {categoryName} 分类下的所有文章
+      {totalPosts} {ui.posts}
     </p>
 
     <!-- 分类统计 -->
     <div class="inline-flex items-center space-x-6 text-sm text-slate-500 dark:text-slate-400 bg-slate-50 dark:bg-slate-800 px-6 py-3 rounded-lg">
       <span>{categoryName}</span>
       <span>•</span>
-      <span>{totalPosts} 篇文章</span>
+      <span>{totalPosts} {ui.posts}</span>
       <span>•</span>
-      <span>第 {currentPage} / {totalPages} 页</span>
+      <span>{ui.page} {currentPage} / {totalPages}</span>
     </div>
   </div>
 
@@ -158,6 +177,9 @@ const relatedCategories = Array.from(relatedCategoryMap.entries())
             image: post.data.image
           }}
           layout="horizontal"
+          localePrefix={localePrefix}
+          locale={localeConfig.locale.dateLocale}
+          ui={ui}
         />
       ))}
     </div>
@@ -165,13 +187,13 @@ const relatedCategories = Array.from(relatedCategoryMap.entries())
     <div class="text-center py-16">
       <div class="text-6xl mb-4">📂</div>
       <h3 class="text-xl font-semibold text-slate-900 dark:text-slate-100 mb-2">
-        暂无相关文章
+        {ui.noPostsFound}
       </h3>
       <p class="text-slate-600 dark:text-slate-400 mb-6">
-        目前还没有 {categoryName} 分类的文章，请查看其他分类。
+        {ui.noPostsFound}
       </p>
-      <a href="/categories" class="btn-secondary">
-        浏览所有分类
+      <a href={`${localePrefix}/categories`} class="btn-secondary">
+        {ui.allCategories}
       </a>
     </div>
   )}
@@ -181,7 +203,7 @@ const relatedCategories = Array.from(relatedCategoryMap.entries())
     <Pagination
       currentPage={currentPage}
       totalPages={totalPages}
-      baseUrl={`/categories/${categorySlug}`}
+      baseUrl={`${localePrefix}/categories/${categorySlug}`}
     />
   )}
 
@@ -189,12 +211,12 @@ const relatedCategories = Array.from(relatedCategoryMap.entries())
   {relatedCategories.length > 0 && (
     <section class="mt-16 pt-8 border-t border-slate-200 dark:border-slate-700">
       <h2 class="text-2xl font-bold text-slate-900 dark:text-slate-100 mb-6">
-        相关分类
+        {ui.categories}
       </h2>
       <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
         {relatedCategories.map((relatedCategory) => (
           <a
-            href={`/categories/${relatedCategory.slug}`}
+            href={`${localePrefix}/categories/${relatedCategory.slug}`}
             class="group card hover:shadow-lg transform hover:-translate-y-1 transition-all duration-300"
           >
             <div class="flex items-center justify-between">
@@ -203,7 +225,7 @@ const relatedCategories = Array.from(relatedCategoryMap.entries())
                   {relatedCategory.name}
                 </h3>
                 <p class="text-sm text-slate-600 dark:text-slate-400">
-                  {relatedCategory.count} 篇文章
+                  {relatedCategory.count} {ui.posts}
                 </p>
               </div>
               <svg class="w-5 h-5 text-slate-400 group-hover:text-amber-500 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24">

package/src/pages/categories/[category].astro

@@ -35,10 +35,15 @@ const { categorySlug, categoryName } = Astro.props;
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const { removeBase } = await import('../../utils/i18n');
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取所有文章并筛选包含该分类的文章

package/src/pages/categories/index.astro

@@ -3,14 +3,18 @@ import { getCollection } from 'astro:content';
 import PageLayout from '@jet-w/astro-blog/layouts/PageLayout.astro';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
 import { defaultI18nConfig } from '../../config/i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 从文章集合动态获取所有分类

package/src/pages/posts/[...slug].astro

@@ -5,7 +5,7 @@ import SlidesLayout from '@jet-w/astro-blog/layouts/SlidesLayout.astro';
 import FloatingToc from '@jet-w/astro-blog/components/blog/FloatingToc.vue';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
 import { defaultI18nConfig } from '../../config/i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, removeBase } from '../../utils/i18n';
 
 export async function getStaticPaths() {
   const posts = await getCollection('posts');
@@ -153,10 +153,14 @@ const Content = post ? (await render(post)).Content : null;
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // Get the current slug from URL

package/src/pages/posts/index.astro

@@ -6,14 +6,18 @@ import NavigationTabs from '@jet-w/astro-blog/components/blog/NavigationTabs.vue
 import { getCollection } from 'astro:content';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
 import { defaultI18nConfig } from '../../config/i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 从新的内容目录获取文章数据

package/src/pages/posts/page/[page].astro

@@ -25,10 +25,15 @@ const currentPage = parseInt(page as string, 10);
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const { removeBase } = await import('../../../utils/i18n');
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 从新的内容目录获取文章数据

package/src/pages/search.astro

@@ -4,7 +4,7 @@ import SearchInterface from '@jet-w/astro-blog/components/ui/SearchInterface.vue
 import type { I18nConfig } from '../config/i18n';
 import { defaultI18nConfig } from '../config/i18n';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
-import { getLocaleFromPath, getLocaleConfig } from '../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, removeBase } from '../utils/i18n';
 
 export interface Props {
   i18nConfig?: I18nConfig;
@@ -12,8 +12,14 @@ export interface Props {
 
 const { i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 
-// Get current locale from URL
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale from URL (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
 

package/src/pages/slides/index.astro

@@ -3,14 +3,18 @@ import { getCollection } from 'astro:content';
 import PageLayout from '@jet-w/astro-blog/layouts/PageLayout.astro';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
 import { defaultI18nConfig } from '../../config/i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, removeBase } from '../../utils/i18n';
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取所有非草稿的 slides