Fix russian learning track errors round 2 (#55332)

Co-authored-by: Copilot <[email protected]>

Author: heiskr

src/learning-track/lib/get-link-data.js

@@ -3,6 +3,7 @@ import findPage from '#src/frame/lib/find-page.js'
 import nonEnterpriseDefaultVersion from '#src/versions/lib/non-enterprise-default-version.js'
 import removeFPTFromPath from '#src/versions/lib/remove-fpt-from-path.js'
 import { renderContent } from '#src/content-render/index.js'
+import { executeWithFallback } from '#src/languages/lib/render-with-fallback.js'
 
 // rawLinks is an array of paths: [ '/foo' ]
 // we need to convert it to an array of localized objects: [ { href: '/en/foo', title: 'Foo', intro: 'Description here' } ]
@@ -41,7 +42,13 @@ async function processLink(link, context, option) {
   const opts = { textOnly: true }
   const linkHref = link.href || link
   // Parse the link in case it includes Liquid conditionals
-  const linkPath = linkHref.includes('{') ? await renderContent(linkHref, context, opts) : linkHref
+  const linkPath = linkHref.includes('{')
+    ? await executeWithFallback(
+        context,
+        () => renderContent(linkHref, context, opts),
+        () => '', // todo get english linkHref
+      )
+    : linkHref
   // If the link was `{% ifversion ghes %}/admin/foo/bar{% endifversion %}`
   // the `context.currentVersion` was `enterprise-cloud`, the final
   // output would become '' (empty string).

src/learning-track/lib/process-learning-tracks.js

@@ -1,7 +1,7 @@
-import { renderContent } from '#src/content-render/index.js'
 import getLinkData from './get-link-data.js'
 import getApplicableVersions from '#src/versions/lib/get-applicable-versions.js'
 import { getDataByLanguage } from '#src/data-directory/lib/get-data.js'
+import { renderContent } from '#src/content-render/index.js'
 import { executeWithFallback } from '#src/languages/lib/render-with-fallback.js'
 
 const renderOpts = { textOnly: true }
@@ -18,7 +18,11 @@ export default async function processLearningTracks(rawLearningTracks, context)
   for (const rawTrackName of rawLearningTracks) {
     // Track names in frontmatter may include Liquid conditionals.
     const renderedTrackName = rawTrackName.includes('{')
-      ? await renderContent(rawTrackName, context, renderOpts)
+      ? await executeWithFallback(
+          context,
+          () => renderContent(rawTrackName, context, renderOpts),
+          () => '', // todo use english rawTrackName
+        )
       : rawTrackName
     if (!renderedTrackName) continue
 

src/learning-track/middleware/learning-track.ts

@@ -11,6 +11,7 @@ import type {
 import { getPathWithoutLanguage, getPathWithoutVersion } from '@/frame/lib/path-utils.js'
 import getLinkData from '../lib/get-link-data.js'
 import { renderContent } from '@/content-render/index.js'
+import { executeWithFallback } from '@/languages/lib/render-with-fallback.js'
 import { getDeepDataByLanguage } from '@/data-directory/lib/get-data.js'
 
 export default async function learningTrack(
@@ -87,13 +88,11 @@ export default async function learningTrack(
   const renderOpts = { textOnly: true }
   // Some translated titles are known to have broken Liquid, so we need to
   // try rendering them in English as a fallback.
-  let trackTitle = ''
-  try {
-    trackTitle = (await renderContent(track.title, req.context, renderOpts)) as string
-  } catch {
-    const englishFallbackContext = { ...req.context, currentLanguage: 'en' }
-    trackTitle = (await renderContent(track.title, englishFallbackContext, renderOpts)) as string
-  }
+  const trackTitle = await executeWithFallback(
+    req.context,
+    () => renderContent(track.title, req.context, renderOpts),
+    () => '', // todo use english track.title
+  )
 
   const currentLearningTrack: LearningTrack = { trackName, trackProduct, trackTitle }
   const guidePath = getPathWithoutLanguage(getPathWithoutVersion(req.pagePath))
@@ -179,17 +178,11 @@ async function indexOfLearningTrackGuide(
   const renderOpts = { textOnly: true }
   for (let i = 0; i < trackGuidePaths.length; i++) {
     // Learning track URLs may have Liquid conditionals.
-    let renderedGuidePath = ''
-    try {
-      renderedGuidePath = await renderContent(trackGuidePaths[i], context, renderOpts)
-    } catch {
-      const englishFallbackContext = { ...context, currentLanguage: 'en' }
-      renderedGuidePath = await renderContent(
-        trackGuidePaths[i],
-        englishFallbackContext,
-        renderOpts,
-      )
-    }
+    let renderedGuidePath = await executeWithFallback(
+      context,
+      () => renderContent(trackGuidePaths[i], context, renderOpts),
+      () => '', // todo use english trackGuidePaths[i]
+    )
 
     if (!renderedGuidePath) continue