From fc02d3c6f7db5a7794448f31fd9d6d81d3d224eb Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Fri, 17 Nov 2023 11:35:28 +0100
Subject: [feature] Set/show instance language(s); show post language on
 frontend (#2362)

* update go text, include text/display

* [feature] Set instance langs, show post lang on frontend

* go fmt

* WebGet

* set language for whole article, don't use FA icon

* mention instance languages + other optional config vars

* little tweak

* put languages in config properly

* warn log language parse

* change some naming around

* tidy up validate a bit

* lint

* rename LanguageTmpl in template
---
 web/template/about.tmpl  | 18 +++++++++++++++++-
 web/template/status.tmpl | 37 ++++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 20 deletions(-)

(limited to 'web/template')

diff --git a/web/template/about.tmpl b/web/template/about.tmpl
index 34fbe2570..6579f492f 100644
--- a/web/template/about.tmpl
+++ b/web/template/about.tmpl
@@ -25,6 +25,22 @@
 			{{.instance.Description |noescape}}
 		</div>
 
+		<div>
+			<h2 id="languages">Languages</h2>
+			<p>
+				{{ if .languages }}
+					This instance prefers the following languages:
+					<ol>
+						{{range .languages}}
+						<li>{{.}}</li>
+						{{end}}
+					</ol>
+				{{ else }}
+					This instance does not have any preferred languages. 
+				{{ end }}
+			</p>
+		</div>
+
 		<div>
 			<h2 id="contact">Admin Contact</h2>
 			{{if .instance.ContactAccount}}
@@ -81,7 +97,7 @@
 		<div>
 			<h2 id="moderated-servers">Moderated servers</h2>
 			<p>
-				ActivityPub instances exchange (federate) data with other servers, including accounts and toots.
+				ActivityPub instances exchange (federate) data with other instances, including accounts and toots.
 				This can be prevented for specific domains by suspending them. None of their content is stored,
 				and interaction with their users is blocked both ways.</br>
 				{{if .blocklistExposed}}
diff --git a/web/template/status.tmpl b/web/template/status.tmpl
index 5e264a339..bf24f6e7c 100644
--- a/web/template/status.tmpl
+++ b/web/template/status.tmpl
@@ -36,15 +36,15 @@
 		{{if .SpoilerText}}
 		<details class="text-spoiler">
 			<summary>
-				<span class="spoiler-text">{{emojify .Emojis (escape .SpoilerText)}}</span>
+				<span class="spoiler-text" lang="{{ .LanguageTag.TagStr }}">{{emojify .Emojis (escape .SpoilerText)}}</span>
 				<span class="button" role="button" tabindex="0">Toggle visibility</span>
 			</summary>
-			<div class="content">
+			<div class="content" lang="{{ .LanguageTag.TagStr }}">
 				{{emojify .Emojis (noescape .Content)}}
 			</div>
 		</details>
 		{{else}}
-		<div class="content">
+		<div class="content" lang="{{ .LanguageTag.TagStr }}">
 			{{emojify .Emojis (noescape .Content)}}
 		</div>
 		{{end}}
@@ -113,30 +113,29 @@
 <aside class="info">
 	<time datetime="{{.CreatedAt}}">{{.CreatedAt | timestampPrecise}}</time>
 	<div class="stats" role="group">
-		<div>
-			<span aria-hidden="true">
-				<i class="fa fa-reply-all"></i> {{.RepliesCount}}
-			</span>
+		<div class="stats-item">
+			<span aria-hidden="true"><i class="fa fa-reply-all"></i> {{.RepliesCount}}</span>
 			<span class="sr-only">{{.RepliesCount}} {{if .RepliesCount | eq 1}}reply{{else}}replies{{end}}</span>
 		</div>
-		<div>
-			<span aria-hidden="true">
-				<i class="fa fa-star"></i> {{.FavouritesCount}}
-			</span>
+		<div class="stats-item">
+			<span aria-hidden="true"><i class="fa fa-star"></i> {{.FavouritesCount}}</span>
 			<span class="sr-only">{{.FavouritesCount}} favourite{{if .FavouritesCount | eq 1 | not}}s{{end}}</span>
 		</div>
-		<div>
-			<span aria-hidden="true">
-				<i class="fa fa-retweet"></i> {{.ReblogsCount}}
-			</span>
+		<div class="stats-item">
+			<span aria-hidden="true"><i class="fa fa-retweet"></i> {{.ReblogsCount}}</span>
 			<span class="sr-only">{{.ReblogsCount}} boost{{if .ReblogsCount | eq 1 | not}}s{{end}}</span>
 		</div>
 		{{if .Pinned}}
-		<div>
-			<i class="fa fa-thumb-tack" aria-hidden="true"></i>
-			<span class="sr-only">pinned</span>
-		</div>
+			<div class="stats-item">
+				<i class="fa fa-thumb-tack" aria-hidden="true"></i>
+				<span class="sr-only">pinned</span>
+			</div>
 		{{end}}
+		{{ if .LanguageTag.DisplayStr }}
+			<div class="stats-item language" title="Language: {{ .LanguageTag.DisplayStr }}">
+				{{ .LanguageTag.TagStr }}
+			</div>
+		{{ end }}
 	</div>
 </aside>
 <a data-nosnippet href="{{.URL}}" class="toot-link">Open
-- 
cgit v1.2.3