Merge pull request #110 from dungsil/fix/default-value-notworking

fix: `$has` always returns `true`
s00d · Jan 20, 2025 · 31badd7 · 31badd7
2 parents 2ea2029 + 2af97f1
commit 31badd7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/runtime/plugins/01.plugin.ts b/src/runtime/plugins/01.plugin.ts
@@ -146,7 +146,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       const selectedRoute = route ?? routeService.getCurrentRoute()
       return routeService.getRouteName(selectedRoute, selectedLocale)
     },
-    t: (key: string, params?: Params, defaultValue?: string): Translation => {
+    t: (key: string, params?: Params, defaultValue?: string | null): Translation => {
       if (!key) return ''
       const route = routeService.getCurrentRoute()
       const locale = routeService.getCurrentLocale()
@@ -157,7 +157,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         if (isDev && import.meta.client) {
           console.warn(`Not found '${key}' key in '${locale}' locale messages.`)
         }
-        value = defaultValue || key
+        value = defaultValue === undefined ? key : defaultValue
       }
 
       return typeof value === 'string' && params ? interpolate(value, params) : value
@@ -185,7 +185,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       return translationService.formatRelativeTime(value, currentLocale, options)
     },
     has: (key: string): boolean => {
-      return !!provideData.t(key)
+      return !!provideData.t(key, {}, null)
     },
     mergeTranslations: (newTranslations: Translations) => {
       const route = routeService.getCurrentRoute()