diff --git a/website/themes/beastie/layouts/_partials/events.html b/website/themes/beastie/layouts/_partials/events.html index 79148da802..3e7d90bdf0 100644 --- a/website/themes/beastie/layouts/_partials/events.html +++ b/website/themes/beastie/layouts/_partials/events.html @@ -1,32 +1,32 @@ -{{ $eventsPath := (printf "data/%s/events/events.toml" $.Language.Lang (dateFormat "2006" now)) }} +{{ $eventsPath := (printf "data/%s/events/events%s.toml" $.Language.Lang (dateFormat "2006" now)) }} {{ $eventsData := "" }} {{ if (fileExists $eventsPath) -}} {{ $data := index .Site.Data $.Language.Lang }} {{ $eventsData = $data }} {{ else }} {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $eventsData = $dataDefaultLanguage }} {{ end }} {{ with $eventsData }} {{ $eventsCounter := 0 }} {{ range (sort .events "year" "asc") }} {{ if le $eventsCounter 6 }} {{ range (sort .events "startDate" "asc") }} {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}

{{ dateFormat "2006-01-02" .startDate }} - {{ dateFormat "2006-01-02" .endDate }}
{{ .name }}
{{ if or (.city) (.country) }}({{end}}{{ if .city }}{{ .city }},{{ end }} {{ if .country }}{{ .country }}{{ end }}{{ if or (.city) (.country) }}){{end}}

{{ $eventsCounter = add $eventsCounter 1 }} {{ end }} {{ end }} {{ end }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/_partials/press.html b/website/themes/beastie/layouts/_partials/press.html index d3bed55a6f..2cc8b03831 100644 --- a/website/themes/beastie/layouts/_partials/press.html +++ b/website/themes/beastie/layouts/_partials/press.html @@ -1,35 +1,39 @@ {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }} {{ $translatedPressEnabled := false }} +{{ if in (slice "ru" "fr") $.Language.Lang }} + {{ $translatedPressEnabled = true }} +{{ end }} + {{ $pressData := "" }} {{ if $translatedPressEnabled -}} {{ $data := index .Site.Data $.Language.Lang }} {{ $pressData = $data.press }} {{ else }} {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $pressData = $dataDefaultLanguage.press }} {{ end }} {{ with $pressData.press }} {{ $pressCounter := 0 }} {{ $pressMonthCounter := 1 }} {{ $pressMonthPrev := false }} {{ range (sort .press "date" "desc") }} {{ if lt $pressCounter 5 }} {{ $pressMonthCur := dateFormat "2006-01" .date }} {{ if eq $pressMonthCur $pressMonthPrev }} {{ $pressMonthCounter = add $pressMonthCounter 1 }} {{ else }} {{ $pressMonthCounter = 1 }} {{ end }}

{{ dateFormat "2006-01" .date }}
{{ .name }}

{{ $pressCounter = add $pressCounter 1 }} {{ $pressMonthPrev = $pressMonthCur }} {{ end }} {{ end }} {{ end }}