Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make error pages translatable (#11163)

Browse source 
* make error pages translatable

* dont translate ":"

* link need Safe
This commit is contained in:
6543 2020-04-28 01:03:15 +02:00 committed by GitHub
parent 6a3de9e25f
commit 41cebeb8fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
options/locale/locale_en-US.ini
View file

@ -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

2
templates/status/404.tmpl
View file

@ -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" .}}

6
templates/status/500.tmpl
View file

@ -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" .}}