diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2a4789e22e..d85dc39a89 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 does not exist or you are not authorized 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 GitHub 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 bb5ac1d5c6..bd739280d7 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -5,6 +5,6 @@

{{.i18n.Tr "error404" | Safe}} - {{if .ShowFooterVersion}}

Application Version: {{AppVer}}

{{end}} + {{if .ShowFooterVersion}}

{{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}

{{end}} {{template "base/footer" .}} diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index 1dc7061d45..c66897822a 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -3,9 +3,9 @@

500


- {{if .ErrorMsg}}

An error has occurred :

+ {{if .ErrorMsg}}

{{.i18n.Tr "error.occurred"}}:

{{.ErrorMsg}}
{{end}} - {{if .ShowFooterVersion}}

Application Version: {{AppVer}}

{{end}} - {{if .IsAdmin}}

If you are sure this is Gitea bug, please search for issue on GitHub and open new issue if necessary.

{{end}} + {{if .ShowFooterVersion}}

{{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}

{{end}} + {{if .IsAdmin}}

{{.i18n.Tr "error.report_message" | Safe}}

{{end}} {{template "base/footer" .}}