#428

frontend/src/lib/help.ts

@@ -87,10 +87,10 @@ export const getHelpArticle = async (identifier: string): Promise<ArticleMeta |
 export const resolveHelpLanguage = (
     article: ArticleMeta | null | undefined,
     requestedLanguage: string,
-): string =>
+): string | null =>
     article?.languages[requestedLanguage] != null
     ? requestedLanguage
-    : article?.canonicalLanguage ?? 'ja'
+    : null
 
 
 export const getHelpEditions = async (
@@ -155,8 +155,7 @@ export const getHelpSearchEntries = async (
     language: string,
 ): Promise<HelpSearchEntry[]> => {
   const { default: search } = await import ('virtual:help/search')
-  const contentLanguage = search[language] != null ? language : 'ja'
-  return (search[contentLanguage] ?? []).map (entry => ({ ...entry, language: contentLanguage }))
+  return (search[language] ?? []).map (entry => ({ ...entry, language }))
 }
 
 
@@ -175,14 +174,13 @@ export const getHelpEditionContent = async (
 
 export const getHelpChanges = async (language: string): Promise<HelpChange[]> => {
   const { default: changes } = await import ('virtual:help/changes')
-  const contentLanguage = changes[language] != null ? language : 'ja'
-  return (changes[contentLanguage] ?? []).map (entry => ({ ...entry, language: contentLanguage }))
+  return (changes[language] ?? []).map (entry => ({ ...entry, language }))
 }
 
 
 export const getHelpTitleIndex = async (language: string): Promise<HelpTitleIndex> => {
   const { default: titles } = await import ('virtual:help/titles')
-  return titles[language] ?? titles.ja ?? { }
+  return titles[language] ?? { }
 }
 
 

frontend/src/lib/prefetchers.ts

@@ -50,6 +50,8 @@ const prefetchHelpShow: Prefetcher = async (qc, url, locale) => {
       queryFn: () => getHelpArticle (identifier),
       staleTime: Infinity })
   const language = resolveHelpLanguage (article, localeLanguage (locale))
+  if (language == null)
+    return
   const edition = url.searchParams.get ('edition') ?? article?.languages[language]?.currentEdition
   if (edition == null)
     return
@@ -84,6 +86,8 @@ const prefetchHelpDiff: Prefetcher = async (qc, url, locale) => {
       queryFn: () => getHelpArticle (identifier),
       staleTime: Infinity })
   const language = resolveHelpLanguage (article, localeLanguage (locale))
+  if (language == null)
+    return
   await qc.prefetchQuery ({
       queryKey: helpKeys.diff (identifier, language, from, to),
       queryFn: () => getHelpDiff (identifier, language, from, to),