Remove _includes/langs, use anchors in YAML instead

_includes/content/fourteen_eyes.md

@@ -1,13 +1,13 @@
 {% include section_config section=include.section lang=include.lang %}
 
-<h1 id="ukusa" class="anchor"><a href="#ukusa"><i class="fas fa-link anchor-icon"></i></a> {{ title }} </h1>
+<h1 id="ukusa" class="anchor"><a href="#ukusa"><i class="fas fa-link anchor-icon"></i></a> {{ lang.title }} </h1>
 <img src="/assets/img/layout/UKUSA.png" class="img-fluid float-right" alt="UKUSA Agreement" style="margin-left:10px;">
-{{ description }}
+{{ lang.description }}
 
 <!-- chart -->
 <div class="row mb-3">
   {% include components/panel.html color="danger"
-  title=five_eyes
+  title=lang.five_eyes
   list='
   - Australia <div class="float-right"><span class="flag-icon flag-icon-au"></span></div>
   - Canada <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div>
@@ -18,7 +18,7 @@
   %}
 
   {% include components/panel.html color="warning"
-  title=nine_eyes
+  title=lang.nine_eyes
   list='
   - Denmark <div class="float-right"><span class="flag-icon flag-icon-dk"></span></div>
   - France <div class="float-right"><span class="flag-icon flag-icon-fr"></span></div>
@@ -28,7 +28,7 @@
   %}
 
   {% include components/panel.html color="secondary"
-  title=fourteen_eyes
+  title=lang.fourteen_eyes
   list='
   - Belgium <div class="float-right"><span class="flag-icon flag-icon-be"></span></div>
   - Germany <div class="float-right"><span class="flag-icon flag-icon-de"></span></div>

_includes/content/key_disclosure_law.md

@@ -1,15 +1,15 @@
 {% include section_config section=include.section lang=include.lang %}
 
-<h1 id="kdl" class="anchor"><a href="#kdl"><i class="fas fa-link anchor-icon"></i></a> {{ title }}</h1>
-### {{ subheading }}
+<h1 id="kdl" class="anchor"><a href="#kdl"><i class="fas fa-link anchor-icon"></i></a> {{ lang.title }}</h1>
+### {{ lang.subheading }}
 
-{{ description }}
+{{ lang.description }}
 
 <!-- Chart of key disclosure law in some countries -->
 <div class="row mb-2">
 
   {% include components/panel.html color="danger"
-  title=apply
+  title=lang.apply
   list='
  - [Antigua and Barbuda](https://en.wikipedia.org/wiki/Key_disclosure_law#Antigua_and_Barbuda) <div class="float-right"><span class="flag-icon flag-icon-ag"></span></div>
  - [Australia](https://en.wikipedia.org/wiki/Key_disclosure_law#Australia) <div class="float-right"><span class="flag-icon flag-icon-au"></span></div>
@@ -25,7 +25,7 @@
   %}
 
   {% include components/panel.html color="warning"
-  title=may_apply
+  title=lang.may_apply
   list='
  - [Belgium *](https://en.wikipedia.org/wiki/Key_disclosure_law#Belgium) <div class="float-right"><span class="flag-icon flag-icon-be"></span></div>
  - [Finland *](https://en.wikipedia.org/wiki/Key_disclosure_law#Finland) <div class="float-right"><span class="flag-icon flag-icon-fi"></span></div>
@@ -36,7 +36,7 @@
   %}
 
   {% include components/panel.html color="success"
-  title=dont_apply
+  title=lang.dont_apply
   list='
  - [Czech Republic](https://en.wikipedia.org/wiki/Key_disclosure_law#Czech_Republic) <div class="float-right"><span class="flag-icon flag-icon-cz"></span></div>
  - [Germany](https://en.wikipedia.org/wiki/Key_disclosure_law#Germany) <div class="float-right"><span class="flag-icon flag-icon-de"></span></div>
@@ -47,9 +47,9 @@
 
 </div>
 
-\* ({{ footnote }})
+\* ({{ lang.footnote }})
 
-### {{ related_information }}
+### {{ general.related_information }}
 - <a href="https://en.wikipedia.org/wiki/Key_disclosure_law">Wikipedia page on key disclosure law</a>
 - <a href="https://law.stackexchange.com/questions/1523/can-a-us-citizen-be-required-to-provide-the-authentication-key-for-encrypted-dat">law.stackexchange.com question about key disclosure law in US</a>
 - <a href="https://www.youtube.com/watch?v=Jt7D4AIfqlQ">DEFCON 20: Crypto and the Cops: the Law of Key Disclosure and Forced Decryption</a>

_includes/content/nothing_to_hide.md

@@ -1,17 +1,17 @@
 {% include section_config section=include.section lang=include.lang %}
 
 <div class="page-header">
-  <h1>{{ title }}</h1>
+  <h1>{{ lang.title }}</h1>
 </div>
 <blockquote class="blockquote">
   <p>
-  <a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - {{ talk_name }} - TED Talk"><img src="/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg" class="img-fluid float-right ml-2" alt="Glenn Greenwald: {{ talk_name }}"></a>
-    {{ quote }}
+  <a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - {{ lang.talk_name }} - TED Talk"><img src="/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg" class="img-fluid float-right ml-2" alt="Glenn Greenwald: {{ lang.talk_name }}"></a>
+    {{ lang.quote }}
   </p>
-  <footer class="blockquote-footer">Glenn Greenwald in <cite title="{{ talk_name }} - TED Talk"><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters">{{ talk_name }} - TED Talk</a></cite></footer>
+  <footer class="blockquote-footer">Glenn Greenwald in <cite title="{{ lang.talk_name }} - TED Talk"><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters">{{ lang.talk_name }} - TED Talk</a></cite></footer>
 </blockquote>
 
-#### {{ read_also }}:
+#### {{ general.read_also }}:
 
 - [Nothing to hide argument (Wikipedia)](https://en.wikipedia.org/wiki/Nothing_to_hide_argument)
 - [How do you counter the "I have nothing to hide?" argument? (reddit.com)](https://www.reddit.com/r/privacy/comments/3hynvp/how_do_you_counter_the_i_have_nothing_to_hide/)

_includes/content/usa.md

@@ -1,12 +1,12 @@
 {% include section_config section=include.section lang=include.lang %}
 
-<h3 id="usa" class="anchor">{{ title }}</h3>
+<h3 id="usa" class="anchor">{{ lang.title }}</h3>
 
 <img src="/assets/img/layout/USA.png" class="img-fluid float-right" alt="USA" style="margin-left:10px;">
 
-{{ description }}
+{{ lang.description }}
 
-### {{ related_information }}
+### {{ general.related_information }}
 
 - [Avoid all US and UK based services](https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus)
 - [Proof that warrant canaries work based on the surespot example.](https://en.wikipedia.org/wiki/Surespot#History)

_includes/index.html

@@ -1,11 +1,11 @@
-{% include langs/_general lang=include.lang %}
+{% assign lang = site.data.lang.general.[include.lang] %}
 
 <div class="container" role="main">
 
   <div class="jumbotron p-5">
     <!-- header just below the navigation bar -->
     <h1 class="display-4"><a href="https://www.privacytools.io/" title="privacytools.io"><img src="/assets/img/layout/logo.png" class="img-fluid" alt="privacytools.io"></a></h1>
-    <p class="lead">{{ site_subheading }}</p>
+    <p class="lead">{{ lang.site_subheading }}</p>
     <!-- end header just below the navigation bar -->
   </div>
 

_includes/lang

@@ -1,4 +0,0 @@
-{% assign lang = site.data.lang.[include.lang].[include.for] %}
-{% assign en = site.data.lang.en.[include.for] %}
-
-{% include langs/{{include.for}} lang=lang en=en %}

_includes/langs/_general

@@ -1,6 +0,0 @@
-{% assign language = site.data.lang.[include.lang].general %}
-{% assign english = site.data.lang.en.general %}
-
-{% assign subheading = language.subheading | default: english.subheading %}
-{% assign read_also = language['Read also'] | default: english['Read also'] %}
-{% assign related_information = language['Related Information'] | default: english['Related Information'] %}

_includes/langs/fourteen_eyes

@@ -1,5 +0,0 @@
-{% assign title = include.lang.title | default: include.en.title %}
-{% assign description = include.lang.description | default: include.en.description %}
-{% assign five_eyes = include.lang.five_eyes | default: include.en.five_eyes %}
-{% assign nine_eyes = include.lang.nine_eyes | default: include.en.nine_eyes %}
-{% assign fourteen_eyes = include.lang.fourteen_eyes | default: include.en.fourteen_eyes %}

_includes/langs/key_disclosure_law

@@ -1,7 +0,0 @@
-{% assign title = include.lang.title | default: include.en.title %}
-{% assign subheading = include.lang.subheading | default: include.en.subheading %}
-{% assign description = include.lang.description | default: include.en.description %}
-{% assign apply = include.lang.apply | default: include.en.apply %}
-{% assign may_apply = include.lang.may_apply | default: include.en.may_apply %}
-{% assign dont_apply = include.lang.dont_apply | default: include.en.dont_apply %}
-{% assign footnote = include.lang.footnote | default: include.en.footnote %}

_includes/langs/nothing_to_hide

@@ -1,3 +0,0 @@
-{% assign title = include.lang.title | default: include.en.title %}
-{% assign quote = include.lang.quote | default: include.en.quote %}
-{% assign talk_name = include.lang.talk_name | default: include.en.talk_name %}

_includes/langs/usa

@@ -1 +0,0 @@
-{% assign title = include.lang.title | default: include.en.title %}

_includes/section_config

@@ -1,4 +1,2 @@
-{% assign lang = site.data.lang.[include.lang].[include.section] %}
-{% assign en = site.data.lang.en.[include.section] %}
-{% include langs/_general lang=include.lang %}
-{% include langs/{{include.section}} lang=lang en=en %}
+{% assign lang = site.data.lang.[include.section].[include.lang] %}
+{% assign general = site.data.lang.general.[include.lang] %}