themes/default/layouts/partials/count: Use more generic decoupled terms

25 files changed, 41 insertions, 41 deletions

diff --git a/themes/default/layouts/_default/home.archives.html b/themes/default/layouts/_default/home.archives.html
index 0e9cfb7..e34d450 100644
--- a/themes/default/layouts/_default/home.archives.html
+++ b/themes/default/layouts/_default/home.archives.html
@@ -1,5 +1,5 @@
-{{- define "title" -}}Message Archive — {{- end -}}
-{{- define "description" -}}This page contains an archive of all messages — {{- end -}}
+{{- define "title" -}}Archives — {{ end -}}
+{{- define "description" -}}An archive of all items — {{ end -}}
 {{- define "styles" -}}
 <style>
   {{ partial "navigator.css.html" (dict "Link" "/archives/messages/") | safeCSS }}
@@ -14,7 +14,7 @@
       "Id"         "back"
       "Title"      "Archives"
       "Icon"       "arrow-left"
-      "Subtitle"   (partial "count-total-messages.html" .)
+      "Subtitle"   (print (partial "count.html" .) " " "Total")
       "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
diff --git a/themes/default/layouts/_default/home.authors.html b/themes/default/layouts/_default/home.authors.html
index ee24585..87ebc3c 100644
--- a/themes/default/layouts/_default/home.authors.html
+++ b/themes/default/layouts/_default/home.authors.html
@@ -1,5 +1,5 @@
-{{- define "title" -}}Authors &mdash; {{- end -}}
-{{- define "description" -}}This page contains a list of all authors &mdash; {{- end -}}
+{{- define "title" -}}Authors &mdash; {{ end -}}
+{{- define "description" -}}A list of all authors &mdash; {{ end -}}
 {{- define "styles" -}}
 <style>
   {{ partial "navigator.css.html" (dict "Link" "/authors/") | safeCSS }}
@@ -10,7 +10,7 @@
   {{- partial "navigator-middle.html"
     (dict
       "Title"      "Authors"
-      "Subtitle"   (partial "count-authors.html" .)
+      "Subtitle"   (print (partial "count-authors.html" .) " " "Total")
       "Icon"       "arrow-left"
       "IconLabel"  "Back"
       "Href"       "/"
diff --git a/themes/default/layouts/_default/home.sources.html b/themes/default/layouts/_default/home.sources.html
index cea3826..eeb629c 100644
--- a/themes/default/layouts/_default/home.sources.html
+++ b/themes/default/layouts/_default/home.sources.html
@@ -1,5 +1,5 @@
-{{- define "title" -}}Sources &mdash; {{- end -}}
-{{- define "description" -}}This page contains a list of all source files &mdash; {{- end -}}
+{{- define "title" -}}Sources &mdash; {{ end -}}
+{{- define "description" -}}A list of all sources &mdash; {{ end -}}
 {{- define "styles" -}}
 <style>
   {{ partial "navigator.css.html" (dict "Link" "/sources/") | safeCSS }}
@@ -24,7 +24,7 @@
   {{- partial "navigator-middle.html"
     (dict
       "Title"      "Sources"
-      "Subtitle"   (print $fileCount " " "Files")
+      "Subtitle"   (print $fileCount " " "Total")
       "Icon"       "arrow-left"
       "IconLabel"  "Back"
       "Href"       "/"
diff --git a/themes/default/layouts/_default/index.html b/themes/default/layouts/_default/index.html
index 8382c57..f1ab369 100644
--- a/themes/default/layouts/_default/index.html
+++ b/themes/default/layouts/_default/index.html
@@ -9,7 +9,7 @@
     (dict
       "Context"   .
       "Title"     "Home"
-      "Subtitle"  (partial "count-total-messages.html" .)
+      "Subtitle"  (print (partial "count.html" .) " " "Total")
       "IconLabel" (and (gt .Paginator.PageNumber 1) "Back")
       "Id"        (and (gt .Paginator.PageNumber 1) "back")
       "Icon"      (and (gt .Paginator.PageNumber 1) "arrow-left")
diff --git a/themes/default/layouts/_default/section.drafts.html b/themes/default/layouts/_default/section.drafts.html
index d797ec9..e7d56a1 100644
--- a/themes/default/layouts/_default/section.drafts.html
+++ b/themes/default/layouts/_default/section.drafts.html
@@ -30,7 +30,7 @@
       "Id"         "back"
       "Title"      "Drafts"
       "Icon"       "arrow-left"
-      "Subtitle"   (partial "count-drafts.html" .)
+      "Subtitle"   (print (partial "count-drafts.html" .) " " "Total")
       "Href"       (or (and (gt $paginator.PageNumber 1) ($paginator.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
@@ -43,7 +43,7 @@
     {{- partial "render-embed.html" . -}}
   {{- else -}}
     <footer>
-      <code>No drafts found!</code>
+      <code>No items found!</code>
     </footer>
   {{- end -}}
 {{- end -}}
diff --git a/themes/default/layouts/_default/section.feeds.html b/themes/default/layouts/_default/section.feeds.html
index 0cb6dd9..30ef7ed 100644
--- a/themes/default/layouts/_default/section.feeds.html
+++ b/themes/default/layouts/_default/section.feeds.html
@@ -24,7 +24,7 @@
       "Id"         "back"
       "Title"      "Feeds"
       "Icon"       "arrow-left"
-      "Subtitle"   (partial "count-feeds.html" .)
+      "Subtitle"   (print (partial "count-feeds.html" .) " " "Total")
       "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
@@ -37,7 +37,7 @@
     {{- partial "render-embed.html" . -}}
   {{- else -}}
   <footer>
-    <code>No feeds found!</code>
+    <code>No items found!</code>
   </footer>
   {{- end -}}
   {{- $writeToFile := partial "function-generate-feeds" . -}}
diff --git a/themes/default/layouts/_default/section.html b/themes/default/layouts/_default/section.html
index 856f57d..ba4c133 100644
--- a/themes/default/layouts/_default/section.html
+++ b/themes/default/layouts/_default/section.html
@@ -26,7 +26,7 @@
       "Title"      $author.name
       "Icon"       "arrow-left"
       "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
-      "Subtitle"   (print (lang.FormatNumberCustom 0 .Paginator.TotalNumberOfElements) " " "Messages")
+      "Subtitle"   (print (lang.FormatNumberCustom 0 .Paginator.TotalNumberOfElements) " " "Total")
     )
   -}}
 
@@ -40,7 +40,7 @@
     {{- partial "render-embed.html" . -}}
   {{- else -}}
     <footer>
-      <code>No messages found!</code>
+      <code>No items found!</code>
     </footer>
   {{- end -}}
 {{- end -}}
diff --git a/themes/default/layouts/_default/section.likes.html b/themes/default/layouts/_default/section.likes.html
index f2d5877..130765a 100644
--- a/themes/default/layouts/_default/section.likes.html
+++ b/themes/default/layouts/_default/section.likes.html
@@ -30,7 +30,7 @@
       "Id"         "back"
       "Title"      "Likes"
       "Icon"       "arrow-left"
-      "Subtitle"   (partial "count-likes.html" .)
+      "Subtitle"   (print (partial "count-likes.html" .) " " "Total")
       "Href"       (or (and (gt $paginator.PageNumber 1) ($paginator.Prev.URL | absURL)) "/")
     )
   -}}
@@ -43,7 +43,7 @@
     {{- partial "render-embed.html" . -}}
   {{- else -}}
     <footer>
-      <code>No likes found!</code>
+      <code>No items found!</code>
     </footer>
   {{- end -}}
 {{- end -}}
diff --git a/themes/default/layouts/_default/section.media.html b/themes/default/layouts/_default/section.media.html
index 4063f83..5c2c05e 100644
--- a/themes/default/layouts/_default/section.media.html
+++ b/themes/default/layouts/_default/section.media.html
@@ -20,7 +20,7 @@
   {{- partial "navigator-middle.html"
     (dict
       "Title"      "Media"
-      "Subtitle"   (partial "count-media.html" .)
+      "Subtitle"   (print (partial "count-media.html" .) " " "Total")
       "Icon"       "arrow-left"
       "IconLabel"  "Back"
       "Href"       "/"
@@ -55,7 +55,7 @@
 
   {{- if not $count -}}
   <footer>
-    <code>No media found!</code>
+    <code>No items found!</code>
   </footer>
   {{- end -}}
 {{- end -}}
diff --git a/themes/default/layouts/_default/single.html b/themes/default/layouts/_default/single.html
index 892a55f..b257617 100644
--- a/themes/default/layouts/_default/single.html
+++ b/themes/default/layouts/_default/single.html
@@ -7,7 +7,7 @@
 {{- define "header" -}}
   {{- partial "navigator-middle.html"
     (dict
-      "Title"      "Message"
+      "Title"      "Post"
       "Subtitle"   "Thread"
       "Icon"       "arrow-left"
       "IconLabel"  "Back"
diff --git a/themes/default/layouts/_default/taxonomy.html b/themes/default/layouts/_default/taxonomy.html
index 849e2b1..9ec1cb7 100644
--- a/themes/default/layouts/_default/taxonomy.html
+++ b/themes/default/layouts/_default/taxonomy.html
@@ -12,7 +12,7 @@
       "Id"         "back"
       "Title"      "Tags"
       "Icon"       "arrow-left"
-      "Subtitle"   (partial "count-tags.html" .)
+      "Subtitle"   (print (partial "count-tags.html" .) " " "Total")
       "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
@@ -21,7 +21,7 @@
 {{- define "middle" -}}
   <tag-deck>
     {{- range .Paginator.Pages -}}
-      {{- $count := len .Data.Pages -}}
+      {{- $count := lang.FormatNumberCustom 0 (len .Data.Pages) -}}
       {{- $title := lower .Title -}}
 
       {{- range first 1 .Pages -}}
diff --git a/themes/default/layouts/_default/term.html b/themes/default/layouts/_default/term.html
index df0c92e..6455b40 100644
--- a/themes/default/layouts/_default/term.html
+++ b/themes/default/layouts/_default/term.html
@@ -12,7 +12,7 @@
       "Id"         "back"
       "Icon"       "arrow-left"
       "Title"      (print "#" .Title)
-      "Subtitle"   (print (lang.FormatNumberCustom 0 (len .Data.Pages)) " " "Messages")
+      "Subtitle"   (print (lang.FormatNumberCustom 0 (len .Data.Pages)) " " "Total")
       "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
diff --git a/themes/default/layouts/partials/author-list.html b/themes/default/layouts/partials/author-list.html
index 1e26c33..619b1b3 100644
--- a/themes/default/layouts/partials/author-list.html
+++ b/themes/default/layouts/partials/author-list.html
@@ -11,7 +11,7 @@
    {{- $authors.Content | safeHTML -}}
   {{- else -}}
     <footer>
-      <code>No authors found!</code>
+      <code>No items found!</code>
     </footer>
   {{- end -}}
   </aside>
diff --git a/themes/default/layouts/partials/count-authors.html b/themes/default/layouts/partials/count-authors.html
index 2b46b52..8f2d7ef 100644
--- a/themes/default/layouts/partials/count-authors.html
+++ b/themes/default/layouts/partials/count-authors.html
@@ -1,2 +1,2 @@
 {{- $authors := partial "function-authors-slice.html" . -}}
-{{- print (lang.FormatNumberCustom 0 (len $authors)) " " "Authors" -}}
+{{- print (lang.FormatNumberCustom 0 (len $authors)) -}}
diff --git a/themes/default/layouts/partials/count-drafts.html b/themes/default/layouts/partials/count-drafts.html
index e2d93e9..95f04ed 100644
--- a/themes/default/layouts/partials/count-drafts.html
+++ b/themes/default/layouts/partials/count-drafts.html
@@ -9,4 +9,4 @@
   {{- $count = add $count 1 -}}
 {{- end -}}
 
-{{- print (lang.FormatNumberCustom 0 $count) " " "Drafts" -}}
+{{- print (lang.FormatNumberCustom 0 $count) -}}
diff --git a/themes/default/layouts/partials/count-feeds.html b/themes/default/layouts/partials/count-feeds.html
index 5bcac19..b3053e2 100644
--- a/themes/default/layouts/partials/count-feeds.html
+++ b/themes/default/layouts/partials/count-feeds.html
@@ -9,4 +9,4 @@
   {{- $count = add $count 1 -}}
 {{- end -}}
 
-{{- print (lang.FormatNumberCustom 0 $count) " " "Messages" -}}
+{{- print (lang.FormatNumberCustom 0 $count) -}}
diff --git a/themes/default/layouts/partials/count-likes.html b/themes/default/layouts/partials/count-likes.html
index 7a241f3..e9a2d09 100644
--- a/themes/default/layouts/partials/count-likes.html
+++ b/themes/default/layouts/partials/count-likes.html
@@ -9,4 +9,4 @@
   {{- $count = add $count 1 -}}
 {{- end -}}
 
-{{- print (lang.FormatNumberCustom 0 $count) " " "Messages" -}}
+{{- print (lang.FormatNumberCustom 0 $count) -}}
diff --git a/themes/default/layouts/partials/count-media.html b/themes/default/layouts/partials/count-media.html
index 2e9c206..02e755e 100644
--- a/themes/default/layouts/partials/count-media.html
+++ b/themes/default/layouts/partials/count-media.html
@@ -17,4 +17,4 @@
   {{- end -}}
 {{- end -}}
 
-{{- print (lang.FormatNumberCustom 0 $count) " " "Messages" -}}
+{{- print (lang.FormatNumberCustom 0 $count) -}}
diff --git a/themes/default/layouts/partials/count-tags.html b/themes/default/layouts/partials/count-tags.html
index 0ef6802..6d436c6 100644
--- a/themes/default/layouts/partials/count-tags.html
+++ b/themes/default/layouts/partials/count-tags.html
@@ -1 +1 @@
-{{- print (lang.FormatNumberCustom 0 (len .Site.Taxonomies.tags)) " " "Tags" -}}
+{{- print (lang.FormatNumberCustom 0 (len .Site.Taxonomies.tags)) -}}
diff --git a/themes/default/layouts/partials/count-total-messages.html b/themes/default/layouts/partials/count-total-messages.html
deleted file mode 100644
index 10540a7..0000000
--- a/themes/default/layouts/partials/count-total-messages.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ $messages := len .Site.RegularPages }}
-{{ print (lang.FormatNumberCustom 0 $messages) " " "Messages" }}
diff --git a/themes/default/layouts/partials/count.html b/themes/default/layouts/partials/count.html
new file mode 100644
index 0000000..b561439
--- /dev/null
+++ b/themes/default/layouts/partials/count.html
@@ -0,0 +1,2 @@
+{{- $count := len .Site.RegularPages -}}
+{{- print (lang.FormatNumberCustom 0 $count) -}}
diff --git a/themes/default/layouts/partials/following-list.html b/themes/default/layouts/partials/following-list.html
index 6682a72..4cdb69c 100644
--- a/themes/default/layouts/partials/following-list.html
+++ b/themes/default/layouts/partials/following-list.html
@@ -26,7 +26,7 @@
    {{- end -}}
   {{- else -}}
     <footer>
-      <code>No feeds found!</code>
+      <code>No items found!</code>
     </footer>
   {{- end -}}
   </aside>
diff --git a/themes/default/layouts/partials/gallery.html b/themes/default/layouts/partials/gallery.html
index 8aaa2c8..135aa14 100644
--- a/themes/default/layouts/partials/gallery.html
+++ b/themes/default/layouts/partials/gallery.html
@@ -7,7 +7,7 @@
       {{- (resources.Get $gallery).Content | safeHTML -}}
     {{- else -}}
       <footer>
-        <code>No media found!</code>
+        <code>No items found!</code>
       </footer>
   {{- end -}}
   </aside>
diff --git a/themes/default/layouts/partials/profile-tabs.html b/themes/default/layouts/partials/profile-tabs.html
index e665855..5da84e9 100644
--- a/themes/default/layouts/partials/profile-tabs.html
+++ b/themes/default/layouts/partials/profile-tabs.html
@@ -3,12 +3,12 @@
 
 <tab-bar>
   <nav>
-    <a data-label="{{ $label = "Messages" }}{{ $label }}" href="{{ .Site.BaseURL }}/{{ $author.user }}/">{{ $label }}</a>
-    <a data-label="{{ $label = "Feeds" }}{{ $label }}"    href="{{ .Site.BaseURL }}/{{ $author.user }}/feeds/">{{ $label }}</a>
-    <a data-label="{{ $label = "Media" }}{{ $label }}"    href="{{ .Site.BaseURL }}/{{ $author.user }}/media/">{{ $label }}</a>
-    <a data-label="{{ $label = "Likes" }}{{ $label }}"    href="{{ .Site.BaseURL }}/{{ $author.user }}/likes/">{{ $label }}</a>
+    <a data-label="{{ $label = "Posts" }}{{ $label }}"  href="{{ .Site.BaseURL }}/{{ $author.user }}/">{{ $label }}</a>
+    <a data-label="{{ $label = "Feeds" }}{{ $label }}"  href="{{ .Site.BaseURL }}/{{ $author.user }}/feeds/">{{ $label }}</a>
+    <a data-label="{{ $label = "Media" }}{{ $label }}"  href="{{ .Site.BaseURL }}/{{ $author.user }}/media/">{{ $label }}</a>
+    <a data-label="{{ $label = "Likes" }}{{ $label }}"  href="{{ .Site.BaseURL }}/{{ $author.user }}/likes/">{{ $label }}</a>
     {{- if .Site.BuildDrafts }}
-    <a data-label="{{ $label = "Drafts" }}{{ $label }}"   href="{{ .Site.BaseURL }}/{{ $author.user }}/drafts/" data-draft="" >{{ $label }}</a>
+    <a data-label="{{ $label = "Drafts" }}{{ $label }}" href="{{ .Site.BaseURL }}/{{ $author.user }}/drafts/" data-draft="" >{{ $label }}</a>
     {{- end }}
   </nav>
 </tab-bar>
diff --git a/themes/default/layouts/partials/webring.html b/themes/default/layouts/partials/webring.html
index 9179280..009e2fc 100644
--- a/themes/default/layouts/partials/webring.html
+++ b/themes/default/layouts/partials/webring.html
@@ -9,7 +9,7 @@
     </aside>
   {{ else }}
     <footer>
-      <code>No content found!</code>
+      <code>No items found!</code>
     </footer>
   {{ end }}
 </web-ring>