valaxy-theme-press 0.25.0 → 0.25.2

package/components/PressArticle.vue

@@ -1,8 +1,7 @@
 <script setup lang="ts">
-import { tObject, useFrontmatter, useSiteStore } from 'valaxy'
+import { useFrontmatter, useSiteStore, useValaxyI18n } from 'valaxy'
 import { computed } from 'vue'
 
-import { useI18n } from 'vue-i18n'
 import { useRoute } from 'vue-router'
 
 const frontmatter = useFrontmatter()
@@ -17,8 +16,8 @@ function findCurrentIndex() {
 const nextPost = computed(() => site.postList[findCurrentIndex() - 1])
 const prevPost = computed(() => site.postList[findCurrentIndex() + 1])
 
-const { locale } = useI18n()
-const $title = computed(() => tObject(frontmatter.value.title || '', locale.value))
+const { $tO } = useValaxyI18n()
+const $title = computed(() => $tO(frontmatter.value.title))
 </script>
 
 <template>
@@ -70,7 +69,7 @@ const $title = computed(() => tObject(frontmatter.value.title || '', locale.valu
           </h2>
           <div class="link">
             <RouterLink :to="nextPost.href">
-              {{ tObject(nextPost.title || '', locale) }}
+              {{ $tO(nextPost.title) }}
             </RouterLink>
           </div>
         </div>
@@ -80,7 +79,7 @@ const $title = computed(() => tObject(frontmatter.value.title || '', locale.valu
           </h2>
           <div class="link">
             <RouterLink :to="prevPost.href">
-              {{ tObject(prevPost.title || '', locale) }}
+              {{ $tO(prevPost.title) }}
             </RouterLink>
           </div>
         </div>

package/components/PressArticleCard.vue

@@ -1,13 +1,12 @@
 <script lang="ts" setup>
 import type { Post } from 'valaxy'
-import { tObject } from 'valaxy'
-import { useI18n } from 'vue-i18n'
+import { useValaxyI18n } from 'valaxy'
 
 defineProps<{
   post: Post
 }>()
 
-const { locale } = useI18n()
+const { $tO } = useValaxyI18n()
 </script>
 
 <template>
@@ -17,7 +16,7 @@ const { locale } = useI18n()
       <div class="space-y-6">
         <h2 class="text-2xl leading-8 font-bold tracking-tight">
           <RouterLink class="text-gray-900" :to="post.path || ''">
-            {{ tObject(post.title || '', locale) }}
+            {{ $tO(post.title) }}
           </RouterLink>
         </h2>
         <div

package/components/PressCategory.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { Category, Post } from 'valaxy'
-import { isCategoryList, tObject } from 'valaxy'
+import type { Category } from 'valaxy'
+import { isCategoryList, useValaxyI18n } from 'valaxy'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
@@ -19,12 +19,8 @@ const props = withDefaults(defineProps<{
 })
 
 const collapsable = ref(props.collapsable)
-const { t, locale } = useI18n()
-
-function getTitle(post: Post | any) {
-  const lang = locale.value
-  return tObject(post.title || '', lang)
-}
+const { t } = useI18n()
+const { $tO } = useValaxyI18n()
 </script>
 
 <template>
@@ -58,7 +54,7 @@ function getTitle(post: Post | any) {
           v-if="categoryItem.title" :to="categoryItem.path || ''"
           class="inline-flex items-center"
         >
-          <span class="text ml-1" text="sm">{{ getTitle(categoryItem) }}</span>
+          <span class="text ml-1" text="sm">{{ $tO(categoryItem.title) }}</span>
         </RouterLink>
       </template>
 

package/components/ValaxyMain.vue

@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import type { PageData, Post } from 'valaxy'
-import { onClickHref, onContentUpdated, scrollTo, tObject, useFrontmatter, useLayout, useSidebar, useSiteConfig } from 'valaxy'
+import { onClickHref, onContentUpdated, scrollTo, useFrontmatter, useLayout, useSidebar, useSiteConfig, useValaxyI18n } from 'valaxy'
 import { computed, nextTick } from 'vue'
-import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 import { targetPadding } from '../client'
 
@@ -18,8 +17,8 @@ const { hasSidebar } = useSidebar()
 const isHome = useLayout('home')
 const layout = useLayout()
 
-const { locale } = useI18n()
-const $title = computed(() => tObject(frontmatter.value.title || '', locale.value))
+const { $tO } = useValaxyI18n()
+const $title = computed(() => $tO(frontmatter.value.title))
 
 const route = useRoute()
 const router = useRouter()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-press",
-  "version": "0.25.0",
+  "version": "0.25.2",
   "description": "Docs Theme for Valaxy",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -26,6 +26,6 @@
     "@docsearch/js": "^3.9.0"
   },
   "devDependencies": {
-    "valaxy": "0.25.0"
+    "valaxy": "0.25.2"
   }
 }

package/setup/main.ts

@@ -6,9 +6,11 @@ import 'valaxy/client/styles/common/index.scss'
 import 'vitepress/dist/client/theme-default/styles/vars.css'
 import 'vitepress/dist/client/theme-default/styles/icons.css'
 
+// with custom block title
+import 'valaxy/client/styles/components/custom-block.scss'
 // import 'vitepress/dist/client/theme-default/styles/base.css'
 // import 'vitepress/dist/client/theme-default/styles/utils.css'
-import 'vitepress/dist/client/theme-default/styles/components/custom-block.css'
+// import 'vitepress/dist/client/theme-default/styles/components/custom-block.css'
 import 'vitepress/dist/client/theme-default/styles/components/vp-code.css'
 import 'vitepress/dist/client/theme-default/styles/components/vp-code-group.css'
 import 'vitepress/dist/client/theme-default/styles/components/vp-doc.css'