Skip to content

Commit 7bcd116

Browse files
luzpazzeripath
authored and
Sysoev, Vladimir
committed
Fix various typos (go-gitea#20338)
* Fix various typos Found via `codespell -q 3 -S ./options/locale,./options/license,./public/vendor -L actived,allways,attachements,ba,befores,commiter,pullrequest,pullrequests,readby,splitted,te,unknwon` Co-authored-by: zeripath <[email protected]>
1 parent 9dbfa5a commit 7bcd116

File tree

27 files changed

+34
-34
lines changed

27 files changed

+34
-34
lines changed

Dockerfile.rootless

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ ENV GITEA_CUSTOM /var/lib/gitea/custom
6262
ENV GITEA_TEMP /tmp/gitea
6363
ENV TMPDIR /tmp/gitea
6464

65-
#TODO add to docs the ability to define the ini to load (usefull to test and revert a config)
65+
#TODO add to docs the ability to define the ini to load (useful to test and revert a config)
6666
ENV GITEA_APP_INI /etc/gitea/app.ini
6767
ENV HOME "/var/lib/gitea/git"
6868
VOLUME ["/var/lib/gitea", "/etc/gitea"]

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ generate-manpage:
771771
@mkdir -p man/man1/ man/man5
772772
@./gitea docs --man > man/man1/gitea.1
773773
@gzip -9 man/man1/gitea.1 && echo man/man1/gitea.1.gz created
774-
@#TODO A smal script witch format config-cheat-sheet.en-us.md nicely to suit as config man page
774+
@#TODO A small script that formats config-cheat-sheet.en-us.md nicely for use as a config man page
775775

776776
.PHONY: pr\#%
777777
pr\#%: clean-all

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ NOTES:
102102

103103
Translations are done through Crowdin. If you want to translate to a new language ask one of the managers in the Crowdin project to add a new language there.
104104

105-
You can also just create an issue for adding a language or ask on discord on the #translation channel. If you need context or find some translation issues, you can leave a comment on the string or ask on Discord. For general translation questions there is a section in the docs. Currently a bit empty but we hope fo fill it as questions pop up.
105+
You can also just create an issue for adding a language or ask on discord on the #translation channel. If you need context or find some translation issues, you can leave a comment on the string or ask on Discord. For general translation questions there is a section in the docs. Currently a bit empty but we hope to fill it as questions pop up.
106106

107107
https://docs.gitea.io/en-us/translation-guidelines/
108108

cmd/manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ var (
8282
},
8383
cli.BoolFlag{
8484
Name: "no-system",
85-
Usage: "Do not show system proceses",
85+
Usage: "Do not show system processes",
8686
},
8787
cli.BoolFlag{
8888
Name: "stacktraces",

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ ALLOW_DATA_URI_IMAGES = true
346346
- `ALLOW_DATA_URI_IMAGES`: **false** 允许 data uri 图片 (`<img src="data:image/png;base64,..."/>`)。
347347

348348
多个净化规则可以被同时定义,只要section名称最后一位不重复即可。如: `[markup.sanitizer.TeX-2]`
349-
为了针对一种渲染类型进行一个特殊的净化策略,必须使用形如 `[markup.sanitizer.asciidoc.rule-1]` 的方式来命名 seciton
349+
为了针对一种渲染类型进行一个特殊的净化策略,必须使用形如 `[markup.sanitizer.asciidoc.rule-1]` 的方式来命名 section
350350
如果此规则没有匹配到任何渲染类型,它将会被应用到所有的渲染类型。
351351

352352
## Time (`time`)

docs/content/doc/packages/nuget.en-us.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Publish [NuGet](https://www.nuget.org/) packages for your user or organization.
2323
## Requirements
2424

2525
To work with the NuGet package registry, you can use command-line interface tools as well as NuGet features in various IDEs like Visual Studio.
26-
More informations about NuGet clients can be found in [the official documentation](https://docs.microsoft.com/en-us/nuget/install-nuget-client-tools).
26+
More information about NuGet clients can be found in [the official documentation](https://docs.microsoft.com/en-us/nuget/install-nuget-client-tools).
2727
The following examples use the `dotnet nuget` tool.
2828

2929
## Configuring the package registry

integrations/dump_restore_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func (c *compareDump) assertEquals(repoBefore, repoAfter *repo_model.Repository)
201201
"Assignees": {ignore: true}, // not implemented yet
202202
"Head": {nested: comparePullRequestBranch},
203203
"Base": {nested: comparePullRequestBranch},
204-
"Labels": {ignore: true}, // because org labels are not handled propery
204+
"Labels": {ignore: true}, // because org labels are not handled properly
205205
}).([]*base.PullRequest)
206206
assert.True(c.t, ok)
207207
assert.GreaterOrEqual(c.t, len(prs), 1)

models/db/context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func TxContext() (*Context, Committer, error) {
100100
}
101101

102102
// WithTx represents executing database operations on a transaction
103-
// you can optionally change the context to a parrent one
103+
// you can optionally change the context to a parent one
104104
func WithTx(f func(ctx context.Context) error, stdCtx ...context.Context) error {
105105
parentCtx := DefaultContext
106106
if len(stdCtx) != 0 && stdCtx[0] != nil {

models/issues/pull_list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequ
6262
Find(&prs)
6363
}
6464

65-
// CanMaintainerWriteToBranch check whether user is a matainer and could write to the branch
65+
// CanMaintainerWriteToBranch check whether user is a maintainer and could write to the branch
6666
func CanMaintainerWriteToBranch(p access_model.Permission, branch string, user *user_model.User) bool {
6767
if p.CanWrite(unit.TypeCode) {
6868
return true

models/organization/team_repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) ([]*r
5555
Find(&repos)
5656
}
5757

58-
// AddTeamRepo addes a repo for an organization's team
58+
// AddTeamRepo adds a repo for an organization's team
5959
func AddTeamRepo(ctx context.Context, orgID, teamID, repoID int64) error {
6060
_, err := db.GetEngine(ctx).Insert(&TeamRepo{
6161
OrgID: orgID,

modules/charset/charset.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
// UTF8BOM is the utf-8 byte-order marker
2424
var UTF8BOM = []byte{'\xef', '\xbb', '\xbf'}
2525

26-
// ToUTF8WithFallbackReader detects the encoding of content and coverts to UTF-8 reader if possible
26+
// ToUTF8WithFallbackReader detects the encoding of content and converts to UTF-8 reader if possible
2727
func ToUTF8WithFallbackReader(rd io.Reader) io.Reader {
2828
buf := make([]byte, 2048)
2929
n, err := util.ReadAtMost(rd, buf)
@@ -76,7 +76,7 @@ func ToUTF8WithErr(content []byte) (string, error) {
7676
return string(result), err
7777
}
7878

79-
// ToUTF8WithFallback detects the encoding of content and coverts to UTF-8 if possible
79+
// ToUTF8WithFallback detects the encoding of content and converts to UTF-8 if possible
8080
func ToUTF8WithFallback(content []byte) []byte {
8181
bs, _ := io.ReadAll(ToUTF8WithFallbackReader(bytes.NewReader(content)))
8282
return bs
@@ -191,7 +191,7 @@ func DetectEncoding(content []byte) (string, error) {
191191
break
192192
}
193193

194-
// Otherwise check if this results is earlier in the DetectedCharsetOrder than our current top guesss
194+
// Otherwise check if this results is earlier in the DetectedCharsetOrder than our current top guess
195195
resultPriority, resultHas := setting.Repository.DetectedCharsetScore[strings.ToLower(strings.TrimSpace(result.Charset))]
196196
if resultHas && (!has || resultPriority < priority) {
197197
topResult = result

modules/doctor/breaking.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func iterateUserAccounts(ctx context.Context, each func(*user.User) error) error
3232
// Ref: https://github.com/go-gitea/gitea/pull/19085 & https://github.com/go-gitea/gitea/pull/17688
3333
func checkUserEmail(ctx context.Context, logger log.Logger, _ bool) error {
3434
// We could use quirky SQL to get all users that start without a [a-zA-Z0-9], but that would mean
35-
// DB provider-specific SQL and only works _now_. So instead we iterate trough all user accounts and
36-
// use the user.ValidateEmail function to be future-proof.
35+
// DB provider-specific SQL and only works _now_. So instead we iterate through all user accounts
36+
// and use the user.ValidateEmail function to be future-proof.
3737
var invalidUserCount int64
3838
if err := iterateUserAccounts(ctx, func(u *user.User) error {
3939
// Only check for users, skip

modules/nosql/manager_leveldb.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (m *Manager) getLevelDB(connection string) (*leveldb.DB, error) {
103103
db, ok = m.LevelDBConnections[dataDir]
104104
if ok {
105105
db.count++
106-
log.Warn("Duplicate connnection to level db: %s with different connection strings. Initial connection: %s. This connection: %s", dataDir, db.name[0], connection)
106+
log.Warn("Duplicate connection to level db: %s with different connection strings. Initial connection: %s. This connection: %s", dataDir, db.name[0], connection)
107107
db.name = append(db.name, connection)
108108
m.LevelDBConnections[connection] = db
109109
return db.db, nil

modules/web/middleware/locale.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func SetLocaleCookie(resp http.ResponseWriter, lang string, expiry int) {
6060
}
6161

6262
// DeleteLocaleCookie convenience function to delete the locale cookie consistently
63-
// Setting the lang cookie will trigger the middleware to reset the language ot previous state.
63+
// Setting the lang cookie will trigger the middleware to reset the language to previous state.
6464
func DeleteLocaleCookie(resp http.ResponseWriter) {
6565
SetCookie(resp, "lang", "",
6666
-1,

modules/web/routing/context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func UpdateFuncInfo(ctx context.Context, funcInfo *FuncInfo) {
2525
record.lock.Unlock()
2626
}
2727

28-
// MarkLongPolling marks the reuqest is a long-polling request, and the logger may output different message for it
28+
// MarkLongPolling marks the request is a long-polling request, and the logger may output different message for it
2929
func MarkLongPolling(resp http.ResponseWriter, req *http.Request) {
3030
record, ok := req.Context().Value(contextKey).(*requestRecord)
3131
if !ok {

options/gitignore/Bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/bazel-*
77

88
# Directories for the Bazel IntelliJ plugin containing the generated
9-
# IntelliJ project files and plugin configuration. Seperate directories are
9+
# IntelliJ project files and plugin configuration. Separate directories are
1010
# for the IntelliJ, Android Studio and CLion versions of the plugin.
1111
/.ijwb/
1212
/.aswb/

routers/api/packages/composer/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ type PackageVersionMetadata struct {
7676
Dist Dist `json:"dist"`
7777
}
7878

79-
// Dist contains package download informations
79+
// Dist contains package download information
8080
type Dist struct {
8181
Type string `json:"type"`
8282
URL string `json:"url"`

routers/api/packages/conan/conan.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -429,14 +429,14 @@ func uploadFile(ctx *context.Context, fileFilter stringSet, fileKey string) {
429429
ctx.Status(http.StatusCreated)
430430
}
431431

432-
// DownloadRecipeFile serves the conent of the requested recipe file
432+
// DownloadRecipeFile serves the content of the requested recipe file
433433
func DownloadRecipeFile(ctx *context.Context) {
434434
rref := ctx.Data[recipeReferenceKey].(*conan_module.RecipeReference)
435435

436436
downloadFile(ctx, recipeFileList, rref.AsKey())
437437
}
438438

439-
// DownloadPackageFile serves the conent of the requested package file
439+
// DownloadPackageFile serves the content of the requested package file
440440
func DownloadPackageFile(ctx *context.Context) {
441441
pref := ctx.Data[packageReferenceKey].(*conan_module.PackageReference)
442442

routers/api/packages/rubygems/rubygems.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func EnumeratePackages(ctx *context.Context) {
3737
enumeratePackages(ctx, "specs.4.8", packages)
3838
}
3939

40-
// EnumeratePackagesLatest serves the list of the lastest version of every package
40+
// EnumeratePackagesLatest serves the list of the latest version of every package
4141
func EnumeratePackagesLatest(ctx *context.Context) {
4242
pvs, _, err := packages_model.SearchLatestVersions(ctx, &packages_model.PackageSearchOptions{
4343
OwnerID: ctx.Package.Owner.ID,

routers/web/repo/pull.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ func UpdatePullRequestTarget(ctx *context.Context) {
14401440
err := err.(issues_model.ErrPullRequestAlreadyExists)
14411441

14421442
RepoRelPath := ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name
1443-
errorMessage := ctx.Tr("repo.pulls.has_pull_request", html.EscapeString(ctx.Repo.RepoLink+"/pulls/"+strconv.FormatInt(err.IssueID, 10)), html.EscapeString(RepoRelPath), err.IssueID) // FIXME: Creates url insidde locale string
1443+
errorMessage := ctx.Tr("repo.pulls.has_pull_request", html.EscapeString(ctx.Repo.RepoLink+"/pulls/"+strconv.FormatInt(err.IssueID, 10)), html.EscapeString(RepoRelPath), err.IssueID) // FIXME: Creates url inside locale string
14441444

14451445
ctx.Flash.Error(errorMessage)
14461446
ctx.JSON(http.StatusConflict, map[string]interface{}{

routers/web/repo/release.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ func releasesOrTags(ctx *context.Context, isTagList bool) {
9898
listOptions.PageSize = setting.API.MaxResponseItems
9999
}
100100

101-
// TODO(20073) tags are used for compare feature witch needs all tags
102-
// filtering is doen at the client side atm
101+
// TODO(20073) tags are used for compare feature which needs all tags
102+
// filtering is done on the client-side atm
103103
tagListStart, tagListEnd := 0, 0
104104
if isTagList {
105105
tagListStart, tagListEnd = listOptions.GetStartEnd()
@@ -514,12 +514,12 @@ func EditReleasePost(ctx *context.Context) {
514514
ctx.Redirect(ctx.Repo.RepoLink + "/releases")
515515
}
516516

517-
// DeleteRelease delete a release
517+
// DeleteRelease deletes a release
518518
func DeleteRelease(ctx *context.Context) {
519519
deleteReleaseOrTag(ctx, false)
520520
}
521521

522-
// DeleteTag delete a tag
522+
// DeleteTag deletes a tag
523523
func DeleteTag(ctx *context.Context) {
524524
deleteReleaseOrTag(ctx, true)
525525
}

routers/web/web.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func CorsHandler() func(next http.Handler) http.Handler {
8585
// for users that have already signed in.
8686
func buildAuthGroup() *auth_service.Group {
8787
group := auth_service.NewGroup(
88-
&auth_service.OAuth2{}, // FIXME: this should be removed and only applied in download and oauth realted routers
88+
&auth_service.OAuth2{}, // FIXME: this should be removed and only applied in download and oauth related routers
8989
&auth_service.Basic{}, // FIXME: this should be removed and only applied in download and git/lfs routers
9090
&auth_service.Session{},
9191
)

routers/web/webfinger.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type webfingerLink struct {
3333
Properties map[string]interface{} `json:"properties,omitempty"`
3434
}
3535

36-
// WebfingerQuery returns informations about a resource
36+
// WebfingerQuery returns information about a resource
3737
// https://datatracker.ietf.org/doc/html/rfc7565
3838
func WebfingerQuery(ctx *context.Context) {
3939
appURL, _ := url.Parse(setting.AppURL)

services/auth/source/oauth2/providers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type GothProvider interface {
3535
GothProviderCreator
3636
}
3737

38-
// ImagedProvider provide an overrided image setting for the provider
38+
// ImagedProvider provide an overridden image setting for the provider
3939
type ImagedProvider struct {
4040
GothProvider
4141
image string

templates/repo/issue/view_content/pull.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254

255255
{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}}
256256

257-
{{/* admin can merge without checks, writer can merge when checkes succeed */}}
257+
{{/* admin can merge without checks, writer can merge when checks succeed */}}
258258
{{$canMergeNow := and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}}
259259
{{/* admin and writer both can make an auto merge schedule */}}
260260

web_src/js/features/repo-projects.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function setLabelColor(label, color) {
192192
}
193193

194194
/**
195-
* Inspired by W3C recommandation https://www.w3.org/TR/WCAG20/#relativeluminancedef
195+
* Inspired by W3C recommendation https://www.w3.org/TR/WCAG20/#relativeluminancedef
196196
*/
197197
function getRelativeColor(color) {
198198
color /= 255;

web_src/less/_dashboard.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
.dashboard-repos,
7070
.dashboard-orgs {
71-
margin: 0 1px; /* Accomodate for Semantic's 1px hacks on .attached elements */
71+
margin: 0 1px; /* Accommodate for Semantic's 1px hacks on .attached elements */
7272
}
7373

7474
.dashboard-navbar {

0 commit comments

Comments
 (0)