From 41cebeb8fa1ed6d03e0fc74d3724131d479d6964 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 28 Apr 2020 01:03:15 +0200
Subject: [PATCH] Make error pages translatable (#11163)

* make error pages translatable

* dont translate ":"

* link need Safe
---
 options/locale/locale_en-US.ini | 4 ++++
 templates/status/404.tmpl       | 2 +-
 templates/status/500.tmpl       | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 2a4789e22..d85dc39a8 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -82,6 +82,10 @@ loading = Loading…
 
 error404 = The page you are trying to reach either <strong>does not exist</strong> or <strong>you are not authorized</strong> to view it.
 
+[error]
+occurred = An error has occurred
+report_message = If you are sure this is a Gitea bug, please search for issue on <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> and open new issue if necessary.
+
 [startpage]
 app_desc = A painless, self-hosted Git service
 install = Easy to install
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index bb5ac1d5c..bd739280d 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -5,6 +5,6 @@
 	<div class="ui divider"></div>
 	<br>
 	<p>{{.i18n.Tr "error404" | Safe}}
-	{{if .ShowFooterVersion}}<p>Application Version: {{AppVer}}</p>{{end}}
+	{{if .ShowFooterVersion}}<p>{{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
index 1dc7061d4..c66897822 100644
--- a/templates/status/500.tmpl
+++ b/templates/status/500.tmpl
@@ -3,9 +3,9 @@
 	<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/500.png" alt="500"/></p>
 	<div class="ui divider"></div>
 	<br>
-	{{if .ErrorMsg}}<p>An error has occurred :</p>
+	{{if .ErrorMsg}}<p>{{.i18n.Tr "error.occurred"}}:</p>
 	<pre style="text-align: left">{{.ErrorMsg}}</pre>{{end}}
-	{{if .ShowFooterVersion}}<p>Application Version: {{AppVer}}</p>{{end}}
-	{{if .IsAdmin}}<p>If you are sure this is Gitea bug, please search for issue on <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> and open new issue if necessary.</p>{{end}}
+	{{if .ShowFooterVersion}}<p>{{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
+	{{if .IsAdmin}}<p>{{.i18n.Tr "error.report_message"  | Safe}}</p>{{end}}
 </div>
 {{template "base/footer" .}}