Merge pull request #33542 from github/repo-sync

Repo sync

Author: docs-bot

.github/workflows/move-ready-to-merge-pr.yaml

@@ -30,8 +30,13 @@ jobs:
           column: Triage
           repo-token: ${{ secrets.DOCS_BOT_PAT_WORKFLOW_READORG }}
 
+      - name: Check out repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - uses: ./.github/actions/node-npm-setup
+
       - name: remove label
-        uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90
+        uses: ./.github/actions/labeler
         with:
-          ignore-if-assigned: 'false'
-          remove-labels: 'waiting for review'
+          ignoreifAssigned: 'false'
+          removeLabels: 'waiting for review'

src/languages/lib/correct-translation-content.js

@@ -22,6 +22,12 @@ export function correctTranslatedContentStrings(content, englishContent, context
   content = content.replaceAll('[ "AUTOTITLE](', '[AUTOTITLE](')
   content = content.replaceAll('[«AUTOTITLE»](', '[AUTOTITLE](')
 
+  // We've seen a lot of these across different languages.
+  content = content.replaceAll('{{% octicon', '{% octicon')
+  content = content.replaceAll('{{%octicon', '{% octicon')
+  content = content.replaceAll('{{% endif %}', '{% endif %}')
+  content = content.replaceAll('{{%endif %}', '{% endif %}')
+
   // For a short while we injected `replacedomain` into code snippets
   // to activate the Domain Edit functionality. That was in `main` for a
   // while and was later removed in English. But during that window of
@@ -323,5 +329,15 @@ export function correctTranslatedContentStrings(content, englishContent, context
       content = content.replace(keyString, '[redacted in translation]')
     }
   }
+
+  if (content.includes('{{%')) {
+    content.split('\n').forEach((line, i) => {
+      if (line.includes('{{%') && !line.includes('{{{% endraw')) {
+        console.log(context.code, 'context.relativePath', context.relativePath)
+        console.log(i, line)
+      }
+    })
+  }
+
   return content
 }