fix: better default fallback

nuxt · Dec 14, 2022 · 0a7b13a · 0a7b13a
1 parent 5f9d5b5
commit 0a7b13a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/runtime/composables/navigation.ts b/src/runtime/composables/navigation.ts
@@ -15,9 +15,10 @@ export const fetchContentNavigation = async (queryBuilder?: QueryBuilder | Query
   // - query doesn't already have a locale filter
   if (content.locales.length) {
     const queryLocale = params.where?.find(w => w._locale)?._locale
-    const locale = queryLocale || content.defaultLocale
-    params.where = params.where || []
-    params.where.push({ _locale: locale })
+    if (!queryLocale) {
+      params.where = params.where || []
+      params.where.push({ _locale: content.defaultLocale })
+    }
   }
 
   const _apiPath = params ? `/navigation/${hash(params)}` : '/navigation/'

diff --git a/src/runtime/composables/query.ts b/src/runtime/composables/query.ts
@@ -30,8 +30,9 @@ export const createQueryFetch = <T = ParsedContent>(path?: string) => async (que
   // - query doesn't already have a locale filter
   if (content.locales.length) {
     const queryLocale = query.params().where?.find(w => w._locale)?._locale
-    const locale = queryLocale || content.defaultLocale
-    query.locale(locale)
+    if (!queryLocale) {
+      query.locale(content.defaultLocale)
+    }
   }
 
   const params = query.params()

diff --git a/src/runtime/server/storage.ts b/src/runtime/server/storage.ts
@@ -204,8 +204,9 @@ export const createServerQueryFetch = <T = ParsedContent>(event: H3Event, path?:
   // - query doesn't already have a locale filter
   if (contentConfig.locales.length) {
     const queryLocale = query.params().where?.find(w => w._locale)?._locale
-    const locale = queryLocale || contentConfig.defaultLocale
-    query.locale(locale)
+    if (!queryLocale) {
+      query.locale(contentConfig.defaultLocale)
+    }
   }
 
   return createPipelineFetcher<T>(() => getIndexedContentsList<T>(event, query))(query)