From c8579a7d6feb546f7e12d601210b0fb3f3932e7b Mon Sep 17 00:00:00 2001
From: L3D <l3d@see-base.de>
Date: Sat, 3 Nov 2018 16:36:19 +0100
Subject: [PATCH] Use more databags

Former-commit-id: b111788f547eb0c05a3585c2a89f79f363ef3e8c [formerly 1839687e69c2bd279f0ac68a905de899711468a2] [formerly 71eec16b77eb5138366abe8ef889b668cd139c1c [formerly 6ee0080361c4ab04b206c5b3c18244d080ee53fc]]
Former-commit-id: 8841c4866689ccdf1094aa8c118112e73b6b4d64 [formerly 3dd95a1cfd000f0284e7e2136b3b3c3d6dfab6b1]
Former-commit-id: dde6a0a3e9c207b978c0d0e930ee40c219c2f237
---
 databags/translate.ini | 14 ++++++++++++++
 templates/layout.html  | 34 ++++++++++++++--------------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/databags/translate.ini b/databags/translate.ini
index e062f2a..650f0c7 100644
--- a/databags/translate.ini
+++ b/databags/translate.ini
@@ -15,6 +15,13 @@ destiny = Wir machen Waffeln
 we = Wir
 love = Waffeln, du auch?
 whoami = 'Das C3WOC besteht aus Hackern aus dem Chaosumfeld. Nimm doch mal mit uns Kontakt auf und lass uns zusammen Waffeln machen!'
+mail = waffel@c3woc.de
+irc = irc.hackint.org/#waffel
+webirc = webirc.hackint.org
+twitter = @C3WOC
+mastodon = @C3WOC@chaos.social
+invite = Mach bei uns mit
+
 
 [en]
 close = close
@@ -30,5 +37,12 @@ destiny = We make waffles
 we = We
 love = waffles, you too?
 whoami = The c3woc consists of hackers from the environment of the chaos computer club. Please contact us and let us craft some waffles together!
+mail = waffle@c3woc.de
+irc = irc.hackint.org/#waffel
+webirc = webirc.hackint.org
+twitter = @C3WOC
+mastodon = @C3WOC@chaos.social
+invite = Join us
+
 
 
diff --git a/templates/layout.html b/templates/layout.html
index e4d8c8e..22e6c04 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -87,30 +87,24 @@
               <img src="{{ '/images/logo/c3woc.svg'|url }}" style="width: 100%;"/>
             </form>
                 <ul class="contact">
-            {% if this.alt == 'en' %}
                     {% for icon, link, name in [
-                      ['fa-envelope', 'mailto:waffle@c3woc.de', 'waffle@c3woc.de'],
-                      ['fa-hashtag', 'ircs://irc.hackint.org/#waffel', 'irc.hackint.org/#waffel'],
-                      ['fa-hashtag', 'https://webirc.hackint.org/#irc://irc.hackint.org/#waffel', 'webirc.hackint.org'],
-                      ['fa-twitter', 'https://twitter.com/@c3WOC', '@c3WOC'],
-                      ['fa-comments', 'https://chaos.social/@c3WOC', 'c3WOC@chaos.social'],
-                      ['fa-user-plus', 'https://c3woc.de/mitmachen', 'Join us!']
+                      ['fa-envelope', 'mailto:waffel@c3woc.de', 'mail'],
+                      ['fa-hashtag', 'ircs://irc.hackint.org/#waffel', 'irc'],
+                      ['fa-hashtag', 'https://webirc.hackint.org/#irc://irc.hackint.org/#waffel', 'webirc'],
+                      ['fa-twitter', 'https://twitter.com/@c3WOC', 'twitter'],
+                      ['fa-comments', 'https://chaos.social/@c3WOC', 'mastodon'],
+                      ['fa-user-plus', '/mitmachen/'|url , 'invite']
                     ] %}
-                    <li class="{{ icon }}"><a href="{{ link }}">{{ name }}</a></li>{%
-                  endfor %}{% else %}
-                    {% for icon, link, name in [
-                      ['fa-envelope', 'mailto:waffel@c3woc.de', 'waffel@c3woc.de'],
-                      ['fa-hashtag', 'ircs://irc.hackint.org/#waffel', 'irc.hackint.org/#waffel'],
-                      ['fa-hashtag', 'https://webirc.hackint.org/#irc://irc.hackint.org/#waffel', 'webirc.hackint.org'],
-                      ['fa-twitter', 'https://twitter.com/@c3WOC', '@c3WOC'],
-                      ['fa-comments', 'https://chaos.social/@c3WOC', 'c3WOC@chaos.social'],
-                      ['fa-user-plus', 'https://c3woc.de/mitmachen', 'Mach bei uns mit']
-                    ] %}
-                    <li class="{{ icon }}"><a href="{{ link }}">{{ name }}</a></li>{%
-                    endfor %}{% endif %}
+                    <li class="{{ icon }}"><a href="{{ link }}">{% if bag('translate', this.alt, name) %}{{ bag('translate', this.alt, name) }}{% 
+                      else %}{{ name }}{% endif %}</a></li>{%
+                    endfor %}
                 </ul>
               <ul class="copyright">
-                  <li>&copy; by L3D.</li><li><a href="{{ '/datenschutz/'|url }}">{% if this.alt == 'en' %}advanced cyber data protection{% else %}Datenschutz{% endif %}</a></li><li><a href="{{ '/impressum/'|url }}">{% if this.alt == 'en' %}imprint{% else %}Impressum{% endif %}</a></li><li>Design inspired by: <a href="http://html5up.net">HTML5 UP</a></li>
+                  <li>&copy; by L3D.</li><li><a href="{{ '/datenschutz/'|url }}">{% if bag('translate', this.alt, 'dataprotection') %}{{ bag('translate', this.alt, 'dataprotection') }}{% 
+                      else %}Cyberschutz{% endif 
+                      %}</a></li><li><a href="{{ '/impressum/'|url }}">{% 
+                      if bag('translate', this.alt, 'imprint') %}{{ bag('translate', this.alt, 'imprint') }}{% 
+                      else %}Impressum{% endif %}</a></li><li>Design inspired by: <a href="http://html5up.net">HTML5 UP</a></li>
           </ul>
 	    </div>
       </section>