From d41d02404c152d6ab189b3825c47fc852b976670 Mon Sep 17 00:00:00 2001
From: Pomax <pomax@nihongoresources.com>
Date: Wed, 5 Aug 2020 21:57:16 -0700
Subject: [PATCH] base url resolution

---
 index.html                            | 12 +++++++++---
 index.template.html                   |  7 +++++--
 ja-JP/index.html                      | 14 ++++++++++----
 tools/build/generate-lang-switcher.js | 14 +++-----------
 zh-CN/index.html                      | 14 ++++++++++----
 5 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/index.html b/index.html
index 8432e508..e0a24d78 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,12 @@
     <title>A Primer on Bézier Curves</title>
     <link rel="shortcut icon" href="favicon.png" type="image/png" />
 
+    <!-- And a slew of SEO related meta elements, because being discoverable is important -->
+    <meta
+      name="description"
+      content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them."
+    />
+
     <!-- opengraph information -->
     <meta property="og:title" content="A Primer on Bézier Curves" />
     <meta
@@ -40,7 +46,7 @@
       content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them."
     />
 
-    <!-- my own referral/page hit tracker -->
+    <!-- my own referral/page hit tracker, because Google knows enough -->
     <script src="./lib/site/referrer.js" type="module" async></script>
 
     <!-- the part that makes interactive graphics work: an HTML5 <graphics-element> custom element -->
@@ -66,8 +72,8 @@
       <span>Read this in your own language:</span>
       <ul>
         <li><a href="./index.html">English</a></li>
-        <li><a href="ja-JP/index.html">日本語</a></li>
-        <li><a href="zh-CN/index.html">中文</a></li>
+        <li><a href="./ja-JP/index.html">日本語</a></li>
+        <li><a href="./zh-CN/index.html">中文</a></li>
       </ul>
       <span
         >Don't see your language listed?
diff --git a/index.template.html b/index.template.html
index c470ee51..066147f6 100644
--- a/index.template.html
+++ b/index.template.html
@@ -10,6 +10,9 @@
 
   {{ base }}
 
+  <!-- And a slew of SEO related meta elements, because being discoverable is important -->
+  <meta name="description" content="{{ description }}">
+
   <!-- opengraph information -->
   <meta property="og:title" content="{{ title }}">
   <meta property="og:image" content="https://pomax.github.io/bezierinfo/images/og-image.png">
@@ -25,13 +28,13 @@
 
   <!-- twitter card information -->
   <meta name="twitter:card" content="summary">
-  <meta name="twitter:site" content="@TheRealPomax" />
+  <meta name="twitter:site" content="@TheRealPomax">
   <meta name="twitter:creator" content="@TheRealPomax">
   <meta name="twitter:image" content="https://pomax.github.io/bezierinfo/images/og-image.png">
   <meta name="twitter:url" content="https://pomax.github.io/bezierinfo">
   <meta name="twitter:description" content="{{ description }}">
 
-  <!-- my own referral/page hit tracker -->
+  <!-- my own referral/page hit tracker, because Google knows enough -->
   <script src="./lib/site/referrer.js" type="module" async></script>
 
   <!-- the part that makes interactive graphics work: an HTML5 <graphics-element> custom element -->
diff --git a/ja-JP/index.html b/ja-JP/index.html
index 7bb0b8dc..9b17ac76 100644
--- a/ja-JP/index.html
+++ b/ja-JP/index.html
@@ -9,6 +9,12 @@
 
     <base href=".." />
 
+    <!-- And a slew of SEO related meta elements, because being discoverable is important -->
+    <meta
+      name="description"
+      content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them."
+    />
+
     <!-- opengraph information -->
     <meta property="og:title" content="A Primer on Bézier Curves" />
     <meta
@@ -42,7 +48,7 @@
       content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them."
     />
 
-    <!-- my own referral/page hit tracker -->
+    <!-- my own referral/page hit tracker, because Google knows enough -->
     <script src="./lib/site/referrer.js" type="module" async></script>
 
     <!-- the part that makes interactive graphics work: an HTML5 <graphics-element> custom element -->
@@ -67,9 +73,9 @@
       </h2>
       <span>Read this in your own language:</span>
       <ul>
-        <li><a href="../index.html">English</a></li>
-        <li><a href="../ja-JP/index.html">日本語</a></li>
-        <li><a href="../zh-CN/index.html">中文</a></li>
+        <li><a href="./index.html">English</a></li>
+        <li><a href="./ja-JP/index.html">日本語</a></li>
+        <li><a href="./zh-CN/index.html">中文</a></li>
       </ul>
       <span
         >Don't see your language listed?
diff --git a/tools/build/generate-lang-switcher.js b/tools/build/generate-lang-switcher.js
index 9d72f7f1..4b3ad2ee 100644
--- a/tools/build/generate-lang-switcher.js
+++ b/tools/build/generate-lang-switcher.js
@@ -6,18 +6,10 @@ export default function generateLangSwitcher(currentLocale, allLocales) {
   return allLocales
     .map((locale) => {
       let link;
-      if (currentLocale === defaultLocale) {
-        if (locale === defaultLocale) {
-          link = `./index.html`;
-        } else {
-          link = `${locale}/index.html`;
-        }
+      if (locale === defaultLocale) {
+        link = `./index.html`;
       } else {
-        if (locale === defaultLocale) {
-          link = `../index.html`;
-        } else {
-          link = `../${locale}/index.html`;
-        }
+        link = `./${locale}/index.html`;
       }
       return `<li><a href="${link}">${localeStrings.localeName[locale]}</a></li>`;
     })
diff --git a/zh-CN/index.html b/zh-CN/index.html
index c66c9c7e..418e2054 100644
--- a/zh-CN/index.html
+++ b/zh-CN/index.html
@@ -9,6 +9,12 @@
 
     <base href=".." />
 
+    <!-- And a slew of SEO related meta elements, because being discoverable is important -->
+    <meta
+      name="description"
+      content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them."
+    />
+
     <!-- opengraph information -->
     <meta property="og:title" content="A Primer on Bézier Curves" />
     <meta
@@ -42,7 +48,7 @@
       content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them."
     />
 
-    <!-- my own referral/page hit tracker -->
+    <!-- my own referral/page hit tracker, because Google knows enough -->
     <script src="./lib/site/referrer.js" type="module" async></script>
 
     <!-- the part that makes interactive graphics work: an HTML5 <graphics-element> custom element -->
@@ -67,9 +73,9 @@
       </h2>
       <span>Read this in your own language:</span>
       <ul>
-        <li><a href="../index.html">English</a></li>
-        <li><a href="../ja-JP/index.html">日本語</a></li>
-        <li><a href="../zh-CN/index.html">中文</a></li>
+        <li><a href="./index.html">English</a></li>
+        <li><a href="./ja-JP/index.html">日本語</a></li>
+        <li><a href="./zh-CN/index.html">中文</a></li>
       </ul>
       <span
         >Don't see your language listed?