translations fix

content/en/hbsc-cal-1.md

@@ -1,12 +0,0 @@
-Title: homebrewserver.club, calendars session 2
-Date: 2017-11-30
-Category: gathering
-Slug: hbsc-cal-en-2
-lang: en
-start: Thursday 30 November, 19:00
-
-![map preview](/images/cal2.png)
-
-A second gathering around self-hosted calendars. 
-
-Location: Varia

content/hbsc-cal-1.en.md

@@ -0,0 +1,11 @@
+Title: homebrewserver.club, calendars session 1
+Date: 2017-11-16
+Category: gathering
+Slug: hbsc-cal-1-en
+lang: en
+start: Thursday 16 November, 19:00
+
+![map preview](/images/cal.png)
+
+A first gathering around self-hosted calendars. 
+

content/hbsc-cal-1.nl.md

@@ -1,7 +1,7 @@
 Title: homebrewserver.club, kalenders sessie 1
 Date: 2017-11-16
 Category: gathering
-Slug: hbsc-cal-1
+Slug: hbsc-cal-1-nl
 lang: nl
 start: donderdag 16 november, 19:00
 

content/hbsc-cal-2.en.md

@@ -0,0 +1,12 @@
+Title: homebrewserver.club, kalenders sessie 2
+Date: 2017-11-30
+Category: gathering
+Slug: hbsc-cal-2-en
+lang: en
+start: donderdag 30 november, 19:00
+
+![map preview](/images/cal2.png)
+
+A second gathering around self-hosted calendars.
+
+Location: Varia

content/hbsc-cal-2.nl.md

@@ -1,7 +1,7 @@
 Title: homebrewserver.club, kalenders sessie 2
 Date: 2017-11-30
 Category: gathering
-Slug: hbsc-cal-2
+Slug: hbsc-cal-2-nl
 lang: nl
 start: donderdag 30 november, 19:00
 

content/inox.en.md

@@ -1,10 +1,9 @@
 Title: Soup & Talk - Inox Kapell
 Date: 2017-12-16
 Category: event
-Slug: inox-kapell-EN
-lang: nl
+Slug: inox-kapell
+lang: en
 start: saturday 16 december, 19:00
-status: draft
 
 ![Inox Kapell](/images/insekt.jpg )
 
@@ -22,6 +21,6 @@ web: http://www.inoxkapell.de/
 
 **16 december**
 
-*Soup: 19:00
-*Talk: 20:00
-*Price: Donation
+* Soup: 19:00
+* Talk: 20:00
+* Price: Donation

content/inox.nl.md

@@ -10,7 +10,7 @@ start: zaterdag 16 december, 19:00
 
 Varia krijgt bezoek; van Inox Kapell, de insectenman uit Wespbaden. Op 16 december geeft hij een korte lezing  over alles wat hem zoal bezig houdt. Daarbij serveren we een soep.
 
-Inox Kapell is dol op insecten. Als kind obsrveerde en documenteerde hij deze wezens al. Vandaag de dag neemt hij mensen mee op insectenexcursies, bijvoorbeeld in kasteel Freudenberg. Hij maakt films, muziek en kunst van en over insecten, onder andere in de dadaistische band ‘Ordnungsamt et la politesse’. Bovendien is hij de oprichter van het ‘Insektium’, een insect-gerelateerd museum/galerie/happeningraum in Berlijn. Naar eigen zeggen worden insecten vaak onterecht veroordeeld en is hij degene die tussen ambassadeur mens en insect kan mediëren.
+Inox Kapell is dol op insecten. Als kind observeerde en documenteerde hij deze wezens al. Vandaag de dag neemt hij mensen mee op insectenexcursies, bijvoorbeeld in kasteel Freudenberg. Hij maakt films, muziek en kunst van en over insecten, onder andere in de dadaistische band ‘Ordnungsamt et la politesse’. Bovendien is hij de oprichter van het ‘Insektium’, een insect-gerelateerd museum/galerie/happeningraum in Berlijn. Naar eigen zeggen worden insecten vaak onterecht veroordeeld en is hij degene die tussen ambassadeur mens en insect kan mediëren.
 
 Een paar van zijn woorden: 
 
@@ -23,6 +23,6 @@ web: http://www.inoxkapell.de/
 
 **16 december**
 
-*Soup: 19:00
-*Talk: 20:00
-*Price: Donation
+* Soup: 19:00
+* Talk: 20:00
+* Price: Donation

content/pages/about.nl.md

@@ -1,4 +1,4 @@
-Title: about-nl
+Title: about
 Date: 2017-04-09
 Category: about
 Slug: about

content/pages/events_list.md

@@ -1,4 +0,0 @@
-Title:event list
-Slug: events-list
-template: events_list
-lang: nl

content/pages/membership-en.md

@@ -1,17 +0,0 @@
-Title: membership
-Date: 2017-04-09
-Category: about
-Slug: membership
-lang: en
-
-*varia* will function on a membership basis: each member can initiate or organize a weekly, monthly or spontaneous session around a shared topic of interest. By creating an open space to initiate, a changing flow of meetings will be organized and being available for participation to other members. 
-
-The space at the Gouwstraat functions as a working and meeting place where members meet during organized events or accidental encounters, and where non-members are welcome to join. 
-
-# members
-Danny van der Kleij (core member), 
-Dennis de Bel (core member), 
-Lídia Pereira (core member), 
-Manetta Berends (core member), 
-Niek Hilkmann (core member), 
-Roel Roscam Abbing (core member)

content/pages/membership-nl.md

@@ -1,17 +0,0 @@
-Title: membership
-Date: 2017-04-09
-Category: about
-Slug: membership
-lang: nl
-
-**varia** werkt met een ledenmodel. Deze vorm biedt de mogelijkheid om leden te binden aan de organisatie en deze uit te breiden. Deze leden betalen een maandelijkse vaste bijdrage en kunnen in ruil daarvoor deelnemen aan de activiteiten die worden georganiseerd. Hierdoor kunnen binnen de vereniging verschillende interessegroepen ontstaan. Naast de mogelijkheid van het organiseren van zulke clubavonden, thematische sessies of bijeenkomsten heeft *Varia* een vast publiek programma dat gericht is op een breder netwerk. 
-
-De ruimte aan de Gouwstraat functioneert als een werk- en ontmoetingsplek, waar leden elkaar ontmoeten tijdens georganiseerde evenementen of spontane ontmoetingen en niet-leden welkom zijn om aan te sluiten en lid te worden.
-
-# leden
-Danny van der Kleij (kernlid), 
-Dennis de Bel (kernlid), 
-Lídia Pereira (kernlid), 
-Manetta Berends (kernlid), 
-Niek Hilkmann (kernlid), 
-Roel Roscam Abbing (kernlid)

content/pages/membership.en.md

@@ -0,0 +1,17 @@
+Title: membership
+Date: 2017-11-21
+Category: about
+Slug: membership
+lang: en
+
+**Varia** works with a membership basis. This form allows for the possibility to bind members to the organization and to expand her. Members pay a monthly fixed contribution fee and in return take part in the activities that are organized, initiate events or try-outs, use the fascilities that are developed, and participate in one of the workgroups.
+
+The space at the Gouwstraat functions as a working and meeting place where members meet during organized events or accidental encounters, and where non-members are welcome to join. 
+
+# Members
+Danny van der Kleij (care member), 
+Dennis de Bel (care member), 
+Lídia Pereira (care member), 
+Manetta Berends (care member), 
+Niek Hilkmann (care member), 
+Roel Roscam Abbing (care member)

content/pages/membership.nl.md

@@ -0,0 +1,17 @@
+Title: membership
+Date: 2017-11-21
+Category: about
+Slug: membership
+lang: nl
+
+**Varia** werkt met een ledenmodel. Deze vorm biedt de mogelijkheid om leden te binden aan de organisatie en deze uit te breiden. Deze leden betalen een maandelijkse vaste bijdrage en kunnen in ruil daarvoor deelnemen aan de activiteiten die worden georganiseerd, zelf evenementen of try-outs initiëren, gebruik maken van de fasciliteiten, en deelnemen aan een van de werkgroepen. 
+
+De ruimte aan de Gouwstraat functioneert als een werk- en ontmoetingsplek, waar leden elkaar ontmoeten tijdens georganiseerde evenementen of spontane ontmoetingen en niet-leden welkom zijn om aan te sluiten en lid te worden.
+
+# Leden
+Danny van der Kleij (care member), 
+Dennis de Bel (care member), 
+Manetta Berends (care member), 
+Niek Hilkmann (care member), 
+Roel Roscam Abbing (care member)
+

content/the-secret-life-seizoen-1.en.md

@@ -1,7 +1,7 @@
 Title: Screening: The Secret Life Of Machines, season 1
 Date: 2017-11-05
 Category: screening
-Slug: the-secret-life-screening-1
+Slug: the-secret-life-season-1
 lang: en
 start: Sunday 5 November, 19:30
 

content/the-secret-life-seizoen-1.nl.md

@@ -1,7 +1,7 @@
 Title: The Secret Life Of Machine screenings, seizoen 1
 Date: 2017-11-05
 Category: event
-Slug: the-secret-life-1
+Slug: the-secret-life-seizoen-1
 lang: nl
 start: zondag 5 november, 19:30
 

content/the-secret-life-seizoen-3.en.md

@@ -4,11 +4,11 @@ Category: screening
 Slug: the-secret-life-screening-3
 lang: en
 start: Sunday 10 December, 19:30
-status: draft
 
 ![word processor robot](/images/word_processor_robot.gif)
 
 Technology is everywhere, sometimes it hides its face underneath a mask of everydayness, but we can only guess what goes on in our vacuum cleaner, telephone or copy machine. When were these inventions introduced into our lives and how can we keep control over them? These questions, and many more, are answered by 'The Secret Life Of Machines'. In this cultseries from the BBC, which was produced between 1988 and 1993 engineer, cartoonist and writer Tim Hunkin and inventor Rex Garrod dissect the workings and history of a everyday appliance in each episode. During the next few weeks varia, center of everyday technology will screen the entire series during a couple of public screenings.
+
 ##dates
 10 december: season 3 - office applicances (lift, word processor, electric light, photocopier, fax machine and the office)
 

pelicanconf.py

@@ -2,9 +2,8 @@
 # -*- coding: utf-8 -*- #
 from __future__ import unicode_literals
 
-AUTHOR = u'team'
-SITENAME = u'varia'
-SITEURL = ''
+AUTHOR = u'Varia'
+SITENAME = u'Varia'
 
 PATH = 'content'
 
@@ -13,19 +12,20 @@ TIMEZONE = 'Europe/Amsterdam'
 DEFAULT_LANG = u'nl'
 
 # Feed generation is usually not desired when developing
+FEED_DOMAIN = 'varia.zone/feeds/'
+FEED_ALL_RSS = 'feeds/all.rss.xml'
+TRANSLATION_FEED_RSS = 'feeds/all-%s.rss.xml'
+RSS_FEED_SUMMARY_ONLY = False
 FEED_ALL_ATOM = None
 CATEGORY_FEED_ATOM = None
+CATEGORY_FEED_RSS = None
 TRANSLATION_FEED_ATOM = None
 AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
-FEED_ALL_RSS = 'feeds/all.rss.xml'
-RSS_FEED_SUMMARY_ONLY = False
 
 DEFAULT_PAGINATION = 25
 
 # Uncomment following line if you want document-relative URLs when developing
-#RELATIVE_URLS = True
-
 PLUGIN_PATHS = ['./plugins']
 PLUGINS = ['extract_toc', 'i18n_subsites', 'summary']
 # PLUGINS = ['extract_toc', 'i18n_subsites', 'events', 'summary']
@@ -41,23 +41,19 @@ EXTRA_PATH_METADATA = {
 THEME = 'themes/cetcat'
 THEME_STATIC_DIR = 'theme/'
 
-#SUMMARY_USE_FIRST_PARAGRAPH = True
-
-# ARTICLE_LANG_URL = '{slug}-{lang}.html'
-
 I18N_SUBSITES = {
 	'en': {
-		'SITESUBTITLE':u'Centre for Everyday Technology', 'locale':'en_US.UTF-8'
+		'SITESUBTITLE':u'Centre for Everyday Technology',
+		'SITEURL':'varia.zone/en/',
+		'locale':'en_US.UTF-8'
 	},
 	'nl': {
-		'SITESUBTITLE':u'Centrum voor Alledaagse Technologie', 'locale':'nl.UTF-8'
+		'SITESUBTITLE':u'Centrum voor Alledaagse Technologie', 
+		'SITEURL':'varia.zone/',
+		'locale':'nl.UTF-8'
 	}
 }	
 
-lang_siteurls = {
-	'/': '/',
-	'en': '/en/'
-}	
 PLUGIN_EVENTS={
-        'ics_fname':'calendar.ics'
-        }
+	'ics_fname':'calendar.ics'
+}

publishconf.py

@@ -10,14 +10,9 @@ import sys
 sys.path.append(os.curdir)
 from pelicanconf import *
 
-# SITEURL = 'http://www.centerforeveryday.technology'
 RELATIVE_URLS = True
-
-# FEED_DOMAIN = SITEURL
-
 DELETE_OUTPUT_DIRECTORY = True
 
 # Following items are often useful when publishing
-
 #DISQUS_SITENAME = ""
 #GOOGLE_ANALYTICS = ""

themes/cetcat/static/css/main.css

@@ -161,7 +161,6 @@ pre{
 
 /****************************/
 /* main/index overview page */
-
 #content #post-list{
 	width: 100%;
 }
@@ -169,6 +168,7 @@ pre{
 	display: inline;
 }
 .summary img{
+	width: 100%;
 	margin:0 0 1em 0;
 }
 .hentry{

themes/cetcat/static/fonts/SIL Open Font License.txt

@@ -1,44 +0,0 @@
-Copyright (c) 2003–2012, Philipp H. Poll (www.linuxlibertine.org | gillian at linuxlibertine.org),
-with Reserved Font Name "Linux Libertine" and "Biolinum".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
-
-5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

themes/cetcat/templates/article.html

@@ -40,6 +40,13 @@
 			</span>
 		</div>
 		{% endif %}
+		{% if article.translations %}
+			<div id="article-translation">
+			{% for translation in article.translations %}
+				→ <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+			{% endfor %}
+			</div>
+		{% endif %}
 	</div>
 	</section>
 {% endblock %}

themes/cetcat/templates/base.html

@@ -2,7 +2,7 @@
 <html lang="{{ DEFAULT_LANG }}">
 <head>
         {% block head %}
-        <title>{% block title %}{{ SITENAME }} - {{SITESUBTITLE}}{% endblock title %}</title>
+        <title>{% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %}</title>
         <meta charset="utf-8" />
     <link rel="icon" href="{{ SITEURL}}/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="{{ SITEURL }}/favicon.ico" type="image/x-icon">
@@ -17,20 +17,20 @@
 
 <body id="index" class="home">
     <div id="translation">
-        {% if lang_siteurls %}
-            {% for lang, url in lang_siteurls.items() %}
-                {% if url == '/nl'%}
+        {% if I18N_SUBSITES %}
+            {% for lang, url in I18N_SUBSITES.items() %}
+                {% if lang == 'nl' %}
                     <li{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/">{{ lang }}</a></li>            
                 {% endif %}
-                {% if url == '/en'%}
-                    <li{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="{{ url }}/">{{ lang }}</a></li>            
+                {% if lang == 'en' %}
+                    <li{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/{{ lang }}/">{{ lang }}</a></li>            
                 {% endif %}
             {% endfor %}
         {% endif %}
         <br>
         {% if FEED_ALL_RSS %}
-            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml"><i class="fa fa-rss "></i> RSS</a></li>
-    {% endif %}
+            <li><a href="feeds/all-{{ DEFAULT_LANG }}.rss.xml" type="application/rss+xml"><i class="fa fa-rss "></i>RSS</a></li>
+        {% endif %}
     </div>
     <header id="banner">
         {% for p in pages %}

themes/cetcat/templates/page.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{%endblock%}
 {% block content %}
-   <div id ="page-content">
+    <div id ="page-content">
 	{{ page.content }}
 
 	{% if page.modified %}