diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html --- a/website/themes/beastie/layouts/index.html +++ b/website/themes/beastie/layouts/index.html @@ -153,7 +153,7 @@ {{ i18n "more" }}
  • - + {{
  • diff --git a/website/themes/beastie/layouts/news/rss.xml b/website/themes/beastie/layouts/news/rss.xml --- a/website/themes/beastie/layouts/news/rss.xml +++ b/website/themes/beastie/layouts/news/rss.xml @@ -1,19 +1,38 @@ +{{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }} +{{ $rssLanguage := cond (eq $.Language.Lang "en") "en-us" $.Language.Lang }} +{{ $newsData := "" }} +{{ $baseURLWithLang := "" }} +{{ $rssTitle := ""}} + +{{ if (fileExists $newsPath) -}} + {{ $data := index .Site.Data $.Language.Lang }} + {{ $newsData = $data.news }} + {{ if ne $.Language.Lang "en" }} + {{ $baseURLWithLang = printf "%s%s/" $.Site.BaseURL $.Language.Lang }} + {{ $rssTitle = printf " (%s)" $.Language.Lang }} + {{ else }} + {{ $baseURLWithLang = printf "%s" $.Site.BaseURL }} + {{ end }} +{{ else }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} + {{ $newsData = $dataDefaultLanguage.news }} + {{ $baseURLWithLang = printf "%s" $.Site.BaseURL }} +{{ end }} + - FreeBSD News Flash - https://www.FreeBSD.org/news/ + FreeBSD News Flash{{ $rssTitle}} + {{ absLangURL ($baseURLWithLang) }}news/ News from the FreeBSD Project - en-us + {{ $rssLanguage }} freebsd-www@FreeBSD.org (Webmaster Team) freebsd-www@FreeBSD.org (Webmaster Team) https://www.FreeBSD.org/logo/logo-full.png FreeBSD News Flash - https://www.FreeBSD.org/news/ + {{ absLangURL ($baseURLWithLang) }}news/ - - {{ $data := index .Site.Data "en" }} - {{ $newsData := $data.news }} + {{ with $newsData.news }} {{ $newsCounter := 0 }} {{ $newsDayCounter := 1 }} @@ -41,9 +60,9 @@ {{ $description }} {{ end }} - {{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }} - {{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }} - {{ dateFormat "02 Jan 06 15:04 UTC" .date }} + {{ absLangURL ($baseURLWithLang) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }} + {{ absLangURL ($baseURLWithLang) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }} + {{ dateFormat "02 " .date }}{{ index (slice "aaa" "Jan" "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" "Sep" "Oct" "Nov" "Dec") (int (dateFormat "1" .date)) }}{{ dateFormat " 06 15:04 UTC" .date }} {{ $newsCounter = add $newsCounter 1 }} {{ $newsDayPrev = $newsDayCur }}