Switch to Commonmark rendering pipeline (#41003)

Co-authored-by: Rachael Sewell <[email protected]>
mkfarmsllcinfo · Sep 21, 2023 · 8da93a4 · 8da93a4
1 parent 3deae0f
commit 8da93a4
Show file tree

Hide file tree

Showing 8 changed files with 269 additions and 282 deletions.
diff --git a/components/page-footer/Contribution.tsx b/components/page-footer/Contribution.tsx
@@ -20,12 +20,7 @@ export const Contribution = () => {
         {t`button`}
       </a>
       <p className="color-fg-muted f6 mt-2">
-        <a
-          className="text-underline"
-          href="/contributing"
-          target="_blank"
-          rel="noopener"
-        >
+        <a className="text-underline" href="/contributing" target="_blank" rel="noopener">
           {t`to_guidelines`}
         </a>
       </p>

diff --git a/...github-enterprise-server-instance/installing-github-enterprise-server-on-aws.md b/...github-enterprise-server-instance/installing-github-enterprise-server-on-aws.md
@@ -99,6 +99,7 @@ If you're setting up your AMI for the first time, you will need to create a secu
    This table identifies what each port is used for.
 
    {% data reusables.enterprise_installation.necessary_ports %}
+
 ## Creating the {% data variables.product.prodname_ghe_server %} instance
 
 To create the instance, you'll need to launch an EC2 instance with your {% data variables.product.prodname_ghe_server %} AMI and attach an additional storage volume for your instance data. For more information, see "[Hardware considerations](#hardware-considerations)."

diff --git a/lib/correct-translation-content.js b/lib/correct-translation-content.js
@@ -18,6 +18,33 @@ export function correctTranslatedContentStrings(content, englishContent, context
   content = content.replaceAll('[AUTOTITLE"을]', '[AUTOTITLE]')
   content = content.replaceAll('["AUTOTITLE]', '"[AUTOTITLE]')
   content = content.replaceAll('[AUTOTITLE"을 참조하세요.](', '[AUTOTITLE](')
+  content = content.replaceAll('[ AUTOTITLE](', '[AUTOTITLE](')
+  content = content.replaceAll('[ "AUTOTITLE](', '[AUTOTITLE](')
+
+  if (context.code === 'ru') {
+    // We've seen a lot of these in the Russian translations:
+    content = content.replaceAll('{% данных variables', '{% data variables')
+
+    // For the rather custom Russian translation of
+    // the content/get-started/quickstart/github-glossary.md page
+    // These string replacements speak for themselves.
+    content = content.replaceAll(
+      '{% для глоссария в глоссариях %}',
+      '{% for glossary in glossaries %}',
+    )
+    content = content.replaceAll('{{ глоссарий.term }}', '{{ glossary.term }}')
+    content = content.replaceAll('{{ глоссарий.description }}', '{{ glossary.description }}')
+  }
+
+  if (context.code === 'ko') {
+    // For the rather custom Korean translation of github-glossary.md
+    // Let's try to salvage based on what's in
+    // docs-internal.ko-kr/content/get-started/quickstart/github-glossary.md
+    // as of September 2023.
+    content = content.replaceAll('용어집 %}의 용어집에 대한 {%', '{% for glossary in glossaries %}')
+    content = content.replaceAll('{{ 용어집.term }}', '{{ glossary.term }}')
+    content = content.replaceAll('{{ 용어집.description }}', '{{ glossary.description }}')
+  }
 
   // A lot of Liquid tags lose their linebreak after the `}` which can
   // result in formatting problems, especially around Markdown tables.

diff --git a/middleware/contextualizers/glossaries.js b/middleware/contextualizers/glossaries.js
@@ -46,6 +46,7 @@ export default async function glossaries(req, res, next) {
             // in this mapping we often don't have an English equivalent.
             // So that's why we fall back on the empty string.
             enGlossaryMap.get(glossary.term) || '',
+            { code: req.context.currentLanguage },
           )
         }
         description = await executeWithFallback(