diff --git a/config/_default/languages.en.toml b/config/_default/languages.en.toml index e3abc850..81e84ca9 100644 --- a/config/_default/languages.en.toml +++ b/config/_default/languages.en.toml @@ -1,6 +1,6 @@ disabled = false -languageCode = "en" -languageName = "English" +locale = "en" +label = "English" weight = 1 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.de.toml b/exampleSite/config/_default/languages.de.toml index 97e04231..033d3023 100644 --- a/exampleSite/config/_default/languages.de.toml +++ b/exampleSite/config/_default/languages.de.toml @@ -1,5 +1,5 @@ -languageCode = "de" -languageName = "Deutsch" +locale = "de" +label = "Deutsch" weight = 3 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.en.toml b/exampleSite/config/_default/languages.en.toml index 625760f3..5b5b3b0e 100644 --- a/exampleSite/config/_default/languages.en.toml +++ b/exampleSite/config/_default/languages.en.toml @@ -1,5 +1,5 @@ -languageCode = "en" -languageName = "English" +locale = "en" +label = "English" weight = 1 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.es.toml b/exampleSite/config/_default/languages.es.toml index 04fe2660..06ee2c97 100644 --- a/exampleSite/config/_default/languages.es.toml +++ b/exampleSite/config/_default/languages.es.toml @@ -1,5 +1,5 @@ -languageCode = "es" -languageName = "Español" +locale = "es" +label = "Español" weight = 6 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.fr.toml b/exampleSite/config/_default/languages.fr.toml index efdc8ad4..e40d78b7 100644 --- a/exampleSite/config/_default/languages.fr.toml +++ b/exampleSite/config/_default/languages.fr.toml @@ -1,5 +1,5 @@ -languageCode = "fr" -languageName = "Français" +locale = "fr" +label = "Français" weight = 2 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.it.toml b/exampleSite/config/_default/languages.it.toml index 50812a9c..b2eaace9 100644 --- a/exampleSite/config/_default/languages.it.toml +++ b/exampleSite/config/_default/languages.it.toml @@ -1,5 +1,5 @@ -languageCode = "it" -languageName = "Italiano" +locale = "it" +label = "Italiano" weight = 4 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.ja.toml b/exampleSite/config/_default/languages.ja.toml index 14bbffba..b8b9ce1d 100644 --- a/exampleSite/config/_default/languages.ja.toml +++ b/exampleSite/config/_default/languages.ja.toml @@ -1,5 +1,5 @@ -languageCode = "ja" -languageName = "日本語" +locale = "ja" +label = "日本語" weight = 8 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.pt-br.toml b/exampleSite/config/_default/languages.pt-br.toml index 50bd9489..114b3f3c 100644 --- a/exampleSite/config/_default/languages.pt-br.toml +++ b/exampleSite/config/_default/languages.pt-br.toml @@ -1,5 +1,5 @@ -languageCode = "pt-br" -languageName = "Português (Brasil)" +locale = "pt-br" +label = "Português (Brasil)" weight = 6 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.pt-pt.toml b/exampleSite/config/_default/languages.pt-pt.toml index 97205cf7..3088dab6 100644 --- a/exampleSite/config/_default/languages.pt-pt.toml +++ b/exampleSite/config/_default/languages.pt-pt.toml @@ -1,5 +1,5 @@ -languageCode = "pt-pt" -languageName = "Português (Portugal)" +locale = "pt-pt" +label = "Português (Portugal)" weight = 5 title = "Blowfish" diff --git a/exampleSite/config/_default/languages.zh-cn.toml b/exampleSite/config/_default/languages.zh-cn.toml index 106ad5c9..59973679 100644 --- a/exampleSite/config/_default/languages.zh-cn.toml +++ b/exampleSite/config/_default/languages.zh-cn.toml @@ -1,5 +1,5 @@ -languageCode = "zh-cn" -languageName = "简体中文" +locale = "zh-cn" +label = "简体中文" weight = 9 title = "Blowfish" diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 44c6acfe..8939fb31 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,6 +1,6 @@ - {{ with .Site.Language.Params.htmlCode | default .Site.LanguageCode }} + {{ with .Site.Language.Params.htmlCode | default .Site.Language.Locale }} {{ end }} diff --git a/layouts/partials/meta/likes.html b/layouts/partials/meta/likes.html index 3b8f0659..1a9e7036 100644 --- a/layouts/partials/meta/likes.html +++ b/layouts/partials/meta/likes.html @@ -9,7 +9,7 @@ {{ with .File }} {{ $path := .Path }} {{ range $translations }} - {{ $lang := print "." .Lang ".md" }} + {{ $lang := print "." .Language.Name ".md" }} {{ $path = replace $path $lang ".md" }} {{ end }} {{ $id = delimit (slice "likes_" $path) "" }} diff --git a/layouts/partials/meta/views.html b/layouts/partials/meta/views.html index e6d4d61f..45ab6e2b 100644 --- a/layouts/partials/meta/views.html +++ b/layouts/partials/meta/views.html @@ -9,7 +9,7 @@ {{ with .File }} {{ $path := .Path }} {{ range $translations }} - {{ $lang := print "." .Lang ".md" }} + {{ $lang := print "." .Language.Name ".md" }} {{ $path = replace $path $lang ".md" }} {{ end }} {{ $id = delimit (slice "views_" $path) "" }} diff --git a/layouts/partials/schema.html b/layouts/partials/schema.html index 470511ec..76d6ea0c 100644 --- a/layouts/partials/schema.html +++ b/layouts/partials/schema.html @@ -6,7 +6,7 @@ "@id": {{ site.Home.Permalink | safeURL }}, "name": "{{ .Site.Title | safeJS }}", {{ with .Site.Params.description }}"description": "{{ . | safeJS }}",{{ end }} - {{ with .Site.LanguageCode }}"inLanguage": "{{ . }}",{{ end }} + {{ with .Site.Language.Locale }}"inLanguage": "{{ . }}",{{ end }} "url": {{ site.Home.Permalink | safeURL }}, {{ with .Site.Params.keywords }}"keywords": {{ . }},{{ end }} "publisher" : { @@ -25,7 +25,7 @@ "name": "{{ .Title | safeJS }}", "headline": "{{ .Title | safeJS }}", {{ with .Description }}"description": "{{ . | safeJS }}",{{ end }} - {{ with .Site.LanguageCode }}"inLanguage": "{{ . }}",{{ end }} + {{ with .Site.Language.Locale }}"inLanguage": "{{ . }}",{{ end }} "url" : {{ .Permalink }}, "author" : { "@type": "Person",