Merge branch 'main' into autoprefixer-1627580155

2021-07-30 16:57:43 +00:00 · 2021-07-30 16:57:43 +00:00 · 3f24fa9627
commit 3f24fa9627
parent 49a3e1a25f 03edbac376
2 changed files with 2 additions and 2 deletions
--- a/i18n/zh-cn.toml
+++ b/i18n/zh-cn.toml
@ -111,4 +111,4 @@ other = "查看证书"
 other = "笔记"

 [disclaimer_text]
-other = "责任通知"
+other = "免责声明"
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@ -137,7 +137,7 @@
    {{ if and $disclaimerEnabled $disclaimer}}
    <hr />
    <div class="container">
-      <p id="disclaimer"><strong>{{ i18n "disclaimer_text" }}:</strong> {{ $disclaimer }}</p>
+      <p id="disclaimer"><strong>{{ i18n "disclaimer_text" }}:</strong> {{ $disclaimer | markdownify }}</p>
    </div>
    {{ end }}
    {{ if $credentialsEnabled }}