diff --git a/content/cfp.de.md b/content/cfp.de.md
index 36ea390..67e2046 100644
--- a/content/cfp.de.md
+++ b/content/cfp.de.md
@@ -21,11 +21,10 @@ voneinander zu lernen und Spass zu haben — nicht nur am Gerät.
## Wann und wo findet die CoSin statt?
Die CoSin findet dieses Jahr vom
-{{< cosin_i18n "date_day_name_start" >}}, den {{< cosin "date_day_start" >}}. bis
-{{< cosin_i18n "date_day_name_end" >}}, den {{< cosin "date_day_end" >}}.
-{{< cosin_i18n "date_month" >}} {{< cosin "date_year" >}}
-{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}})
-in {{< cosin_i18n "location_city" >}} statt.
+{{< cosin_i18n "date_start_weekday" >}}, den {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} bis
+{{< cosin_i18n "date_end_weekday" >}}, den {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}}
+{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}}
+statt.
## Wie kann ich mich beteiligen?
diff --git a/content/cfp.en.md b/content/cfp.en.md
index 003fbee..330d4cf 100644
--- a/content/cfp.en.md
+++ b/content/cfp.en.md
@@ -21,10 +21,10 @@ voneinander zu lernen und Spass zu haben — nicht nur am Gerät.
## Wann und wo findet die CoSin statt?
Die CoSin findet dieses Jahr vom
-{{< cosin_i18n "date_day_name_start" >}}, den {{< cosin "date_day_start" >}}. bis
-{{< cosin_i18n "date_day_name_end" >}}, den {{< cosin "date_day_end" >}}
-{{< cosin_i18n "date_month" >}} {{< cosin "date_year" >}}
-{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}} statt.
+{{< cosin_i18n "date_start_weekday" >}}, den {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} bis
+{{< cosin_i18n "date_end_weekday" >}}, den {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}}
+{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}}
+statt.
## Wie kann ich mich beteiligen?
diff --git a/content/cfp.fr.md b/content/cfp.fr.md
index abdbbb2..a9e993d 100644
--- a/content/cfp.fr.md
+++ b/content/cfp.fr.md
@@ -20,9 +20,8 @@ seulement sur leur machines !
## Quand et où le CoSin aura lieu ?
Cette année le CoSin aura lieu du
-{{< cosin_i18n "date_day_name_start" >}} {{< cosin "date_day_start" >}} au
-{{< cosin_i18n "date_day_name_end" >}} {{< cosin "date_day_end" >}}
-{{< cosin_i18n "date_month" >}}
+{{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}} {{< cosin_i18n "date_start_month" >}} au
+{{< cosin_i18n "date_end_weekday" >}} {{< cosin "date_end_day" >}} {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}}
{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) à {{< cosin_i18n "location_city" >}}.
## Comment est-ce que je participe ?
diff --git a/content/cfp.it.md b/content/cfp.it.md
index 36196b1..b25c218 100644
--- a/content/cfp.it.md
+++ b/content/cfp.it.md
@@ -20,9 +20,8 @@ solo al computer.
## Quando e dove si svolge la CoSin?
Quest'anno la CoSin si svolge da
-{{< cosin_i18n "date_day_name_start" >}} {{< cosin "date_day_start" >}}. fino a
-{{< cosin_i18n "date_day_name_end" >}} {{< cosin "date_day_end" >}}.
-{{< cosin_i18n "date_month" >}} {{< cosin "date_year" >}},
+{{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} fino a
+{{< cosin_i18n "date_end_weekday" >}} {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}},
{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}.
## Come posso contribuire?
diff --git a/content/infos.de.md b/content/infos.de.md
index 43c657a..44825d2 100644
--- a/content/infos.de.md
+++ b/content/infos.de.md
@@ -10,9 +10,9 @@ menu:
## Datum
Das CoSin {{< cosin "date_year" >}} findet vom
-Freitag, {{< cosin "date_day_start" >}}. {{< cosin_i18n "date_month" >}} bis zum
-Sonntag, {{< cosin "date_day_end" >}}. {{< cosin_i18n "date_month" >}}
-{{< cosin "date_year" >}} statt.
+{{< cosin_i18n "date_start_weekday" >}}, den {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} bis zum
+{{< cosin_i18n "date_end_weekday" >}}, den {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}}
+statt.
## Kosten
diff --git a/content/infos.en.md b/content/infos.en.md
index e69539f..f7b1ec6 100644
--- a/content/infos.en.md
+++ b/content/infos.en.md
@@ -10,8 +10,8 @@ menu:
## Date
CoSin {{< cosin "date_year" >}} takes place from
-{{< cosin_i18n "date_day_name_start" >}}, {{< cosin_i18n "date_month" >}} {{< cosin "date_day_start" >}}th until
-{{< cosin_i18n "date_day_name_end" >}}, {{< cosin_i18n "date_month" >}} {{< cosin "date_day_end" >}}th
+{{< cosin_i18n "date_start_weekday" >}}, {{< cosin_i18n "date_start_month" >}} {{< cosin "date_start_day" >}}th until
+{{< cosin_i18n "date_end_weekday" >}}, {{< cosin_i18n "date_end_month" >}} {{< cosin "date_end_day" >}}th
{{< cosin "date_year" >}}.
## Cost
diff --git a/content/infos.fr.md b/content/infos.fr.md
index 9e2aaa9..139f4ed 100644
--- a/content/infos.fr.md
+++ b/content/infos.fr.md
@@ -10,8 +10,8 @@ menu:
## Date
Le CoSin {{< cosin "date_year" >}} se déroule du
-{{< cosin_i18n "date_day_name_start" >}} {{< cosin "date_day_start" >}} au
-{{< cosin_i18n "date_day_name_end" >}} {{< cosin "date_day_end" >}} {{< cosin_i18n "date_month" >}}
+{{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}} {{< cosin_i18n "date_start_month" >}} au
+{{< cosin_i18n "date_end_weekday" >}} {{< cosin "date_end_day" >}} {{< cosin_i18n "date_end_month" >}}
{{< cosin "date_year" >}}.
## Coûts
diff --git a/content/infos.it.md b/content/infos.it.md
index 8bedf04..59855da 100644
--- a/content/infos.it.md
+++ b/content/infos.it.md
@@ -10,8 +10,8 @@ menu:
## Data
Quest'anno la CoSin si svolge da
-{{< cosin_i18n "date_day_name_start" >}} {{< cosin "date_day_start" >}}. fino a
-{{< cosin_i18n "date_day_name_end" >}} {{< cosin "date_day_end" >}}. {{< cosin_i18n "date_month" >}}
+{{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} fino a
+{{< cosin_i18n "date_end_weekday" >}} {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}}
{{< cosin "date_year" >}},
{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}.
diff --git a/data/cosin.toml b/data/cosin.toml
index 25d58e5..f9f128e 100644
--- a/data/cosin.toml
+++ b/data/cosin.toml
@@ -1,18 +1,19 @@
title = "Chaos Singularity"
+date_year = 2018
cos_value = 0.45580812693525397
# Set to false if date for next year is not known yet:
date_known = true
-date_day_start = 15
-date_day_end = 17
-date_month = "Juni"
-date_year = 2018
+date_start_weekday = "Freitag"
+date_start_day = 15
+date_start_month = "Juni"
-date_day_name_start = "Freitag"
-date_day_name_end = "Sonntag"
+date_end_weekday = "Sonntag"
+date_end_day = 17
+date_end_month = "Juni"
location_known = true
diff --git a/i18n/de.toml b/i18n/de.toml
index 9a6e833..8afe874 100644
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -1,17 +1,15 @@
[Juni]
other = "Juni"
-
+[Juli]
+other = "Juli"
[Freitag]
other = "Freitag"
-
[Sonntag]
other = "Sonntag"
-
[Biel]
other = "Biel"
-
[PrepositionLocationF]
other = "in der"
diff --git a/i18n/en.toml b/i18n/en.toml
index 8327629..5144754 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -1,17 +1,15 @@
[Juni]
-other = "june"
-
+other = "June"
+[Juli]
+other = "July"
[Freitag]
other = "Friday"
-
[Sonntag]
other = "Sunday"
-
[Biel]
other = "Biel"
-
[PrepositionLocationF]
other = "at the"
diff --git a/i18n/fr.toml b/i18n/fr.toml
index 869bfe7..625501c 100644
--- a/i18n/fr.toml
+++ b/i18n/fr.toml
@@ -1,17 +1,15 @@
[Juni]
other = "june"
-
+[Juli]
+other = "juillet"
[Freitag]
other = "vendredi"
-
[Sonntag]
other = "dimanche"
-
[Biel]
other = "Bienne"
-
[PrepositionLocationF]
other = "à la"
diff --git a/i18n/it.toml b/i18n/it.toml
index 35bffe7..5f37d9b 100644
--- a/i18n/it.toml
+++ b/i18n/it.toml
@@ -1,17 +1,15 @@
[Juni]
other = "june"
-
+[Juli]
+other = "luglio"
[Freitag]
other = "venerdì"
-
[Sonntag]
other = "domenica"
-
[Biel]
other = "Bienna"
-
[PrepositionLocationF]
other = "nella"
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
index 01b4674..191b992 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.de.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
@@ -10,7 +10,7 @@
{{ if .date_known }}
- Datum: {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}
+ Datum: {{ .date_start_day }}. {{ i18n .date_start_month }} - {{ .date_end_day }}. {{ i18n .date_end_month }} {{ .date_year }}
{{ end }}
{{ if .location_known }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
index e37d9ee..e321b03 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.en.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
@@ -10,7 +10,7 @@
{{ if .date_known }}
- Date: {{ i18n .date_month }} {{ .date_day_start }}th - {{ .date_day_end }}th {{ .date_year }}
+ Date: {{ i18n .date_start_month }} {{ .date_start_day }}th - {{ i18n .date_end_month }} {{ .date_end_day }}th {{ .date_year }}
{{ end }}
{{ if .location_known }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
index 0c32474..5fcc0b4 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
@@ -10,7 +10,7 @@
{{ if .date_known }}
- Date: {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}
+ Date: {{ .date_start_day }}. {{ i18n .date_start_month }} - {{ .date_end_day }}. {{ i18n .date_end_month }} {{ .date_year }}
{{ end }}
{{ if .location_known }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
index fd82e9b..a4f7151 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.it.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
@@ -10,7 +10,7 @@
{{ if .date_known }}
- Data: {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}
+ Data: {{ .date_start_day }}. {{ i18n .date_start_month }} - {{ .date_end_day }}. {{ i18n .date_end_month }} {{ .date_year }}
{{ end }}
{{ if .location_known }}