From fb69c5ae2a4f6114f5fc6a448c5f1d429a81f1ac Mon Sep 17 00:00:00 2001
From: Samuel Shifterovich <samuel.shifterovich@protonmail.com>
Date: Mon, 24 Dec 2018 11:53:14 +0100
Subject: [PATCH] Remove _includes/langs, use anchors in YAML instead

---
 _data/lang/en/fourteen_eyes.yml         |  8 --------
 _data/lang/en/general.yml               |  9 ---------
 _data/lang/en/key_disclosure_law.yml    | 11 -----------
 _data/lang/en/usa.yml                   | 10 ----------
 _data/lang/fourteen_eyes.yml            | 12 ++++++++++++
 _data/lang/general.yml                  | 18 ++++++++++++++++++
 _data/lang/it/general.yml               |  7 -------
 _data/lang/it/nothing_to_hide.yml       |  5 -----
 _data/lang/key_disclosure_law.yml       | 18 ++++++++++++++++++
 _data/lang/{en => }/nothing_to_hide.yml | 13 ++++++++++---
 _data/lang/usa.yml                      | 14 ++++++++++++++
 _includes/content/fourteen_eyes.md      | 10 +++++-----
 _includes/content/key_disclosure_law.md | 16 ++++++++--------
 _includes/content/nothing_to_hide.md    | 10 +++++-----
 _includes/content/usa.md                |  6 +++---
 _includes/index.html                    |  4 ++--
 _includes/lang                          |  4 ----
 _includes/langs/_general                |  6 ------
 _includes/langs/fourteen_eyes           |  5 -----
 _includes/langs/key_disclosure_law      |  7 -------
 _includes/langs/nothing_to_hide         |  3 ---
 _includes/langs/usa                     |  1 -
 _includes/section_config                |  6 ++----
 23 files changed, 97 insertions(+), 106 deletions(-)
 delete mode 100644 _data/lang/en/fourteen_eyes.yml
 delete mode 100644 _data/lang/en/general.yml
 delete mode 100644 _data/lang/en/key_disclosure_law.yml
 delete mode 100644 _data/lang/en/usa.yml
 create mode 100644 _data/lang/fourteen_eyes.yml
 create mode 100644 _data/lang/general.yml
 delete mode 100644 _data/lang/it/general.yml
 delete mode 100644 _data/lang/it/nothing_to_hide.yml
 create mode 100644 _data/lang/key_disclosure_law.yml
 rename _data/lang/{en => }/nothing_to_hide.yml (81%)
 create mode 100644 _data/lang/usa.yml
 delete mode 100644 _includes/lang
 delete mode 100644 _includes/langs/_general
 delete mode 100644 _includes/langs/fourteen_eyes
 delete mode 100644 _includes/langs/key_disclosure_law
 delete mode 100644 _includes/langs/nothing_to_hide
 delete mode 100644 _includes/langs/usa

diff --git a/_data/lang/en/fourteen_eyes.yml b/_data/lang/en/fourteen_eyes.yml
deleted file mode 100644
index 45caa89c..00000000
--- a/_data/lang/en/fourteen_eyes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Global Mass Surveillance - The Fourteen Eyes
-description: >
-    The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the [Five Eyes](https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices), focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to [not spy on each other](https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other) as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other’s citizens and [share intelligence](https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa) to [avoid breaking domestic laws](https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett) that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes), however Five Eyes and third-party countries can and do spy on each other.
-five_eyes: Five Eyes
-nine_eyes: Nine Eyes
-fourteen_eyes: Fourteen Eyes
----
\ No newline at end of file
diff --git a/_data/lang/en/general.yml b/_data/lang/en/general.yml
deleted file mode 100644
index 2ef5d875..00000000
--- a/_data/lang/en/general.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-site_subheading: > 
-            You are being watched. Private and state-sponsored organizations are monitoring and recording
-            your online activities. privacytools.io provides knowledge and tools to protect your privacy
-            against global mass surveillance.
-translations_disclaimer: Translations of privacytools.io were done by volunteers. They might be not up to date.
-Read also: Read also
-Related Information: Related Information
----
\ No newline at end of file
diff --git a/_data/lang/en/key_disclosure_law.yml b/_data/lang/en/key_disclosure_law.yml
deleted file mode 100644
index c5a8699f..00000000
--- a/_data/lang/en/key_disclosure_law.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Key Disclosure Law
-subheading: Who is required to hand over the encryption keys to authorities?
-description: >
-    Mandatory [key disclosure laws](https://en.wikipedia.org/wiki/Key_disclosure_law) require individuals to turn over encryption keys to law enforcement conducting a criminal investigation. How these laws are implemented (who may be legally compelled to assist) vary from nation to nation, but a warrant is generally required. Defenses against key disclosure laws include steganography and encrypting data in a way that provides plausible deniability.
-
-    [Steganography](https://en.wikipedia.org/wiki/Steganography) involves hiding sensitive information (which may be encrypted) inside of ordinary data (for example, encrypting an image file and then hiding it in an audio file). With plausible deniability, data is encrypted in a way that prevents an adversary from being able to prove that the information they are after exists (for example, one password may decrypt benign data and another password, used on the same file, could decrypt sensitive data).
-apply: Key disclosure laws apply
-may_apply: Key disclosure laws may apply
-dont_apply: Key disclosure laws don't apply
-footnote: people who know how to access a system may be ordered to share their knowledge, <strong>however, this doesn't apply to the suspect itself or family members.</strong>
\ No newline at end of file
diff --git a/_data/lang/en/usa.yml b/_data/lang/en/usa.yml
deleted file mode 100644
index 05fe3b01..00000000
--- a/_data/lang/en/usa.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: Why is it not recommended to choose a US-based service?
-description: >
-    Services based in the United States are not recommended because of the country’s surveillance programs, use of [National Security Letters](https://www.eff.org/issues/national-security-letters/faq) (NSLs) and accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to [secretly force](https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html) companies to grant complete access to customer data and transform the service into a tool of mass surveillance.
-
-    An example of this is [Lavabit](https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order) – a discontinued secure email service created by Ladar Levison. The FBI [requested](https://motherboard.vice.com/en_us/article/nzz888/lavabit-founder-ladar-levison-discusses-his-federal-battle-for-privacy) Snowden’s records after finding out that he used the service. Since Lavabit did not keep logs and email content was stored encrypted, the FBI served a subpoena (with a gag order) for the service’s SSL keys. Having the SSL keys would allow them to access communications (both metadata and unencrypted content) in real time for all of Lavabit’s customers, not just Snowden's.
-
-    Ultimately, Levison turned over the SSL keys and [shut down](https://www.theguardian.com/commentisfree/2014/may/20/why-did-lavabit-shut-down-snowden-email) the service at the same time. The US government then [threatened Levison with arrest](http://www.cnbc.com/id/100962389),
-    saying that shutting down the service was a violation of the court order.
----
\ No newline at end of file
diff --git a/_data/lang/fourteen_eyes.yml b/_data/lang/fourteen_eyes.yml
new file mode 100644
index 00000000..ea88ba36
--- /dev/null
+++ b/_data/lang/fourteen_eyes.yml
@@ -0,0 +1,12 @@
+---
+en: &base
+    title: Global Mass Surveillance - The Fourteen Eyes
+    description: >
+        The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the [Five Eyes](https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices), focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to [not spy on each other](https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other) as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other’s citizens and [share intelligence](https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa) to [avoid breaking domestic laws](https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett) that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes), however Five Eyes and third-party countries can and do spy on each other.
+    five_eyes: Five Eyes
+    nine_eyes: Nine Eyes
+    fourteen_eyes: Fourteen Eyes
+
+it:
+    <<: *base
+---
\ No newline at end of file
diff --git a/_data/lang/general.yml b/_data/lang/general.yml
new file mode 100644
index 00000000..d501c567
--- /dev/null
+++ b/_data/lang/general.yml
@@ -0,0 +1,18 @@
+---
+en: &base
+    site_subheading: > 
+                You are being watched. Private and state-sponsored organizations are monitoring and recording
+                your online activities. privacytools.io provides knowledge and tools to protect your privacy
+                against global mass surveillance.
+    translations_disclaimer: Translations of privacytools.io were done by volunteers. They might be not up to date.
+    read_also: Read also
+    related_information: Related Information
+
+it:
+    <<: *base
+    site_subheading: > 
+        You are being watched. Private and state-sponsored organizations are monitoring and recording
+        your online activities. privacytools.io provides knowledge and tools to protect your privacy
+        against global mass surveillance. (IT)
+    read_also: Read also (IT)
+---
\ No newline at end of file
diff --git a/_data/lang/it/general.yml b/_data/lang/it/general.yml
deleted file mode 100644
index 7a0b30fd..00000000
--- a/_data/lang/it/general.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-subheading: > 
-            You are being watched. Private and state-sponsored organizations are monitoring and recording
-            your online activities. privacytools.io provides knowledge and tools to protect your privacy
-            against global mass surveillance. (IT)
-Read also: Read also (IT)
----
\ No newline at end of file
diff --git a/_data/lang/it/nothing_to_hide.yml b/_data/lang/it/nothing_to_hide.yml
deleted file mode 100644
index eee310fa..00000000
--- a/_data/lang/it/nothing_to_hide.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Italian title for nothing to hide
-quote: >
-        Italian quote
----
\ No newline at end of file
diff --git a/_data/lang/key_disclosure_law.yml b/_data/lang/key_disclosure_law.yml
new file mode 100644
index 00000000..60e35c13
--- /dev/null
+++ b/_data/lang/key_disclosure_law.yml
@@ -0,0 +1,18 @@
+---
+en: &base
+    title: Key Disclosure Law
+    subheading: Who is required to hand over the encryption keys to authorities?
+    description: >
+        Mandatory [key disclosure laws](https://en.wikipedia.org/wiki/Key_disclosure_law) require individuals to turn over encryption keys to law enforcement conducting a criminal investigation. How these laws are implemented (who may be legally compelled to assist) vary from nation to nation, but a warrant is generally required. Defenses against key disclosure laws include steganography and encrypting data in a way that provides plausible deniability.
+        
+        [Steganography](https://en.wikipedia.org/wiki/Steganography) involves hiding sensitive information (which may be encrypted) inside of ordinary data (for example, encrypting an image file and then hiding it in an audio file). With plausible deniability, data is encrypted in a way that prevents an adversary from being able to prove that the information they are after exists (for example, one password may decrypt benign data and another password, used on the same file, could decrypt sensitive data).
+    apply: Key disclosure laws apply
+    may_apply: Key disclosure laws may apply
+    dont_apply: Key disclosure laws don't apply
+    footnote: people who know how to access a system may be ordered to share their knowledge, <strong>however, this doesn't apply to the suspect itself or family members.</strong>
+
+it:
+    <<: *base
+    footnote: something italian
+
+---
\ No newline at end of file
diff --git a/_data/lang/en/nothing_to_hide.yml b/_data/lang/nothing_to_hide.yml
similarity index 81%
rename from _data/lang/en/nothing_to_hide.yml
rename to _data/lang/nothing_to_hide.yml
index a6f5f72f..03831eef 100644
--- a/_data/lang/en/nothing_to_hide.yml
+++ b/_data/lang/nothing_to_hide.yml
@@ -1,6 +1,7 @@
 ---
-title: Privacy? I don't have anything to hide.
-quote: >
+en: &base
+    title: Privacy? I don't have anything to hide.
+    quote: >
         Over the last 16 months, as I've debated this issue around the world, 
         every single time somebody has said to me, "I don't really worry about
         invasions of privacy because I don't have anything to hide." I always
@@ -13,5 +14,11 @@ quote: >
         if you're not a bad person, if you're doing nothing wrong, you should
         have nothing to hide." <strong>Not a single person hsa taken me up on
         that offer</strong>
-talk_name: Why privacy matters
+    talk_name: Why privacy matters
+
+it:
+    <<: *base
+    title: Italian title for nothing to hide
+    quote: >
+        Italian quote
 ---
\ No newline at end of file
diff --git a/_data/lang/usa.yml b/_data/lang/usa.yml
new file mode 100644
index 00000000..3e68328c
--- /dev/null
+++ b/_data/lang/usa.yml
@@ -0,0 +1,14 @@
+---
+en: &base
+    title: Why is it not recommended to choose a US-based service?
+    description: >
+        Services based in the United States are not recommended because of the country’s surveillance programs, use of [National Security Letters](https://www.eff.org/issues/national-security-letters/faq) (NSLs) and accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to [secretly force](https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html) companies to grant complete access to customer data and transform the service into a tool of mass surveillance.
+
+        An example of this is [Lavabit](https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order) – a discontinued secure email service created by Ladar Levison. The FBI [requested](https://motherboard.vice.com/en_us/article/nzz888/lavabit-founder-ladar-levison-discusses-his-federal-battle-for-privacy) Snowden’s records after finding out that he used the service. Since Lavabit did not keep logs and email content was stored encrypted, the FBI served a subpoena (with a gag order) for the service’s SSL keys. Having the SSL keys would allow them to access communications (both metadata and unencrypted content) in real time for all of Lavabit’s customers, not just Snowden's.
+
+        Ultimately, Levison turned over the SSL keys and [shut down](https://www.theguardian.com/commentisfree/2014/may/20/why-did-lavabit-shut-down-snowden-email) the service at the same time. The US government then [threatened Levison with arrest](http://www.cnbc.com/id/100962389),
+        saying that shutting down the service was a violation of the court order.
+
+it:
+    <<: *base
+---
\ No newline at end of file
diff --git a/_includes/content/fourteen_eyes.md b/_includes/content/fourteen_eyes.md
index 524259a9..a0c51f4a 100644
--- a/_includes/content/fourteen_eyes.md
+++ b/_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>
diff --git a/_includes/content/key_disclosure_law.md b/_includes/content/key_disclosure_law.md
index 67c208aa..0b42ac86 100644
--- a/_includes/content/key_disclosure_law.md
+++ b/_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>
\ No newline at end of file
diff --git a/_includes/content/nothing_to_hide.md b/_includes/content/nothing_to_hide.md
index cf1ee9a1..57f991c3 100644
--- a/_includes/content/nothing_to_hide.md
+++ b/_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/)
diff --git a/_includes/content/usa.md b/_includes/content/usa.md
index f8b6ef9c..81cd81d4 100644
--- a/_includes/content/usa.md
+++ b/_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)
diff --git a/_includes/index.html b/_includes/index.html
index 5da1d076..0966424e 100644
--- a/_includes/index.html
+++ b/_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>
 
diff --git a/_includes/lang b/_includes/lang
deleted file mode 100644
index b141e835..00000000
--- a/_includes/lang
+++ /dev/null
@@ -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 %}
\ No newline at end of file
diff --git a/_includes/langs/_general b/_includes/langs/_general
deleted file mode 100644
index fe8f5471..00000000
--- a/_includes/langs/_general
+++ /dev/null
@@ -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'] %}
\ No newline at end of file
diff --git a/_includes/langs/fourteen_eyes b/_includes/langs/fourteen_eyes
deleted file mode 100644
index b2636150..00000000
--- a/_includes/langs/fourteen_eyes
+++ /dev/null
@@ -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 %}
\ No newline at end of file
diff --git a/_includes/langs/key_disclosure_law b/_includes/langs/key_disclosure_law
deleted file mode 100644
index dec1b521..00000000
--- a/_includes/langs/key_disclosure_law
+++ /dev/null
@@ -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 %}
\ No newline at end of file
diff --git a/_includes/langs/nothing_to_hide b/_includes/langs/nothing_to_hide
deleted file mode 100644
index 5dc782e8..00000000
--- a/_includes/langs/nothing_to_hide
+++ /dev/null
@@ -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 %}
\ No newline at end of file
diff --git a/_includes/langs/usa b/_includes/langs/usa
deleted file mode 100644
index 80c7399e..00000000
--- a/_includes/langs/usa
+++ /dev/null
@@ -1 +0,0 @@
-{% assign title = include.lang.title | default: include.en.title %}
diff --git a/_includes/section_config b/_includes/section_config
index 89b42455..dd67e1a9 100644
--- a/_includes/section_config
+++ b/_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 %}
\ No newline at end of file
+{% assign lang = site.data.lang.[include.section].[include.lang] %}
+{% assign general = site.data.lang.general.[include.lang] %}
\ No newline at end of file