refactor: i18n for location name, improve preposition

This commit is contained in:
Adrian Friedli 2018-04-30 21:56:02 +02:00
parent 950209c520
commit c6fefbcc06
No known key found for this signature in database
GPG key ID: 72488301A5824477
18 changed files with 27 additions and 19 deletions

View file

@ -23,7 +23,7 @@ voneinander zu lernen und Spass zu haben — nicht nur am Gerät.
Die CoSin findet dieses Jahr vom Die CoSin findet dieses Jahr vom
{{< cosin_i18n "date_start_weekday" >}}, den {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} bis {{< 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 "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" >}} {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}}
statt. statt.
## Wie kann ich mich beteiligen? ## Wie kann ich mich beteiligen?

View file

@ -23,7 +23,7 @@ voneinander zu lernen und Spass zu haben — nicht nur am Gerät.
Die CoSin findet dieses Jahr vom Die CoSin findet dieses Jahr vom
{{< cosin_i18n "date_start_weekday" >}}, den {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} bis {{< 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 "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" >}} {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}}
statt. statt.
## Wie kann ich mich beteiligen? ## Wie kann ich mich beteiligen?

View file

@ -22,7 +22,7 @@ seulement sur leur machines !
Cette année le CoSin aura lieu du Cette année le CoSin aura lieu du
{{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}} {{< cosin_i18n "date_start_month" >}} au {{< 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 "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" >}}. {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) à {{< cosin_i18n "location_city" >}}.
## Comment est-ce que je participe ? ## Comment est-ce que je participe ?

View file

@ -22,7 +22,7 @@ solo al computer.
Quest'anno la CoSin si svolge da Quest'anno la CoSin si svolge da
{{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} fino a {{< 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 "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" >}}. {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}.
## Come posso contribuire? ## Come posso contribuire?

View file

@ -13,7 +13,7 @@ Quest'anno la CoSin si svolge da
{{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} fino a {{< 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_i18n "date_end_weekday" >}} {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}}
{{< cosin "date_year" >}}, {{< cosin "date_year" >}},
{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}. {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}.
## Costi ## Costi

View file

@ -9,7 +9,7 @@ menu:
## Ort ## Ort
Das CoSin findet {{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}][1] in {{< cosin_i18n "location_city" >}} statt. Das CoSin findet {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}][1] in {{< cosin_i18n "location_city" >}} statt.
## Photos ## Photos

View file

@ -9,7 +9,7 @@ menu:
## Location ## Location
This year's CoSin takes place {{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}][1] in {{< cosin_i18n "location_city" >}}. This year's CoSin takes place {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}][1] in {{< cosin_i18n "location_city" >}}.
## Photos ## Photos

View file

@ -9,7 +9,7 @@ menu:
## Lieu ## Lieu
Le CoSin se déroule {{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}][1] à {{< cosin_i18n "location_city" >}}. Le CoSin se déroule {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}][1] à {{< cosin_i18n "location_city" >}}.
## Photos ## Photos

View file

@ -9,7 +9,7 @@ menu:
## Luogo ## Luogo
La CoSin si svolge {{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}][1] a {{< cosin_i18n "location_city" >}}. La CoSin si svolge {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}][1] a {{< cosin_i18n "location_city" >}}.
## Foto ## Foto

View file

@ -18,8 +18,8 @@ date_end_month = "Juni"
location_known = true location_known = true
location_name_preposition = "PrepositionLocationF" location_name = "LocationVillaRitter"
location_name = "Villa Ritter" location_name_preposition = "PrepositionAndArticleForLocationVillaRitter"
location_url = "http://www.villa-ritter.ch/" location_url = "http://www.villa-ritter.ch/"
location_city = "Biel" location_city = "Biel"

View file

@ -11,5 +11,7 @@ other = "Sonntag"
[Biel] [Biel]
other = "Biel" other = "Biel"
[PrepositionLocationF] [LocationVillaRitter]
other = "Villa Ritter"
[PrepositionAndArticleForLocationVillaRitter]
other = "in der" other = "in der"

View file

@ -11,5 +11,7 @@ other = "Sunday"
[Biel] [Biel]
other = "Biel" other = "Biel"
[PrepositionLocationF] [LocationVillaRitter]
other = "Villa Ritter"
[PrepositionAndArticleForLocationVillaRitter]
other = "at the" other = "at the"

View file

@ -11,5 +11,7 @@ other = "dimanche"
[Biel] [Biel]
other = "Bienne" other = "Bienne"
[PrepositionLocationF] [LocationVillaRitter]
other = "Villa Ritter"
[PrepositionAndArticleForLocationVillaRitter]
other = "à la" other = "à la"

View file

@ -11,5 +11,7 @@ other = "domenica"
[Biel] [Biel]
other = "Bienna" other = "Bienna"
[PrepositionLocationF] [LocationVillaRitter]
other = "Villa Ritter"
[PrepositionAndArticleForLocationVillaRitter]
other = "nella" other = "nella"

View file

@ -14,7 +14,7 @@
{{ end }} {{ end }}
{{ if .location_known }} {{ if .location_known }}
<strong>Ort:</strong> {{ .location_name }} in <strong>{{ i18n .location_city }}</strong><br/> <strong>Ort:</strong> {{ i18n .location_name }} in <strong>{{ i18n .location_city }}</strong><br/>
{{ end }} {{ end }}
{{ if .registration_open }} {{ if .registration_open }}

View file

@ -14,7 +14,7 @@
{{ end }} {{ end }}
{{ if .location_known }} {{ if .location_known }}
<strong>Location:</strong> {{ .location_name }} in <strong>{{ i18n .location_city }}</strong><br/> <strong>Location:</strong> {{ i18n .location_name }} in <strong>{{ i18n .location_city }}</strong><br/>
{{ end }} {{ end }}
{{ if .registration_open }} {{ if .registration_open }}

View file

@ -14,7 +14,7 @@
{{ end }} {{ end }}
{{ if .location_known }} {{ if .location_known }}
<strong>Lieu:</strong> {{ .location_name }} à <strong>{{ i18n .location_city }}</strong><br/> <strong>Lieu:</strong> {{ i18n .location_name }} à <strong>{{ i18n .location_city }}</strong><br/>
{{ end }} {{ end }}
{{ if .registration_open }} {{ if .registration_open }}

View file

@ -14,7 +14,7 @@
{{ end }} {{ end }}
{{ if .location_known }} {{ if .location_known }}
<strong>Luogo:</strong> {{ .location_name }} a <strong>{{ i18n .location_city }}</strong><br/> <strong>Luogo:</strong> {{ i18n .location_name }} a <strong>{{ i18n .location_city }}</strong><br/>
{{ end }} {{ end }}
{{ if .registration_open }} {{ if .registration_open }}