From f66ad971345f7fc1248fa03642f7cc7690a07c95 Mon Sep 17 00:00:00 2001
From: Samuel Shifterovich <samuel.shifterovich@protonmail.com>
Date: Sat, 15 Dec 2018 17:20:27 +0100
Subject: [PATCH] Do all the | default in the language files and access lang
 strings in index using simple variables

---
 _data/lang/it/nothing_to_hide.yml | 15 ++-------------
 _includes/index.html              | 10 +++++-----
 _includes/lang                    |  4 +++-
 _includes/langs/nothing_to_hide   |  3 +++
 4 files changed, 13 insertions(+), 19 deletions(-)
 create mode 100644 _includes/langs/nothing_to_hide

diff --git a/_data/lang/it/nothing_to_hide.yml b/_data/lang/it/nothing_to_hide.yml
index 88d6582c..eee310fa 100644
--- a/_data/lang/it/nothing_to_hide.yml
+++ b/_data/lang/it/nothing_to_hide.yml
@@ -1,16 +1,5 @@
 ---
-title: Privacy? I don't have anything to hide.
+title: Italian title for nothing 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
-        say the same thing to them. I get out a pen, I write down my email address.
-        I say, "Here's my email address. What I want you to do when you get home
-        is email me the passwords to all of your email accounts, not just the
-        nice, respectable work one in your name, but all of them, because I want
-        to be able to just troll through what it is you're doing online, read
-        what I want to read and publish whatever I find interesting. After all,
-        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>
+        Italian quote
 ---
\ No newline at end of file
diff --git a/_includes/index.html b/_includes/index.html
index 01522a61..9cbe624c 100644
--- a/_includes/index.html
+++ b/_includes/index.html
@@ -33,17 +33,17 @@
 
 {% include lang for="nothing_to_hide" lang=selected %}
 <div class="page-header">
-    <h1>{{ lang.title | default: en.title }}</h1>
+    <h1>{{ title }}</h1>
 </div>
 <blockquote class="blockquote">
     <p>
-        <a href="http://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - {{ lang.talk_name | default: en.talk_name  }} - TED Talk"><img
+        <a href="http://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: Why privacy matters"></a>
-        {{ lang.quote | default: en.quote }}
+        {{ quote }}
     </p>
-    <footer class="blockquote-footer">Glenn Greenwald in <cite title="{{ lang.talk_name | default: en.talk_name  }} - TED Talk"><a
+    <footer class="blockquote-footer">Glenn Greenwald in <cite title="{{ talk_name }} - TED Talk"><a
                 href="http://www.ted.com/talks/glenn_greenwald_why_privacy_matters">
-                {{ lang.talk_name | default: en.talk_name }} - TED Talk</a></cite></footer>
+                {{ talk_name }} - TED Talk</a></cite></footer>
 </blockquote>
 
 <h4>{{ language['Read also'] | default: english['Read also'] }}</h4>
diff --git a/_includes/lang b/_includes/lang
index 5eef83e6..b141e835 100644
--- a/_includes/lang
+++ b/_includes/lang
@@ -1,2 +1,4 @@
 {% assign lang = site.data.lang.[include.lang].[include.for] %}
-{% assign en = site.data.lang.en.[include.for] %}
\ No newline at end of file
+{% 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/nothing_to_hide b/_includes/langs/nothing_to_hide
new file mode 100644
index 00000000..5dc782e8
--- /dev/null
+++ b/_includes/langs/nothing_to_hide
@@ -0,0 +1,3 @@
+{% 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