From 344b004dd94c60df35663de8c75ae0697b3d95db Mon Sep 17 00:00:00 2001
From: Serghei Iakovlev <egrep@protonmail.ch>
Date: Sun, 22 May 2022 21:30:45 +0200
Subject: Rework setting title logic

---
 layouts/_default/list.atom.xml  |  2 +-
 layouts/_default/list.feed.xml  |  4 ++--
 layouts/_default/list.html      | 15 ---------------
 layouts/_default/list.html.html | 13 +++++++++++++
 layouts/_default/list.json.json |  2 +-
 5 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 layouts/_default/list.html
 create mode 100644 layouts/_default/list.html.html

(limited to 'layouts/_default')

diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index f82bb8b..dc14748 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -15,7 +15,7 @@
 
 {{- safeHTML "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" }}
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xml:lang="{{ site.LanguageCode }}">
-    {{ printf `<title type="html"><![CDATA[%s]]></title>` site.Title | safeHTML }}
+    {{ printf `<title type="html"><![CDATA[%s]]></title>` (partial "title.html" .) | safeHTML }}
     {{ with site.Params.description }}{{ printf `<subtitle type="html"><![CDATA[%s]]></subtitle>` . | safeHTML }}{{ end }}
     {{- $output_formats := .OutputFormats }}
     {{- range $output_formats -}}
diff --git a/layouts/_default/list.feed.xml b/layouts/_default/list.feed.xml
index 5a276ec..c55b19b 100644
--- a/layouts/_default/list.feed.xml
+++ b/layouts/_default/list.feed.xml
@@ -24,13 +24,13 @@
     xmlns:media="http://search.yahoo.com/mrss/"
     xml:lang="{{ site.LanguageCode }}">
     <channel>
-        {{ printf `<title type="html"><![CDATA[%s RSS 2.0]]></title>` site.Title | safeHTML }}
+        {{ printf `<title type="html"><![CDATA[%s]]></title>` (partial "title.html" .) | safeHTML }}
     </channel>
     <link type="text/html">{{ site.BaseURL | absURL }}</link>
     {{ $logo := resources.Get (site.Params.assets.logo | default "/img/open-graph-logo.png") }}{{ $logo = $logo.Resize "96x96" }}
     <image>
         <url>{{ $logo.Permalink | absURL }}</url>
-        {{ printf `<title type="html"><![CDATA[%s RSS 2.0]]></title>` site.Title | safeHTML }}
+        {{ printf `<title type="html"><![CDATA[%s]]></title>` (partial "title.html" .) | safeHTML }}
         <link>{{ site.BaseURL | absURL }}</link>
         <width>{{ $logo.Width }}</width>
         <height>{{ $logo.Height }}</height>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
deleted file mode 100644
index 3a1d953..0000000
--- a/layouts/_default/list.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{{ define "main" }}
-<div class="articles">
-    {{- with .Title }}
-    <h1 class="page-title">{{ . }}</h1>
-    {{- end }}
-    {{- with .Content }}
-    <div class="category-content">
-        {{ .Content }}
-    </div>
-    {{- end }}
-    {{ range .Paginator.Pages }}
-    {{- .Render "teaser" }}
-    {{ end }}
-</div>
-{{ end }}
diff --git a/layouts/_default/list.html.html b/layouts/_default/list.html.html
new file mode 100644
index 0000000..13f2947
--- /dev/null
+++ b/layouts/_default/list.html.html
@@ -0,0 +1,13 @@
+{{ define "main" }}
+<div class="articles">
+    {{ with .Title }}<h1 class="page-title">{{ . }}</h1>{{ end }}
+    {{- with .Content }}
+    <div class="category-content">
+        {{ .Content }}
+    </div>
+    {{- end }}
+    {{ range .Paginator.Pages }}
+    {{- .Render "teaser" }}
+    {{ end }}
+</div>
+{{ end }}
diff --git a/layouts/_default/list.json.json b/layouts/_default/list.json.json
index 6151211..bfcb852 100644
--- a/layouts/_default/list.json.json
+++ b/layouts/_default/list.json.json
@@ -15,7 +15,7 @@
 
 {
   "version": "https://jsonfeed.org/version/1.1",
-  "title": {{ (printf "%s JSON Feed" site.Title) | htmlUnescape | jsonify }},
+  "title": {{ (printf "%s" (partial "title.html" .)) | htmlUnescape | jsonify }},{{/* TODO: Translate title */}}
   "home_page_url": {{ printf "%s?utm_source=json_feed" site.BaseURL  | absURL | jsonify }},
   {{ with .OutputFormats.Get "JSON" }}"feed_url": {{ .Permalink | absURL | jsonify }},{{ end }}
   {{ with site.Params.description}}"description": {{ site.Params.description | jsonify }},{{ end }}
-- 
cgit v1.2.3