Add language to JSONFeed and remove spaces before colons.

This commit is contained in:
Fredrik Jonsson 2020-11-13 10:58:20 +01:00
commit 7757584612
2 changed files with 21 additions and 18 deletions

View file

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html class="nojs" lang="{{ .Site.Language.Lang }}" dir="{{ .Site.Language.LanguageDirection | default "ltr" }}"> <html class="nojs" lang="{{ .Site.LanguageCode | default .Site.Language.Lang }}" dir="{{ .Site.Language.LanguageDirection | default "ltr" }}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">

View file

@ -7,44 +7,47 @@
{{- end -}} {{- end -}}
{{ $length := (len $pages) -}} {{ $length := (len $pages) -}}
{ {
"version" : "https://jsonfeed.org/version/1.1", "version": "https://jsonfeed.org/version/1.1",
"title" : "{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} {{ i18n "string_on" }} {{ end }}{{ .Site.Title }}{{ end }}", "title": "{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} {{ i18n "string_on" }} {{ end }}{{ .Site.Title }}{{ end }}",
"description": "{{ i18n "string_recent_content" }} {{ if ne .Title .Site.Title }}{{ with .Title }}{{ i18n "string_in" }} {{ . }} {{ end }}{{ end }}{{ i18n "string_on" }} {{ .Site.Title }}", "description": "{{ i18n "string_recent_content" }} {{ if ne .Title .Site.Title }}{{ with .Title }}{{ i18n "string_in" }} {{ . }} {{ end }}{{ end }}{{ i18n "string_on" }} {{ .Site.Title }}",
"home_page_url" : "{{ .Site.BaseURL }}", "home_page_url": "{{ .Site.BaseURL }}",
{{ with .OutputFormats.Get "JSON" -}} {{ with .OutputFormats.Get "JSON" -}}
"feed_url" : "{{ .Permalink }}", "feed_url": "{{ .Permalink }}",
{{ end -}}
{{ with .Site.LanguageCode -}}
"language": "{{ . }}",
{{ end -}} {{ end -}}
{{ with $.Param "icon" -}} {{ with $.Param "icon" -}}
"icon" : "{{ . | absURL }}", "icon": "{{ . | absURL }}",
{{ end -}} {{ end -}}
{{ with $.Param "favicon" -}} {{ with $.Param "favicon" -}}
"favicon" : "{{ . | absURL }}", "favicon": "{{ . | absURL }}",
{{ end -}} {{ end -}}
{{ with .Site.Author.name -}} {{ with .Site.Author.name -}}
"authors" : [ "authors": [
{ {
"name" : "{{ . }}"{{ with $.Site.Author.url }}, "name": "{{ . }}"{{ with $.Site.Author.url }},
"url": "{{ . }}"{{ end }}{{ with $.Site.Author.avatar }}, "url": "{{ . }}"{{ end }}{{ with $.Site.Author.avatar }},
"avatar": "{{ . | absURL }}"{{ end }} "avatar": "{{ . | absURL }}"{{ end }}
} }
], ],
{{ end -}} {{ end -}}
"items" : [ "items": [
{{ range $index, $element := $pages -}} {{ range $index, $element := $pages -}}
{ {
"title" : {{ .Title | jsonify }}, "title": {{ .Title | jsonify }},
"date_published" : "{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}", "date_published": "{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}",
"date_modified" : "{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}", "date_modified": "{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}",
"id" : "{{ .Permalink }}", "id": "{{ .Permalink }}",
"url" : "{{ .Permalink }}", "url": "{{ .Permalink }}",
{{ with .Params.author -}} {{ with .Params.author -}}
"authors" : [ "authors": [
{ {
"name" : "{{ . }}" "name": "{{ . }}"
} }
], ],
{{ end -}} {{ end -}}
"content_html" : {{ .Content | jsonify }} "content_html": {{ .Content | jsonify }}
}{{ if ne (add $index 1) $length }},{{ end }} }{{ if ne (add $index 1) $length }},{{ end }}
{{ end -}} {{ end -}}
] ]