troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 12:49:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request 'English fixes and improvements' (#2631) from 0ko/forgejo:english20240311 into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2631
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-03-19 08:09:27 +00:00
commit c16866d4a5
4 changed files with 501 additions and 500 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

2
templates/admin/auth/edit.tmpl
View file

@ -438,7 +438,7 @@
{{ctx.Locale.Tr "admin.auths.tips"}}
</h4>
<div class="ui attached segment">
<h5>GMail Settings:</h5>
<h5>{{ctx.Locale.Tr "admin.auths.tips.gmail_settings"}}</h5>
<p>Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true</p>
<h5 class="oauth2">{{ctx.Locale.Tr "admin.auths.tips.oauth2.general"}}:</h5>

2
templates/admin/auth/new.tmpl
View file

@ -82,7 +82,7 @@
{{ctx.Locale.Tr "admin.auths.tips"}}
</h4>
<div class="ui attached segment">
<h5>GMail Settings:</h5>
<h5>{{ctx.Locale.Tr "admin.auths.tips.gmail_settings"}}</h5>
<p>Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true</p>
<h5 class="oauth2">{{ctx.Locale.Tr "admin.auths.tips.oauth2.general"}}:</h5>

2
tests/integration/repo_test.go
View file

@ -383,7 +383,7 @@ func TestRepoHTMLTitle(t *testing.T) {
defer tests.PrintCurrentTest(t)()
htmlTitle := GetHTMLTitle(t, nil, "/user2/repo1/pulls")
assert.EqualValues(t, "Pull Requests - user2/repo1 - Gitea: Git with a cup of tea", htmlTitle)
assert.EqualValues(t, "Pull requests - user2/repo1 - Gitea: Git with a cup of tea", htmlTitle)
})
t.Run("View pull request", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()