allow different display for different languages

4 files changed, 23 insertions, 8 deletions

diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 1417b09..b1098ba 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,6 +1,9 @@
 {{ define "title" -}}
 {{ if eq .Data.Singular "author" -}}
-  {{ (index ($.Site.Data.authors | default dict) .Title).name.display | default .Title }} · {{ .Site.Title }}
+  {{- $author := (index (.Site.Data.authors | default dict) .Title) -}}
+  {{- $author_lang := (index ($author | default dict) .Site.Language.Lang) -}}
+  {{- $author_name := $author_lang.name.display | default $author.name.display | default .Title -}}
+  {{ $author_name }} · {{ .Site.Title }}
 {{- else -}}
   {{ .Title }} · {{ .Site.Title }}
 {{- end }}
@@ -19,8 +22,11 @@
         <h2 class="archive-name">{{ i18n "category" }}{{ .Title }}</h2>
       </div>
     {{ else if eq .Data.Singular "author" }}
+      {{- $author := (index (.Site.Data.authors | default dict) .Title) -}}
+      {{- $author_lang := (index ($author | default dict) .Site.Language.Lang) -}}
+      {{- $author_name := $author_lang.name.display | default $author.name.display | default .Title -}}
       <div class="archive-title author">
-        <h2 class="archive-name">{{ i18n "author_item" }}{{ (index ($.Site.Data.authors | default dict) .Title).name.display | default .Title }}</h2>
+        <h2 class="archive-name">{{ i18n "author_item" }}{{ $author_name }}</h2>
       </div>
     {{ end }}
   {{ end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 4cd0560..6d7ab65 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,13 +1,13 @@
 {{ define "title" }}{{ i18n .Data.Plural }} - {{ .Site.Title }}{{ end }}
 
 {{ define "content" }}
-  {{ $termName := .Data.Plural }}
+  {{ $termName := .Data.Singular }}
   {{ $terms := .Data.Terms.ByCount }}
   {{ $length := len $terms }}
   {{ $type := .Type }}
 
   <!-- Categories Page -->
-  {{ if and $.Site.Taxonomies.categories (eq $termName "categories") }}
+  {{ if and $.Site.Taxonomies.categories (eq $termName "category") }}
     {{ range $terms }}
     {{ $term := .Term }}
     {{ $pages := .Pages }}
@@ -45,7 +45,7 @@
     {{ end }}
 
   <!-- Tag cloud Page -->
-  {{ else if and $.Site.Taxonomies.tags (eq $termName "tags") }}
+  {{ else if and $.Site.Taxonomies.tags (eq $termName "tag") }}
     {{ $fontUnit := "rem" }}
     {{ $largestFontSize := 2.0 }}
     {{ $largestFontSize := 2.5 }}
@@ -86,7 +86,10 @@
           <div class="collection-title">
             <h2 class="archive-year">
               <a href="{{ .Permalink }}">
-                {{ i18n "author_item" }}{{ (index ($.Site.Data.authors | default dict) $term).name.display | default $term }}
+                {{- $author := (index ($.Site.Data.authors | default dict) $term) -}}
+                {{- $author_lang := (index ($author | default dict) $.Site.Language.Lang) -}}
+                {{- $author_name := $author_lang.name.display | default $author.name.display | default $term -}}
+                {{ i18n "author_item" }}{{ $author_name }}
               </a>
             </h2>
           </div>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 26559c3..a0041f5 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -24,7 +24,11 @@
 
 <!-- author & description & keywords  -->
 {{- if or .Params.author .Site.Author.name -}}
-<meta name="author" content="{{ (index (.Site.Data.authors | default dict) (.Params.author | default .Site.Author.name)).name.display | default .Params.author | default .Site.Author.name | safeHTML }}" />
+{{- $author_id := .Params.author | default .Site.Author.name -}}
+{{- $author := (index ($.Site.Data.authors | default dict) $author_id) -}}
+{{- $author_lang := (index ($author | default dict) .Site.Language.Lang) -}}
+{{- $author_name := $author_lang.name.display | default $author.name.display | default $author_id -}}
+<meta name="author" content="{{ $author_name | safeHTML }}" />
 {{- end -}}
 
 {{- if .Description -}}
diff --git a/layouts/partials/post/copyright.html b/layouts/partials/post/copyright.html
index 231808b..6ecaf99 100644
--- a/layouts/partials/post/copyright.html
+++ b/layouts/partials/post/copyright.html
@@ -4,7 +4,9 @@
     <span class="item-title">{{ i18n "author" }}</span>
     <span class="item-content">
       {{- $author_id := .Params.author | default .Site.Author.name -}}
-      {{- $author_name := (index ($.Site.Data.authors | default dict) $author_id).name.display | default $author_id -}}
+      {{- $author := (index ($.Site.Data.authors | default dict) $author_id) -}}
+      {{- $author_lang := (index ($author | default dict) .Site.Language.Lang) -}}
+      {{- $author_name := $author_lang.name.display | default $author.name.display | default $author_id -}}
       {{- with $.Site.GetPage "taxonomy" (printf "author/%s" $author_id) -}}
       <a href="{{ .Permalink }}">{{ $author_name | safeHTML }}</a>
       {{- else -}}