yarnpkg
diff --git a/‎-debug.html
+3 b/‎-debug.html
+3
diff --git a/‎.gitignore
+4-68 b/‎.gitignore
+4-68
diff --git a/‎Makefile
+7-1 b/‎Makefile
+7-1
diff --git a/‎_config.yml
+1-1 b/‎_config.yml
+1-1
diff --git a/‎_includes/debug/toc.html
+3-1 b/‎_includes/debug/toc.html
+3-1
diff --git a/‎_includes/navigation.html
+4-3 b/‎_includes/navigation.html
+4-3
diff --git a/‎_includes/vars.html
+8-3 b/‎_includes/vars.html
+8-3
diff --git a/‎_layouts/default.html
+20 b/‎_layouts/default.html
+20
diff --git a/‎en/compare.html renamed to ‎_layouts/pages/compare.html b/‎en/compare.html renamed to ‎_layouts/pages/compare.html
diff --git a/‎en/docs/index.html renamed to ‎_layouts/pages/docs.html b/‎en/docs/index.html renamed to ‎_layouts/pages/docs.html
diff --git a/‎en/docs/install-ci.html renamed to ‎_layouts/pages/install-ci.html b/‎en/docs/install-ci.html renamed to ‎_layouts/pages/install-ci.html
diff --git a/‎en/docs/install.html renamed to ‎_layouts/pages/install.html b/‎en/docs/install.html renamed to ‎_layouts/pages/install.html
diff --git a/‎en/docs/nightly.html renamed to ‎_layouts/pages/nightly.html b/‎en/docs/nightly.html renamed to ‎_layouts/pages/nightly.html
diff --git a/‎en/users.html renamed to ‎_layouts/pages/users.html b/‎en/users.html renamed to ‎_layouts/pages/users.html
diff --git a/‎_redirects
+36-8 b/‎_redirects
+36-8
diff --git a/‎crowdin.yaml
+2-2 b/‎crowdin.yaml
+2-2
diff --git a/‎index.html
+11-2 b/‎index.html
+11-2
diff --git a/‎lang/en/compare.md
+3 b/‎lang/en/compare.md
+3
diff --git a/‎en/docs/_ci/appveyor.md renamed to ‎lang/en/docs/_ci/appveyor.md b/‎en/docs/_ci/appveyor.md renamed to ‎lang/en/docs/_ci/appveyor.md
diff --git a/‎en/docs/_ci/circle.md renamed to ‎lang/en/docs/_ci/circle.md b/‎en/docs/_ci/circle.md renamed to ‎lang/en/docs/_ci/circle.md
diff --git a/‎en/docs/_ci/codeship.md renamed to ‎lang/en/docs/_ci/codeship.md b/‎en/docs/_ci/codeship.md renamed to ‎lang/en/docs/_ci/codeship.md
diff --git a/‎en/docs/_ci/deb-specific-version.md renamed to ‎lang/en/docs/_ci/deb-specific-version.md b/‎en/docs/_ci/deb-specific-version.md renamed to ‎lang/en/docs/_ci/deb-specific-version.md
diff --git a/‎en/docs/_ci/semaphore.md renamed to ‎lang/en/docs/_ci/semaphore.md b/‎en/docs/_ci/semaphore.md renamed to ‎lang/en/docs/_ci/semaphore.md
diff --git a/‎en/docs/_ci/travis.md renamed to ‎lang/en/docs/_ci/travis.md b/‎en/docs/_ci/travis.md renamed to ‎lang/en/docs/_ci/travis.md
diff --git a/‎en/docs/_installations/alternatives.md renamed to ‎lang/en/docs/_installations/alternatives.md b/‎en/docs/_installations/alternatives.md renamed to ‎lang/en/docs/_installations/alternatives.md
diff --git a/‎en/docs/_installations/linux.md renamed to ‎lang/en/docs/_installations/linux.md b/‎en/docs/_installations/linux.md renamed to ‎lang/en/docs/_installations/linux.md
diff --git a/‎en/docs/_installations/mac.md renamed to ‎lang/en/docs/_installations/mac.md b/‎en/docs/_installations/mac.md renamed to ‎lang/en/docs/_installations/mac.md
diff --git a/‎en/docs/_installations/nightly.md renamed to ‎lang/en/docs/_installations/nightly.md b/‎en/docs/_installations/nightly.md renamed to ‎lang/en/docs/_installations/nightly.md
diff --git a/‎en/docs/_installations/tarball.md renamed to ‎lang/en/docs/_installations/tarball.md b/‎en/docs/_installations/tarball.md renamed to ‎lang/en/docs/_installations/tarball.md
diff --git a/‎en/docs/_installations/unix_path_setup.md renamed to ‎lang/en/docs/_installations/unix_path_setup.md b/‎en/docs/_installations/unix_path_setup.md renamed to ‎lang/en/docs/_installations/unix_path_setup.md
diff --git a/‎en/docs/_installations/windows.md renamed to ‎lang/en/docs/_installations/windows.md b/‎en/docs/_installations/windows.md renamed to ‎lang/en/docs/_installations/windows.md
diff --git a/‎en/docs/_installations/windows_path_setup.md renamed to ‎lang/en/docs/_installations/windows_path_setup.md b/‎en/docs/_installations/windows_path_setup.md renamed to ‎lang/en/docs/_installations/windows_path_setup.md
diff --git a/‎en/docs/cli/add.md renamed to ‎lang/en/docs/cli/add.md b/‎en/docs/cli/add.md renamed to ‎lang/en/docs/cli/add.md
diff --git a/‎en/docs/cli/bin.md renamed to ‎lang/en/docs/cli/bin.md b/‎en/docs/cli/bin.md renamed to ‎lang/en/docs/cli/bin.md
diff --git a/‎en/docs/cli/cache.md renamed to ‎lang/en/docs/cli/cache.md b/‎en/docs/cli/cache.md renamed to ‎lang/en/docs/cli/cache.md
diff --git a/‎en/docs/cli/check.md renamed to ‎lang/en/docs/cli/check.md b/‎en/docs/cli/check.md renamed to ‎lang/en/docs/cli/check.md
diff --git a/‎en/docs/cli/clean.md renamed to ‎lang/en/docs/cli/clean.md b/‎en/docs/cli/clean.md renamed to ‎lang/en/docs/cli/clean.md
diff --git a/‎en/docs/cli/config.md renamed to ‎lang/en/docs/cli/config.md b/‎en/docs/cli/config.md renamed to ‎lang/en/docs/cli/config.md
diff --git a/‎en/docs/cli/generate-lock-entry.md renamed to ‎lang/en/docs/cli/generate-lock-entry.md b/‎en/docs/cli/generate-lock-entry.md renamed to ‎lang/en/docs/cli/generate-lock-entry.md
diff --git a/‎en/docs/cli/global.md renamed to ‎lang/en/docs/cli/global.md b/‎en/docs/cli/global.md renamed to ‎lang/en/docs/cli/global.md
diff --git a/‎en/docs/cli/index.md renamed to ‎lang/en/docs/cli/index.md b/‎en/docs/cli/index.md renamed to ‎lang/en/docs/cli/index.md
diff --git a/‎en/docs/cli/info.md renamed to ‎lang/en/docs/cli/info.md b/‎en/docs/cli/info.md renamed to ‎lang/en/docs/cli/info.md
diff --git a/‎en/docs/cli/init.md renamed to ‎lang/en/docs/cli/init.md b/‎en/docs/cli/init.md renamed to ‎lang/en/docs/cli/init.md
diff --git a/‎en/docs/cli/install.md renamed to ‎lang/en/docs/cli/install.md b/‎en/docs/cli/install.md renamed to ‎lang/en/docs/cli/install.md
diff --git a/‎en/docs/cli/licenses.md renamed to ‎lang/en/docs/cli/licenses.md b/‎en/docs/cli/licenses.md renamed to ‎lang/en/docs/cli/licenses.md
diff --git a/‎en/docs/cli/link.md renamed to ‎lang/en/docs/cli/link.md b/‎en/docs/cli/link.md renamed to ‎lang/en/docs/cli/link.md
diff --git a/‎en/docs/cli/login.md renamed to ‎lang/en/docs/cli/login.md b/‎en/docs/cli/login.md renamed to ‎lang/en/docs/cli/login.md
diff --git a/‎en/docs/cli/logout.md renamed to ‎lang/en/docs/cli/logout.md b/‎en/docs/cli/logout.md renamed to ‎lang/en/docs/cli/logout.md
diff --git a/‎en/docs/cli/ls.md renamed to ‎lang/en/docs/cli/ls.md b/‎en/docs/cli/ls.md renamed to ‎lang/en/docs/cli/ls.md
diff --git a/‎en/docs/cli/outdated.md renamed to ‎lang/en/docs/cli/outdated.md b/‎en/docs/cli/outdated.md renamed to ‎lang/en/docs/cli/outdated.md
diff --git a/‎en/docs/cli/owner.md renamed to ‎lang/en/docs/cli/owner.md b/‎en/docs/cli/owner.md renamed to ‎lang/en/docs/cli/owner.md
diff --git a/‎en/docs/cli/pack.md renamed to ‎lang/en/docs/cli/pack.md b/‎en/docs/cli/pack.md renamed to ‎lang/en/docs/cli/pack.md
diff --git a/‎en/docs/cli/publish.md renamed to ‎lang/en/docs/cli/publish.md b/‎en/docs/cli/publish.md renamed to ‎lang/en/docs/cli/publish.md
diff --git a/‎en/docs/cli/remove.md renamed to ‎lang/en/docs/cli/remove.md b/‎en/docs/cli/remove.md renamed to ‎lang/en/docs/cli/remove.md
diff --git a/‎en/docs/cli/run.md renamed to ‎lang/en/docs/cli/run.md b/‎en/docs/cli/run.md renamed to ‎lang/en/docs/cli/run.md
diff --git a/‎en/docs/cli/self-update.md renamed to ‎lang/en/docs/cli/self-update.md b/‎en/docs/cli/self-update.md renamed to ‎lang/en/docs/cli/self-update.md
diff --git a/‎en/docs/cli/tag.md renamed to ‎lang/en/docs/cli/tag.md b/‎en/docs/cli/tag.md renamed to ‎lang/en/docs/cli/tag.md
diff --git a/‎en/docs/cli/team.md renamed to ‎lang/en/docs/cli/team.md b/‎en/docs/cli/team.md renamed to ‎lang/en/docs/cli/team.md
diff --git a/‎en/docs/cli/test.md renamed to ‎lang/en/docs/cli/test.md b/‎en/docs/cli/test.md renamed to ‎lang/en/docs/cli/test.md
diff --git a/‎en/docs/cli/unlink.md renamed to ‎lang/en/docs/cli/unlink.md b/‎en/docs/cli/unlink.md renamed to ‎lang/en/docs/cli/unlink.md
diff --git a/‎en/docs/cli/upgrade.md renamed to ‎lang/en/docs/cli/upgrade.md b/‎en/docs/cli/upgrade.md renamed to ‎lang/en/docs/cli/upgrade.md
diff --git a/‎en/docs/cli/version.md renamed to ‎lang/en/docs/cli/version.md b/‎en/docs/cli/version.md renamed to ‎lang/en/docs/cli/version.md
diff --git a/‎en/docs/cli/why.md renamed to ‎lang/en/docs/cli/why.md b/‎en/docs/cli/why.md renamed to ‎lang/en/docs/cli/why.md
diff --git a/‎en/docs/configuration.md renamed to ‎lang/en/docs/configuration.md b/‎en/docs/configuration.md renamed to ‎lang/en/docs/configuration.md
diff --git a/‎en/docs/creating-a-package.md renamed to ‎lang/en/docs/creating-a-package.md b/‎en/docs/creating-a-package.md renamed to ‎lang/en/docs/creating-a-package.md
diff --git a/‎en/docs/creating-a-project.md renamed to ‎lang/en/docs/creating-a-project.md b/‎en/docs/creating-a-project.md renamed to ‎lang/en/docs/creating-a-project.md
diff --git a/‎en/docs/dependencies.md renamed to ‎lang/en/docs/dependencies.md b/‎en/docs/dependencies.md renamed to ‎lang/en/docs/dependencies.md
diff --git a/‎en/docs/dependency-types.md renamed to ‎lang/en/docs/dependency-types.md b/‎en/docs/dependency-types.md renamed to ‎lang/en/docs/dependency-types.md
diff --git a/‎en/docs/dependency-versions.md renamed to ‎lang/en/docs/dependency-versions.md b/‎en/docs/dependency-versions.md renamed to ‎lang/en/docs/dependency-versions.md
diff --git a/‎en/docs/getting-started.md renamed to ‎lang/en/docs/getting-started.md b/‎en/docs/getting-started.md renamed to ‎lang/en/docs/getting-started.md
diff --git a/‎lang/en/docs/index.md
+3 b/‎lang/en/docs/index.md
+3
diff --git a/‎lang/en/docs/install-ci.md
+3 b/‎lang/en/docs/install-ci.md
+3
diff --git a/‎lang/en/docs/install.md
+3 b/‎lang/en/docs/install.md
+3
diff --git a/‎en/docs/installing-dependencies.md renamed to ‎lang/en/docs/installing-dependencies.md b/‎en/docs/installing-dependencies.md renamed to ‎lang/en/docs/installing-dependencies.md
diff --git a/‎en/docs/managing-dependencies.md renamed to ‎lang/en/docs/managing-dependencies.md b/‎en/docs/managing-dependencies.md renamed to ‎lang/en/docs/managing-dependencies.md
diff --git a/‎en/docs/migrating-from-npm.md renamed to ‎lang/en/docs/migrating-from-npm.md b/‎en/docs/migrating-from-npm.md renamed to ‎lang/en/docs/migrating-from-npm.md
diff --git a/‎lang/en/docs/nightly.md
+3 b/‎lang/en/docs/nightly.md
+3
diff --git a/‎en/docs/package-json.md renamed to ‎lang/en/docs/package-json.md b/‎en/docs/package-json.md renamed to ‎lang/en/docs/package-json.md
diff --git a/‎en/docs/publishing-a-package.md renamed to ‎lang/en/docs/publishing-a-package.md b/‎en/docs/publishing-a-package.md renamed to ‎lang/en/docs/publishing-a-package.md
diff --git a/‎en/docs/usage.md renamed to ‎lang/en/docs/usage.md b/‎en/docs/usage.md renamed to ‎lang/en/docs/usage.md
diff --git a/‎en/docs/version-control.md renamed to ‎lang/en/docs/version-control.md b/‎en/docs/version-control.md renamed to ‎lang/en/docs/version-control.md
diff --git a/‎en/docs/yarn-lock.md renamed to ‎lang/en/docs/yarn-lock.md b/‎en/docs/yarn-lock.md renamed to ‎lang/en/docs/yarn-lock.md
diff --git a/‎en/docs/yarn-workflow.md renamed to ‎lang/en/docs/yarn-workflow.md b/‎en/docs/yarn-workflow.md renamed to ‎lang/en/docs/yarn-workflow.md
diff --git a/‎en/index.html renamed to ‎lang/en/index.md b/‎en/index.html renamed to ‎lang/en/index.md
diff --git a/‎en/org/code-of-conduct.md renamed to ‎lang/en/org/code-of-conduct.md b/‎en/org/code-of-conduct.md renamed to ‎lang/en/org/code-of-conduct.md
diff --git a/‎en/org/contributing.md renamed to ‎lang/en/org/contributing.md b/‎en/org/contributing.md renamed to ‎lang/en/org/contributing.md
diff --git a/‎en/org/governance.md renamed to ‎lang/en/org/governance.md b/‎en/org/governance.md renamed to ‎lang/en/org/governance.md
diff --git a/‎en/org/index.md renamed to ‎lang/en/org/index.md b/‎en/org/index.md renamed to ‎lang/en/org/index.md
diff --git a/‎en/org/release-process.md renamed to ‎lang/en/org/release-process.md b/‎en/org/release-process.md renamed to ‎lang/en/org/release-process.md
diff --git a/‎en/org/translations.md renamed to ‎lang/en/org/translations.md b/‎en/org/translations.md renamed to ‎lang/en/org/translations.md
diff --git a/‎lang/en/users.md
+3 b/‎lang/en/users.md
+3
diff --git a/‎scripts/normalize-frontmatter.rb
+33 b/‎scripts/normalize-frontmatter.rb
+33
diff --git a/‎scripts/normalize-toc.rb
+16 b/‎scripts/normalize-toc.rb
+16
@@ -13,4 +13,7 @@
     {% include debug/todo.html content=page.content forceRender=true %}
     <hr>
   {% endfor %}
+
+  <h2>Redirects</h2>
+  <pre><code>{% include_relative _redirects %}</code></pre>
 </div>
@@ -4,72 +4,8 @@ _site
 .DS_Store
 .idea
 
-af/
-ar/
-ca/
-cs/
-da/
-de/
-el/
-en/
-es-ES/
-fa-IR/
-fi/
-fr/
-he/
-hu/
-id-ID/
-it/
-ja/
-ko/
-mr-IN/
-nl/
-no-NO/
-pl/
-pt-BR/
-pt-PT/
-ro/
-ru/
-sk-SK/
-sr/
-sv-SE/
-tr/
-uk/
-vi/
-zh-Hans/
-zh-Hant/
+lang/*
+!lang/en/
 
-_data/i18n/af.yml
-_data/i18n/ar.yml
-_data/i18n/ca.yml
-_data/i18n/cs.yml
-_data/i18n/da.yml
-_data/i18n/de.yml
-_data/i18n/el.yml
-_data/i18n/en.yml
-_data/i18n/es-ES.yml
-_data/i18n/fa-IR.yml
-_data/i18n/fi.yml
-_data/i18n/fr.yml
-_data/i18n/he.yml
-_data/i18n/hu.yml
-_data/i18n/id-ID.yml
-_data/i18n/it.yml
-_data/i18n/ja.yml
-_data/i18n/ko.yml
-_data/i18n/mr-IN.yml
-_data/i18n/nl.yml
-_data/i18n/no-NO.yml
-_data/i18n/pl.yml
-_data/i18n/pt-BR.yml
-_data/i18n/pt-PT.yml
-_data/i18n/ro.yml
-_data/i18n/ru.yml
-_data/i18n/sk-SK.yml
-_data/i18n/sr.yml
-_data/i18n/sv-SE.yml
-_data/i18n/tr.yml
-_data/i18n/uk.yml
-_data/i18n/vi.yml
-_data/i18n/zh-Hans.yml
-_data/i18n/zh-Hant.yml
+_data/i18n/*.yml
+!_data/i18n/en.yml
@@ -16,14 +16,20 @@ build: test-jekyll
 	@jekyll build
 
 serve-production: test-jekyll
+	@make crowdin-download
 	@JEKYLL_ENV=production jekyll serve
 
 build-production: test-jekyll
+	@make crowdin-download
 	@JEKYLL_ENV=production jekyll build
 
-crowdin-sync: test-crowdin
+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
 
 ###
 # Misc stuff:
 
@@ -64,7 +64,7 @@ redcarpet:
   extensions: [with_toc_data]
 
 # Blog Settings
-permalink: /blog/:year/:month/:day/:title
+permalink: /blog/:year/:month/:day/:title/
 paginate: 1
 
 
 
@@ -1,3 +1,5 @@
+{% include vars.html %}
+
 {% assign shouldRender = false %}
 
 {% if jekyll.environment == "development" %}
@@ -8,7 +10,7 @@
   {% assign shouldRender = true %}
 {% endif %}
 
-{% if shouldRender %}
+{% if shouldRender and vars_active_language.tag == 'en' %}
   {% assign lines = include.content | newline_to_br | strip_newlines | split: '<br />' %}
 
   {% assign insideCodeBlock = false %}
 
@@ -36,11 +36,12 @@
               {% include svg/language.svg class="navbar-icon" %}
               {{vars_active_language.name}}
             </a>
-            <div class="dropdown-menu" aria-labelledby="dropdownNavLanguage">
+            <div class="dropdown-menu" aria-labelledby="dropdownNavLanguage" id="dropdownNavLanguageMenu">
               {% for language in site.data.languages %}
                 {% if language.enabled %}
-                  <a href="{{site.baseurl}}/{{language.tag}}/{{vars_url_relative}}"
-                    class="dropdown-item{% if vars_active_language.tag == language.tag %} active{% endif %}">
+                  <a href="{{site.baseurl}}/lang/{{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}}
                   </a>
                 {% endif %}
 
@@ -1,10 +1,15 @@
 {% assign vars_url_parts = page.url | split: "/" | shift %}
-{% assign vars_url_language = vars_url_parts[0] %}
-{% assign vars_url_relative = vars_url_parts | shift | join: "/" | replace: ".html", "" %}
+{% 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] %}
 {% endunless %}
 {% assign i18n = site.data.i18n[vars_active_language.tag] %}
-{% assign url_base = site.baseurl | append: "/" | append: 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 %}
+{% endif %}
@@ -43,5 +43,25 @@
     {% for script in page.scripts %}
       <script type="text/javascript" src="{{script}}"></script>
     {% endfor %}
+
+    {% if jekyll.environment == "production" %}
+      <script>
+        // Takes over language dropdown to set cookie
+        var langMenu = document.getElementById('dropdownNavLanguageMenu');
+        var langMenuItems = langMenu.getElementsByClassName('dropdown-item');
+
+        for (var i = 0; i < langMenuItems.length; i++) {
+          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();
+          });
+        }
+      </script>
+    {% endif %}
   </body>
 </html>
@@ -19,16 +19,44 @@ layout: null
 /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
 
-/en  /  302
+{% capture _redirects %}
 
-{% for language in site.data.languages %}
-  {% if language.enabled %}
-    {% if language.tag != "en" %}
+{% 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 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 %}
-/  /{{language.tag}}  302  Language={{accept_language}}
+        {% capture redirect %}{{url}}  /lang/{{language.tag}}{{url}}  200  Language={{accept_language}}{% endcapture %}
+        {% assign redirects = redirects | push: redirect %}
       {% endfor %}
     {% endif %}
-
-/{{language.tag}}/docs/install_ci   /{{language.tag}}/docs/install-ci  302
-  {% endif %}
+  {% endfor %}
 {% endfor %}
+
+{% capture newline %}
+{% endcapture %}
+
+{% endcapture %}
+{{redirects | join: newline}}
@@ -3,8 +3,8 @@ api_key_env: CROWDIN_API_KEY
 base_path: .
 
 files:
-  - source: '/en/**/*'
-    translation: '/%locale%/**/%original_file_name%'
+  - source: '/lang/en/**/*'
+    translation: '/lang/%locale%/**/%original_file_name%'
     languages_mapping:
       locale:
         af: af
 
@@ -1,4 +1,13 @@
 ---
-layout: pages/homepage
-redirect_from: /en/
+layout: null
 ---
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+  </head>
+  <body>
+    <a href="lang/en/">Click here to see the site</a>
+  </body>
+</html>
@@ -0,0 +1,33 @@
+sourceRegex = /^---\n.*?\n---/m
+targetRegex = /^\* \* \*\n.*?\n\* \* \*/m
+
+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
+  result = contents.match sourceRegex
+  english[path] = result
+}
+
+# Go through every file in every language and replace the broken front-matter
+# with the source front-matter by relative path
+langs.each {|lang|
+  files = Dir.glob(File.join(langsDir, lang, '**', '*.*'))
+  files.each {|file|
+    path = file.sub(File.join(langsDir, lang), '')
+    contents = IO.read file
+    replacement = english[path]
+    if replacement
+      result = contents
+        .encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+        .gsub(targetRegex) {|c| replacement }
+      File.write(file, result)
+    end
+  }
+}
@@ -0,0 +1,16 @@
+sourceRegex = /\[\]\(#toc-(.*?)\)\{#toc-.*?\}/
+
+langsDir = File.join('.', 'lang')
+langs = Dir.entries(langsDir).drop(2).reject {|lang| lang == 'en' }
+
+langs.each {|lang|
+  files = Dir.glob(File.join(langsDir, lang, '**', '*.*'))
+  file = files[20]
+  files.each {|file|
+    contents = IO.read file
+    result = contents
+      .encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+      .gsub(sourceRegex, '<a class="toc" id="toc-\1" href="#toc-\1"></a>')
+    File.write(file, result)
+  }
+}