🌎 Apply translation corrections to variable YAML values (#60720)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: heiskr

src/data-directory/lib/get-data.ts

@@ -187,7 +187,25 @@ function getDataByDir(
     if (allData && key) {
       const value = allData[key]
       if (value) {
-        return matter(value).content
+        let content = matter(value).content
+        if (dir !== englishRoot) {
+          let englishContent = content
+          try {
+            const englishData = getYamlContent(englishRoot, fullPath.join(path.sep), englishRoot)
+            if (englishData?.[key]) {
+              englishContent = matter(englishData[key]).content
+            }
+          } catch (error) {
+            if ((error as FileSystemError).code !== 'ENOENT') {
+              throw error
+            }
+          }
+          content = correctTranslatedContentStrings(content, englishContent, {
+            dottedPath,
+            code: langCode,
+          })
+        }
+        return content
       }
     } else {
       console.warn(`Unable to find variables Yaml file ${fullPath.join(path.sep)}`)

src/data-directory/tests/get-data.ts

@@ -296,3 +296,74 @@ describe('get-data on corrupt translations', () => {
     }
   })
 })
+
+describe('get-data applies corrections to translated variables', () => {
+  let dd: DataDirectory
+  const enDirBefore = languages.en.dir
+  languages.ja = Object.assign({}, languages.en, {})
+
+  beforeAll(() => {
+    dd = new DataDirectory({
+      data: {
+        variables: {
+          myproduct: {
+            name: 'GitHub',
+          },
+          phases: {
+            preview: '{% ifversion ghes < 3.16 %}beta{% else %}public preview{% endif %}',
+          },
+        },
+      },
+    })
+    languages.en.dir = dd.root
+
+    const jaTranslationsRoot = path.join(dd.root, 'translations', 'ja-JP')
+    fs.mkdirSync(jaTranslationsRoot, { recursive: true })
+    languages.ja.dir = jaTranslationsRoot
+    new DataDirectory(
+      {
+        data: {
+          variables: {
+            myproduct: {
+              // Corrupted: `data` translated to Japanese `データ`
+              name: '{% データ variables.myproduct.name %}',
+            },
+            phases: {
+              // Not corrupted — should pass through unchanged
+              preview: '{% ifversion ghes < 3.16 %}ベータ{% else %}パブリックプレビュー{% endif %}',
+            },
+          },
+        },
+      },
+      jaTranslationsRoot,
+    )
+  })
+
+  afterAll(() => {
+    dd.destroy()
+    languages.en.dir = enDirBefore
+  })
+
+  test('corrects corrupted Liquid keywords in translated variables', () => {
+    // English variable is returned as-is
+    {
+      const result = getDataByLanguage('variables.myproduct.name', 'en')
+      expect(result).toBe('GitHub')
+    }
+    // Japanese translation with corrupted `データ` → `data` gets corrected
+    {
+      const result = getDataByLanguage('variables.myproduct.name', 'ja')
+      expect(result).toBe('{% data variables.myproduct.name %}')
+    }
+  })
+
+  test('leaves valid translated variables unchanged', () => {
+    // Valid ifversion in translated variable should pass through
+    {
+      const result = getDataByLanguage('variables.phases.preview', 'ja')
+      expect(result).toBe(
+        '{% ifversion ghes < 3.16 %}ベータ{% else %}パブリックプレビュー{% endif %}',
+      )
+    }
+  })
+})