From 346e392ab00f3c1c57c96f8c602fbb2380cb473d Mon Sep 17 00:00:00 2001
From: Brian Thomas Smith <brian@smith.berlin>
Date: Fri, 2 Jun 2023 12:59:56 +0200
Subject: [PATCH 1/4] chore: Add a GlossarySidebar macro for sidebars

---
 kumascript/macros/GlossarySidebar.ejs        | 32 ++++++++++++++++++++
 kumascript/macros/ListSubpagesForSidebar.ejs |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 kumascript/macros/GlossarySidebar.ejs

diff --git a/kumascript/macros/GlossarySidebar.ejs b/kumascript/macros/GlossarySidebar.ejs
new file mode 100644
index 000000000000..8192874b94aa
--- /dev/null
+++ b/kumascript/macros/GlossarySidebar.ejs
@@ -0,0 +1,32 @@
+<%
+var locale = env.locale;
+var baseURL = '/' + locale + '/docs/Glossary';
+
+var text = mdn.localStringMap({
+  'en-US': {
+    'Glossary_home_page' : 'MDN Web Docs Glossary',
+  },
+  'es': {
+    'Glossary_home_page' : 'Glosario de MDN Web Docs',
+  },
+  'fr': {
+    'Glossary_home_page' : "Glossaire MDN Web Docs",
+  },
+  'ja': {
+    'Glossary_home_page' : 'MDN Web Docs 用語集',
+  },
+  'ko': {
+    'Glossary_home_page' : 'MDN Web Docs 용어집',
+  },
+  'ru': {
+    'Glossary_home_page' : 'Глоссарий MDN Web Docs',
+  }
+});
+
+%>
+
+<section id="Quick_links" data-macro="GlossarySidebar">
+  <ol>
+    <li><strong><a href="<%=baseURL%>"><%=text['Glossary_home_page']%></a></strong><%-await template("ListSubpagesForSidebar", ['/en-us/docs/Glossary', 1])%></li>
+  </ol>
+</section>
diff --git a/kumascript/macros/ListSubpagesForSidebar.ejs b/kumascript/macros/ListSubpagesForSidebar.ejs
index e10b60dd6a95..2b8b99e5502c 100644
--- a/kumascript/macros/ListSubpagesForSidebar.ejs
+++ b/kumascript/macros/ListSubpagesForSidebar.ejs
@@ -84,7 +84,7 @@ async function createLink(aPage) {
     if (wrapInCode) {
       linkContent = `<code>${linkContent}</code>`;
     }
-    
+
     const pageBadges = (await page.badges(aPage)).join("");
 
     const result = `<li><a href="${url}">${linkContent}</a>${pageBadges}</li>`;

From 880c89fb50d5cc88adfaa0dcd6ae7527827f910e Mon Sep 17 00:00:00 2001
From: Brian Thomas Smith <brian@smith.berlin>
Date: Fri, 2 Jun 2023 14:15:02 +0200
Subject: [PATCH 2/4] chore: changes following reviewer feedback

---
 kumascript/macros/GlossarySidebar.ejs | 38 ++++++++++++---------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/kumascript/macros/GlossarySidebar.ejs b/kumascript/macros/GlossarySidebar.ejs
index 8192874b94aa..2a7b78e913ee 100644
--- a/kumascript/macros/GlossarySidebar.ejs
+++ b/kumascript/macros/GlossarySidebar.ejs
@@ -1,32 +1,28 @@
 <%
 var locale = env.locale;
-var baseURL = '/' + locale + '/docs/Glossary';
 
-var text = mdn.localStringMap({
-  'en-US': {
-    'Glossary_home_page' : 'MDN Web Docs Glossary',
-  },
-  'es': {
-    'Glossary_home_page' : 'Glosario de MDN Web Docs',
-  },
-  'fr': {
-    'Glossary_home_page' : "Glossaire MDN Web Docs",
-  },
-  'ja': {
-    'Glossary_home_page' : 'MDN Web Docs 用語集',
-  },
-  'ko': {
-    'Glossary_home_page' : 'MDN Web Docs 용어집',
-  },
-  'ru': {
-    'Glossary_home_page' : 'Глоссарий MDN Web Docs',
+async function renderRootItem(slug) {
+  const [link, title] = await getPageLinkAndTitle(slug);
+  return `<li><a href="${link}"><strong>${title}</strong></a></li>`
+}
+
+async function getPageLinkAndTitle(slug) {
+  let link = `/${env.locale}${slug}`;
+  let page = await wiki.getPage(link);
+  if (!page.title && env.locale !== 'en-US') {
+    link = `/en-US${slug}`;
+    page = await wiki.getPage(link);
   }
-});
+  let title = page.short_title || page.title;
+  title = mdn.htmlEscape(title);
+  return [link, title];
+}
 
 %>
 
 <section id="Quick_links" data-macro="GlossarySidebar">
   <ol>
-    <li><strong><a href="<%=baseURL%>"><%=text['Glossary_home_page']%></a></strong><%-await template("ListSubpagesForSidebar", ['/en-us/docs/Glossary', 1])%></li>
+    <%- await renderRootItem("/docs/Glossary") %>
+    <%- await template("ListSubpagesForSidebar", ['/docs/Glossary', 1]) %></li>
   </ol>
 </section>

From 34b09b5bf0127968c5872553c3cde6c00ada27dc Mon Sep 17 00:00:00 2001
From: Brian Thomas Smith <brian@smith.berlin>
Date: Fri, 2 Jun 2023 14:21:27 +0200
Subject: [PATCH 3/4] chore: leftover closing li tag

---
 kumascript/macros/GlossarySidebar.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kumascript/macros/GlossarySidebar.ejs b/kumascript/macros/GlossarySidebar.ejs
index 2a7b78e913ee..42f423e584b1 100644
--- a/kumascript/macros/GlossarySidebar.ejs
+++ b/kumascript/macros/GlossarySidebar.ejs
@@ -23,6 +23,6 @@ async function getPageLinkAndTitle(slug) {
 <section id="Quick_links" data-macro="GlossarySidebar">
   <ol>
     <%- await renderRootItem("/docs/Glossary") %>
-    <%- await template("ListSubpagesForSidebar", ['/docs/Glossary', 1]) %></li>
+    <%- await template("ListSubpagesForSidebar", ['/docs/Glossary', 1]) %>
   </ol>
 </section>

From 88c8c5c9486b558fed234b26b81d3ad640835918 Mon Sep 17 00:00:00 2001
From: Claas Augner <495429+caugner@users.noreply.github.com>
Date: Sat, 3 Jun 2023 00:32:22 +0200
Subject: [PATCH 4/4] Update kumascript/macros/GlossarySidebar.ejs

---
 kumascript/macros/GlossarySidebar.ejs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kumascript/macros/GlossarySidebar.ejs b/kumascript/macros/GlossarySidebar.ejs
index 42f423e584b1..5481cb69cb7a 100644
--- a/kumascript/macros/GlossarySidebar.ejs
+++ b/kumascript/macros/GlossarySidebar.ejs
@@ -1,6 +1,4 @@
 <%
-var locale = env.locale;
-
 async function renderRootItem(slug) {
   const [link, title] = await getPageLinkAndTitle(slug);
   return `<li><a href="${link}"><strong>${title}</strong></a></li>`