From 6810d53a3ef3919410e981aae9c6cf598318ff02 Mon Sep 17 00:00:00 2001
From: Samuel Shifterovich <samuel.shifterovich@protonmail.com>
Date: Mon, 24 Dec 2018 14:13:33 +0100
Subject: [PATCH] Rename section_config to language, update Activist

---
 .activist.yml                           |  5 ++++
 _includes/content/fourteen_eyes.md      |  2 +-
 _includes/content/key_disclosure_law.md |  2 +-
 _includes/content/nothing_to_hide.md    |  2 +-
 _includes/content/usa.md                |  2 +-
 _includes/{section_config => language}  |  0
 activist.py                             | 32 ++++++++++---------------
 7 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 .activist.yml
 rename _includes/{section_config => language} (100%)

diff --git a/.activist.yml b/.activist.yml
new file mode 100644
index 00000000..7f43d79f
--- /dev/null
+++ b/.activist.yml
@@ -0,0 +1,5 @@
+---
+languages:
+    - de
+    - it
+    - en
diff --git a/_includes/content/fourteen_eyes.md b/_includes/content/fourteen_eyes.md
index 2acb8545..c200b727 100644
--- a/_includes/content/fourteen_eyes.md
+++ b/_includes/content/fourteen_eyes.md
@@ -1,4 +1,4 @@
-{% include section_config %}
+{% include language %}
 
 <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;">
diff --git a/_includes/content/key_disclosure_law.md b/_includes/content/key_disclosure_law.md
index 70bb3f8b..6240e472 100644
--- a/_includes/content/key_disclosure_law.md
+++ b/_includes/content/key_disclosure_law.md
@@ -1,4 +1,4 @@
-{% include section_config %}
+{% include language %}
 
 <h1 id="kdl" class="anchor"><a href="#kdl"><i class="fas fa-link anchor-icon"></i></a> {{ lang.title }}</h1>
 ### {{ lang.subheading }}
diff --git a/_includes/content/nothing_to_hide.md b/_includes/content/nothing_to_hide.md
index 5419830f..04aa5826 100644
--- a/_includes/content/nothing_to_hide.md
+++ b/_includes/content/nothing_to_hide.md
@@ -1,4 +1,4 @@
-{% include section_config %}
+{% include language %}
 
 <div class="page-header">
   <h1>{{ lang.title }}</h1>
diff --git a/_includes/content/usa.md b/_includes/content/usa.md
index eed31057..87d9263f 100644
--- a/_includes/content/usa.md
+++ b/_includes/content/usa.md
@@ -1,4 +1,4 @@
-{% include section_config %}
+{% include language %}
 
 <h3 id="usa" class="anchor">{{ lang.title }}</h3>
 
diff --git a/_includes/section_config b/_includes/language
similarity index 100%
rename from _includes/section_config
rename to _includes/language
diff --git a/activist.py b/activist.py
index 600141ea..5d4fe4b7 100755
--- a/activist.py
+++ b/activist.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 from sys import argv
+from yaml import safe_load as yaml_safe_load
 
 """
 A tool to make working with localized sections easier.
@@ -11,8 +12,7 @@ class Activist:
     def help(self):
         print("""
 Available commands:
-    make:section  name                          Creates all files needed for a new section.
-    make:strings  name string [str2,str3,...]   Adds a string to a langs/ file.
+    make:section  name      Creates all files needed for a new section.
         """)
     
     def handle(self, args):
@@ -26,8 +26,7 @@ Available commands:
     
     def run(self, command, arguments):
         commands = {
-            "make:section": self.make_section,
-            "make:strings": self.make_strings
+            "make:section": self.make_section
         }
 
         if command not in commands:
@@ -43,27 +42,20 @@ Available commands:
             exit("Please supply a section name.")
         
         # create files
-        with open("_data/lang/en/%s.yml" % name, 'w') as f:
-            f.write("---\n\n---")
-        with open("_includes/langs/%s" % name, 'w'): pass
+        with open("_data/lang/%s.yml" % name, 'w') as f:
+            f.write("---\n")
+            f.write("en: &base\n    title: Section Title\n\n")
+            with open(".activist.yml", "r") as config:
+                # get list of languages except "en"
+                for language in filter(lambda lang: lang != "en", yaml_safe_load(config.read())['languages']):
+                    f.write("{0}:\n    <<: *base\n    # title: Section Title in {0}\n\n".format(language))
+            f.write("---")
         with open("_includes/content/%s.md" % name, 'w') as f:
-            f.write("{% include section_config section=include.section lang=include.lang %}\n\n")
+            f.write("{% include language %}\n\n")
         print("""Add this line to index.html:
     
     {% include section name=\""""+ name + """\" %}""")
         print("\nAnd don't forge to add the section to the navbar in _layouts/default.html!")
-    
-    def make_strings(self, arguments):
-        try:
-            name, *strings = arguments
-            assert(len(strings) > 0)
-        except:
-            exit("Please supply the names of the strings that you wish to add.")
-        
-        with open("_includes/langs/%s" % name, "a+") as f:
-            for string in strings:
-                f.write("{{% assign {0} = include.lang.{0} | default: include.en.{0} %}}\n"
-                        .format(string))
 
 
 def main(args):