Change redirects to use /:lang subpath

Author: jamiebuilds

-debug.html

@@ -16,4 +16,14 @@
 
   <h2>Redirects</h2>
   <pre><code>{% include_relative _redirects %}</code></pre>
+
+  <h3>Pages</h2>
+
+  {% assign urls_sorted = site.pages | map: "url" | sort %}
+
+  <ul>
+    {% for url in urls_sorted %}
+      <li><a href="{{url}}">{{url}}</a></li>
+    {% endfor %}
+  </ul>
 </div>

.ruby-version

@@ -0,0 +1 @@
+2.3.1

Gemfile

@@ -4,4 +4,4 @@ gem 'jekyll'
 gem 'jekyll-redirect-from'
 gem 'jekyll-paginate'
 gem 'crowdin-cli'
-gem 'wdm', '>= 0.1.0' if Gem.win_platform?
+gem 'wdm', '>= 0.1.0' if Gem.win_platform?

Makefile

@@ -22,14 +22,15 @@ serve-production: test-jekyll
 build-production: test-jekyll
 	@make crowdin-download
 	@JEKYLL_ENV=production jekyll build
+	@ruby ./scripts/validate-translations.rb
 
 crowdin-upload: test-crowdin
 	@crowdin-cli upload sources --auto-update -b master
 
 crowdin-download: test-crowdin
 	@crowdin-cli download -b master
-	@ruby ./scripts/normalize-frontmatter.rb
-	@ruby ./scripts/normalize-toc.rb
+	@ruby ./scripts/remove-unused-languages.rb
+	@ruby ./scripts/normalize-translations.rb
 
 ###
 # Misc stuff:

_data/languages.yml

@@ -10,6 +10,10 @@
   tag: ar
   enabled: No
   accept_languages: ["ar-sa", "ar-iq", "ar-eg", "ar-ly", "ar-dz", "ar-ma", "ar-tn", "ar-om", "ar-ye", "ar-sy", "ar-jo", "ar-lb", "ar-kw", "ar-ae", "ar-bh", "ar-qa"]
+- name: Bosanski
+  tag: bs-BA
+  enabled: No
+  accept_languages: ["bs-BA"]
 - name: Català
   tag: ca
   enabled: No

_includes/navigation.html

@@ -2,7 +2,7 @@
 
 <nav class="navbar navbar-static-top navbar-light">
   <div class="container">
-    <a {% if vars_active_language.tag == "en" %} href="{{site.baseurl}}/" {% else %} href="{{url_base}}/" {% endif %}>
+    <a href="{{url_base}}/">
       {% include svg/yarn-kitten-full.svg class="navbar-logo" %}
       <span class="sr-only">Yarn</span>
     </a>
@@ -38,7 +38,7 @@
             <div class="dropdown-menu" aria-labelledby="dropdownNavLanguage" id="dropdownNavLanguageMenu">
               {% for language in site.data.languages %}
                 {% if language.enabled %}
-                  <a href="{{site.baseurl}}/lang/{{language.tag}}/{{vars_url_relative}}"
+                  <a href="{{site.baseurl}}/{{language.tag}}/{{vars_url_relative}}"
                     class="dropdown-item{% if vars_active_language.tag == language.tag %} active{% endif %}"
                     data-lang="{{language.accept_languages[0]}}">
                     {{language.name}}

_includes/vars.html

@@ -1,15 +1,22 @@
+{% capture __vars %}
 {% assign vars_url_parts = page.url | split: "/" | shift %}
 {% assign vars_url_language = vars_url_parts[1] %}
 {% assign vars_url_relative = vars_url_parts | shift | shift | join: "/" | replace: ".html", "" %}
 {% assign vars_temp_matched_languages = site.data.languages | where: "tag", vars_url_language %}
 {% assign vars_active_language = vars_temp_matched_languages[0] %}
+
 {% unless vars_active_language %}
   {% assign vars_active_language = site.data.languages[0] %}
+  {% assign vars_production_url_base_language = "" %}
+{% else %}
+  {% assign vars_production_url_base_language = "/" | append: vars_active_language.tag %}
 {% endunless %}
+
 {% assign i18n = site.data.i18n[vars_active_language.tag] %}
 
 {% if jekyll.environment == "development" %}
   {% assign url_base = site.baseurl | append: "/lang/" | append: vars_active_language.tag %}
 {% else %}
-  {% assign url_base = site.baseurl %}
+  {% assign url_base = site.baseurl | append: vars_production_url_base_language %}
 {% endif %}
+{% endcapture %}

_layouts/default.html

@@ -58,11 +58,11 @@
           var langMenuItem = langMenuItems[i];
 
           langMenuItem.addEventListener('click', function(event) {
-            event.preventDefault();
             var target = event.currentTarget;
             var lang = target.dataset.lang;
-            document.cookie = 'nf_lang=' + lang;
-            location.reload();
+            var date = new Date();
+            date.setFullYear(date.getFullYear() + 1);
+            document.cookie = 'nf_lang=' + lang + ';path=/;expires=' + date.toUTCString();
           });
         }
       </script>

_redirects

@@ -18,53 +18,42 @@ layout: null
 /latest-rc.msi        https://github.com/yarnpkg/yarn/releases/download/v{{site.latest_rc_version}}/yarn-{{site.latest_rc_version}}.msi          302
 /latest-rc.deb        https://github.com/yarnpkg/yarn/releases/download/v{{site.latest_rc_version}}/yarn_{{site.latest_rc_version}}_all.deb      302
 /latest-rc.rpm        https://github.com/yarnpkg/yarn/releases/download/v{{site.latest_rc_version}}/yarn-{{site.latest_rc_version}}-1.noarch.rpm 302
-
 {% capture _redirects %}
 
-{% assign urls_sorted = site.pages | map: "url" | sort %}
-{% assign urls_filtered = "" | split: "," | pop %}
-
-{% for url in urls_sorted %}
-  {% assign first_nine_chars = url | slice: 0, 9 %}
-  {% if first_nine_chars == "/lang/en/" %}
-    {% assign url_stripped = url | replace: "/lang/en/", "/" %}
-    {% assign urls_filtered = urls_filtered | push: url_stripped %}
-  {% endif %}
-{% endfor %}
-
-{% assign redirects = "" | split: "," | pop %}
-
-{% assign redirects = redirects | push: "# old /en/ url redirects" %}
-
-{% for url in urls_filtered %}
-  {% capture redirect %}/en{{url}}  {{url}}  301{% endcapture %}
-  {% assign redirects = redirects | push: redirect %}
-{% endfor %}
+  {% assign urls_sorted = site.pages | map: "url" | sort %}
+  {% assign urls_filtered = "" | split: "," | pop %}
 
-{% assign redirects = redirects | push: "" %}
-{% assign redirects = redirects | push: "# language redirects" %}
-
-{% for url in urls_filtered %}
-  {% for language in site.data.languages %}
-    {% if language.enabled %}
-      {% for accept_language in language.accept_languages %}
-        {% capture redirect %}{{url}}  /lang/{{language.tag}}{{url}}  200  Language={{accept_language}}{% endcapture %}
-        {% assign redirects = redirects | push: redirect %}
-      {% endfor %}
+  {% for url in urls_sorted %}
+    {% assign first_nine_chars = url | slice: 0, 9 %}
+    {% if first_nine_chars == "/lang/en/" %}
+      {% assign url_stripped = url | replace: "/lang/en/", "/" %}
+      {% assign urls_filtered = urls_filtered | push: url_stripped %}
     {% endif %}
   {% endfor %}
-{% endfor %}
-
-{% assign redirects = redirects | push: "" %}
-{% assign redirects = redirects | push: "# default redirects" %}
 
-{% for url in urls_filtered %}
-  {% capture redirect %}{{url}}  /lang/en{{url}}  200{% endcapture %}
-  {% assign redirects = redirects | push: redirect %}
-{% endfor %}
+  {% assign redirectsBase = "" | split: "," | pop %}
+  {% assign redirectsLang = "" | split: "," | pop %}
+
+  {% for url in urls_filtered %}
+    {% for language in site.data.languages %}
+      {% if language.enabled %}
+        {% for accept_language in language.accept_languages %}
+          {% capture redirect %}{{url}}  /{{language.tag}}{{url}}  302  Language={{accept_language}}{% endcapture %}
+          {% assign redirectsBase = redirectsBase | push: redirect %}
+        {% endfor %}
+
+        {% capture redirect %}/{{language.tag}}{{url}}  /lang/{{language.tag}}{{url}}  200{% endcapture %}
+        {% assign redirectsLang = redirectsLang | push: redirect %}
+      {% endif %}
+    {% endfor %}
+  {% endfor %}
 
 {% capture newline %}
 {% endcapture %}
 
 {% endcapture %}
-{{redirects | join: newline}}
+# With Language
+{{redirectsLang | join: newline}}
+
+# Without Language
+{{redirectsBase | join: newline}}

index.html

@@ -5,6 +5,7 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="refresh" content="0;URL='lang/en/'" />
     <title></title>
   </head>
   <body>

scripts/normalize-frontmatter.rb

@@ -0,0 +1,45 @@
+puts "Normalizing toc..."
+
+# frontmatterSourceRegex = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
+# frontmatterTargetRegex = %r!\A(\* \* \*\s*\n.*?\n?)^((\* \* \*|\.\.\.)\s*$\n?)!m
+
+frontmatterSourceRegex = /^---.*?---/m
+frontmatterTargetRegex = /^\* \* \*.*?\* \* \*/m
+
+tocRegex = /\[\]\(#toc-(.*?)\)\{#toc-.*?\}/
+
+langsDir = File.join('.', 'lang')
+langs = Dir.entries(langsDir).drop(2).reject {|lang| lang == 'en' }
+
+# Build up a hashmap with all of the source front-matters
+# { relativePath => frontMatter }
+englishFiles = Dir.glob(File.join(langsDir, 'en', '**', '*.*'))
+english = {}
+englishFiles.each {|file|
+  path = file.sub(File.join(langsDir, 'en'), '')
+  contents = IO.read file
+  contents = contents.unicode_normalize
+  result = contents.match frontmatterSourceRegex
+  english[path] = result
+}
+
+langs.each {|lang|
+  files = Dir.glob(File.join(langsDir, lang, '**', '*.*'))
+
+  files.each {|file|
+    puts "- Replacing #{file}"
+
+    path = file.sub(File.join(langsDir, lang), '')
+    contents = IO.read file
+    frontmatter = english[path]
+
+    result = contents
+    result = result.unicode_normalize
+    result = result.gsub /\r\n?/, "\n"
+    result = result + "\n"
+    result = result.gsub(tocRegex, '<a class="toc" id="toc-\1" href="#toc-\1"></a>')
+    result = result.gsub(frontmatterTargetRegex) {|c| frontmatter } if frontmatter
+
+    File.write(file, result)
+  }
+}

scripts/normalize-toc.rb

@@ -0,0 +1,29 @@
+require "yaml"
+
+puts "Removing unused languages..."
+
+languagesFile = File.join('.', '_data', 'languages.yml')
+languages = YAML.load_file(languagesFile)
+
+languagesEnabledHash = {}
+languages.each {|language|
+  if language['enabled']
+    languagesEnabledHash[ language['tag'] ] = true
+  end
+}
+
+langDirectory = File.join('.', 'lang')
+
+langs = Dir.entries(langDirectory).select { |entry|
+  File.directory? File.join(langDirectory, entry) and !(entry == '.' || entry == '..')
+}
+
+langs.each {|lang|
+  if languagesEnabledHash[lang]
+    puts "- Leaving #{lang}"
+  else
+    puts "- Removing #{lang}..."
+    system "rm _data/i18n/#{lang}.yml"
+    system "rm -r lang/#{lang}"
+  end
+}

scripts/normalize-translations.rb

@@ -0,0 +1,12 @@
+puts "Validating translations..."
+
+mdFiles = Dir.glob(File.join('.', '_site', 'lang', '**', '*.md'))
+
+if mdFiles.size > 0
+  puts "Error: Found translations still in markdown"
+  puts mdFiles
+  exit 1
+else
+  puts "Valid."
+  exit 0
+end