From 1b7c5a2573e82042935bcbffd883969647968c5e Mon Sep 17 00:00:00 2001 From: Raoul Date: Tue, 24 Apr 2018 02:06:01 +0200 Subject: [PATCH] Better way of i18n dates --- data/cosin.toml | 12 +++++++----- data/mese.toml | 12 ------------ data/mois.toml | 12 ------------ data/monate.toml | 12 ------------ data/months.toml | 12 ------------ i18n/de.toml | 13 +++++++++++++ i18n/en.toml | 13 +++++++++++++ i18n/fr.toml | 13 +++++++++++++ i18n/it.toml | 13 +++++++++++++ .../layouts/partials/site-sidebar.de.html | 4 ++-- .../layouts/partials/site-sidebar.en.html | 4 ++-- .../layouts/partials/site-sidebar.fr.html | 4 ++-- .../layouts/partials/site-sidebar.it.html | 4 ++-- 13 files changed, 67 insertions(+), 61 deletions(-) delete mode 100644 data/mese.toml delete mode 100644 data/mois.toml delete mode 100644 data/monate.toml delete mode 100644 data/months.toml create mode 100644 i18n/de.toml create mode 100644 i18n/en.toml create mode 100644 i18n/fr.toml create mode 100644 i18n/it.toml diff --git a/data/cosin.toml b/data/cosin.toml index d5ec320..a60592c 100644 --- a/data/cosin.toml +++ b/data/cosin.toml @@ -1,12 +1,14 @@ title = "Chaos Singularity" +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 = 6 +date_month = "Juni" date_year = 2018 date_day_name_start = "Freitag" @@ -16,10 +18,7 @@ date_day_name_end = "Sonntag" place_known = true location = "Villa Ritter" -city_de = "Biel" -city_fr = "Bienne" -city_it = "Bienna" -city_en = "Biel" +city = "Biel" registration_open = true @@ -44,3 +43,6 @@ schedule_urls = [ irc_server = "irc://irc.chaostreff.ch/" irc_channel = "#cosin" + + +orga_email = "cosin2018@cosin.ch" diff --git a/data/mese.toml b/data/mese.toml deleted file mode 100644 index 04a70db..0000000 --- a/data/mese.toml +++ /dev/null @@ -1,12 +0,0 @@ -1 = "gennaio" -2 = "febbraio" -3 = "marzo" -4 = "aprile" -5 = "maggio" -6 = "giugno" -7 = "luglio" -8 = "agosto" -9 = "settembre" -10 = "ottobre" -11 = "novembre" -12 = "dicembre" diff --git a/data/mois.toml b/data/mois.toml deleted file mode 100644 index 96288ae..0000000 --- a/data/mois.toml +++ /dev/null @@ -1,12 +0,0 @@ -1 = "janvier" -2 = "février" -3 = "mars" -4 = "avril" -5 = "mai" -6 = "juin" -7 = "juillet" -8 = "août" -9 = "septembre" -10 = "octobre" -11 = "novembre" -12 = "décembre" diff --git a/data/monate.toml b/data/monate.toml deleted file mode 100644 index a17a3fa..0000000 --- a/data/monate.toml +++ /dev/null @@ -1,12 +0,0 @@ -1 = "Januar" -2 = "Februar" -3 = "März" -4 = "April" -5 = "Mai" -6 = "Juni" -7 = "Juli" -8 = "August" -9 = "September" -10 = "Oktober" -11 = "November" -12 = "Dezember" diff --git a/data/months.toml b/data/months.toml deleted file mode 100644 index ac1c705..0000000 --- a/data/months.toml +++ /dev/null @@ -1,12 +0,0 @@ -1 = "January" -2 = "February" -3 = "March" -4 = "April" -5 = "May" -6 = "June" -7 = "July" -8 = "August" -9 = "September" -10 = "October" -11 = "November" -12 = "December" diff --git a/i18n/de.toml b/i18n/de.toml new file mode 100644 index 0000000..f435888 --- /dev/null +++ b/i18n/de.toml @@ -0,0 +1,13 @@ +[Juni] +other = "Juni" + + +[Freitag] +other = "Freitag" + +[Sonntag] +other = "Sonntag" + + +[Biel] +other = "Biel" diff --git a/i18n/en.toml b/i18n/en.toml new file mode 100644 index 0000000..6c5efd8 --- /dev/null +++ b/i18n/en.toml @@ -0,0 +1,13 @@ +[Juni] +other = "june" + + +[Freitag] +other = "Friday" + +[Sonntag] +other = "Sunday" + + +[Biel] +other = "Biel" diff --git a/i18n/fr.toml b/i18n/fr.toml new file mode 100644 index 0000000..4508664 --- /dev/null +++ b/i18n/fr.toml @@ -0,0 +1,13 @@ +[Juni] +other = "june" + + +[Freitag] +other = "vendredi" + +[Sonntag] +other = "dimanche" + + +[Biel] +other = "Bienne" diff --git a/i18n/it.toml b/i18n/it.toml new file mode 100644 index 0000000..4723dd4 --- /dev/null +++ b/i18n/it.toml @@ -0,0 +1,13 @@ +[Juni] +other = "june" + + +[Freitag] +other = "venerdì" + +[Sonntag] +other = "domenica" + + +[Biel] +other = "Bienna" diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/themes/cosin-theme/layouts/partials/site-sidebar.de.html index bf247e1..1fd0770 100644 --- a/themes/cosin-theme/layouts/partials/site-sidebar.de.html +++ b/themes/cosin-theme/layouts/partials/site-sidebar.de.html @@ -10,11 +10,11 @@

{{ if .date_known }} - Datum: {{ .date_day_start }}.-{{ .date_day_end }}. {{ index $.Site.Data.monate (string .date_month) }} {{ .date_year }}
+ Datum: {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}
{{ end }} {{ if .place_known }} - Ort: {{ .location }} in {{ .city_de }}
+ Ort: {{ .location }} in {{ i18n .city }}
{{ end }} {{ if .registration_open }} diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/themes/cosin-theme/layouts/partials/site-sidebar.en.html index ea65b44..631b3e9 100644 --- a/themes/cosin-theme/layouts/partials/site-sidebar.en.html +++ b/themes/cosin-theme/layouts/partials/site-sidebar.en.html @@ -10,11 +10,11 @@

{{ if .date_known }} - Date: {{ index $.Site.Data.months (string .date_month) }} {{ .date_day_start }}th - {{ .date_day_end }}th {{ .date_year }}
+ Date: {{ i18n .date_month }} {{ .date_day_start }}th - {{ .date_day_end }}th {{ .date_year }}
{{ end }} {{ if .place_known }} - Location: {{ .location }} in {{ .city_en }}
+ Location: {{ .location }} in {{ i18n .city }}
{{ end }} {{ if .registration_open }} diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html index 535d91b..4d4bd4c 100644 --- a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html +++ b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html @@ -10,11 +10,11 @@

{{ if .date_known }} - Date: {{ .date_day_start }}.-{{ .date_day_end }}. {{ index $.Site.Data.mois (string .date_month) }} {{ .date_year }}
+ Date: {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}
{{ end }} {{ if .place_known }} - Lieu: {{ .location }} à {{ .city_fr }}
+ Lieu: {{ .location }} à {{ i18n .city }}
{{ end }} {{ if .registration_open }} diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/themes/cosin-theme/layouts/partials/site-sidebar.it.html index 65b52d3..63ce9b2 100644 --- a/themes/cosin-theme/layouts/partials/site-sidebar.it.html +++ b/themes/cosin-theme/layouts/partials/site-sidebar.it.html @@ -10,11 +10,11 @@

{{ if .date_known }} - Data: {{ .date_day_start }}.-{{ .date_day_end }}. {{ index $.Site.Data.mese (string .date_month) }} {{ .date_year }}
+ Data: {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}
{{ end }} {{ if .place_known }} - Luogo: {{ .location }} a {{ .city_it }}
+ Luogo: {{ .location }} a {{ i18n .city }}
{{ end }} {{ if .registration_open }}