Fix various typos (#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 <art27@cantab.net>
This commit is contained in:
luzpaz 2022-07-12 17:32:37 -04:00 committed by GitHub
parent 966e7bdc9b
commit d29d6d1991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 34 additions and 34 deletions

View File

@ -62,7 +62,7 @@ ENV GITEA_CUSTOM /var/lib/gitea/custom
ENV GITEA_TEMP /tmp/gitea ENV GITEA_TEMP /tmp/gitea
ENV TMPDIR /tmp/gitea ENV TMPDIR /tmp/gitea
#TODO add to docs the ability to define the ini to load (usefull to test and revert a config) #TODO add to docs the ability to define the ini to load (useful to test and revert a config)
ENV GITEA_APP_INI /etc/gitea/app.ini ENV GITEA_APP_INI /etc/gitea/app.ini
ENV HOME "/var/lib/gitea/git" ENV HOME "/var/lib/gitea/git"
VOLUME ["/var/lib/gitea", "/etc/gitea"] VOLUME ["/var/lib/gitea", "/etc/gitea"]

View File

@ -771,7 +771,7 @@ generate-manpage:
@mkdir -p man/man1/ man/man5 @mkdir -p man/man1/ man/man5
@./gitea docs --man > man/man1/gitea.1 @./gitea docs --man > man/man1/gitea.1
@gzip -9 man/man1/gitea.1 && echo man/man1/gitea.1.gz created @gzip -9 man/man1/gitea.1 && echo man/man1/gitea.1.gz created
@#TODO A smal script witch format config-cheat-sheet.en-us.md nicely to suit as config man page @#TODO A small script that formats config-cheat-sheet.en-us.md nicely for use as a config man page
.PHONY: pr\#% .PHONY: pr\#%
pr\#%: clean-all pr\#%: clean-all

View File

@ -102,7 +102,7 @@ NOTES:
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. 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.
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. 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.
https://docs.gitea.io/en-us/translation-guidelines/ https://docs.gitea.io/en-us/translation-guidelines/

View File

@ -82,7 +82,7 @@ var (
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "no-system", Name: "no-system",
Usage: "Do not show system proceses", Usage: "Do not show system processes",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "stacktraces", Name: "stacktraces",

View File

@ -346,7 +346,7 @@ ALLOW_DATA_URI_IMAGES = true
- `ALLOW_DATA_URI_IMAGES`: **false** 允许 data uri 图片 (`<img src="data:image/png;base64,..."/>`)。 - `ALLOW_DATA_URI_IMAGES`: **false** 允许 data uri 图片 (`<img src="data:image/png;base64,..."/>`)。
多个净化规则可以被同时定义只要section名称最后一位不重复即可。如 `[markup.sanitizer.TeX-2]` 多个净化规则可以被同时定义只要section名称最后一位不重复即可。如 `[markup.sanitizer.TeX-2]`
为了针对一种渲染类型进行一个特殊的净化策略,必须使用形如 `[markup.sanitizer.asciidoc.rule-1]` 的方式来命名 seciton。 为了针对一种渲染类型进行一个特殊的净化策略,必须使用形如 `[markup.sanitizer.asciidoc.rule-1]` 的方式来命名 section。
如果此规则没有匹配到任何渲染类型,它将会被应用到所有的渲染类型。 如果此规则没有匹配到任何渲染类型,它将会被应用到所有的渲染类型。
## Time (`time`) ## Time (`time`)

View File

@ -23,7 +23,7 @@ Publish [NuGet](https://www.nuget.org/) packages for your user or organization.
## Requirements ## Requirements
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. 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.
More informations about NuGet clients can be found in [the official documentation](https://docs.microsoft.com/en-us/nuget/install-nuget-client-tools). More information about NuGet clients can be found in [the official documentation](https://docs.microsoft.com/en-us/nuget/install-nuget-client-tools).
The following examples use the `dotnet nuget` tool. The following examples use the `dotnet nuget` tool.
## Configuring the package registry ## Configuring the package registry

View File

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

View File

@ -100,7 +100,7 @@ func TxContext() (*Context, Committer, error) {
} }
// WithTx represents executing database operations on a transaction // WithTx represents executing database operations on a transaction
// you can optionally change the context to a parrent one // you can optionally change the context to a parent one
func WithTx(f func(ctx context.Context) error, stdCtx ...context.Context) error { func WithTx(f func(ctx context.Context) error, stdCtx ...context.Context) error {
parentCtx := DefaultContext parentCtx := DefaultContext
if len(stdCtx) != 0 && stdCtx[0] != nil { if len(stdCtx) != 0 && stdCtx[0] != nil {

View File

@ -62,7 +62,7 @@ func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequ
Find(&prs) Find(&prs)
} }
// CanMaintainerWriteToBranch check whether user is a matainer and could write to the branch // CanMaintainerWriteToBranch check whether user is a maintainer and could write to the branch
func CanMaintainerWriteToBranch(p access_model.Permission, branch string, user *user_model.User) bool { func CanMaintainerWriteToBranch(p access_model.Permission, branch string, user *user_model.User) bool {
if p.CanWrite(unit.TypeCode) { if p.CanWrite(unit.TypeCode) {
return true return true

View File

@ -55,7 +55,7 @@ func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) ([]*r
Find(&repos) Find(&repos)
} }
// AddTeamRepo addes a repo for an organization's team // AddTeamRepo adds a repo for an organization's team
func AddTeamRepo(ctx context.Context, orgID, teamID, repoID int64) error { func AddTeamRepo(ctx context.Context, orgID, teamID, repoID int64) error {
_, err := db.GetEngine(ctx).Insert(&TeamRepo{ _, err := db.GetEngine(ctx).Insert(&TeamRepo{
OrgID: orgID, OrgID: orgID,

View File

@ -23,7 +23,7 @@ import (
// UTF8BOM is the utf-8 byte-order marker // UTF8BOM is the utf-8 byte-order marker
var UTF8BOM = []byte{'\xef', '\xbb', '\xbf'} var UTF8BOM = []byte{'\xef', '\xbb', '\xbf'}
// ToUTF8WithFallbackReader detects the encoding of content and coverts to UTF-8 reader if possible // ToUTF8WithFallbackReader detects the encoding of content and converts to UTF-8 reader if possible
func ToUTF8WithFallbackReader(rd io.Reader) io.Reader { func ToUTF8WithFallbackReader(rd io.Reader) io.Reader {
buf := make([]byte, 2048) buf := make([]byte, 2048)
n, err := util.ReadAtMost(rd, buf) n, err := util.ReadAtMost(rd, buf)
@ -76,7 +76,7 @@ func ToUTF8WithErr(content []byte) (string, error) {
return string(result), err return string(result), err
} }
// ToUTF8WithFallback detects the encoding of content and coverts to UTF-8 if possible // ToUTF8WithFallback detects the encoding of content and converts to UTF-8 if possible
func ToUTF8WithFallback(content []byte) []byte { func ToUTF8WithFallback(content []byte) []byte {
bs, _ := io.ReadAll(ToUTF8WithFallbackReader(bytes.NewReader(content))) bs, _ := io.ReadAll(ToUTF8WithFallbackReader(bytes.NewReader(content)))
return bs return bs
@ -191,7 +191,7 @@ func DetectEncoding(content []byte) (string, error) {
break break
} }
// Otherwise check if this results is earlier in the DetectedCharsetOrder than our current top guesss // Otherwise check if this results is earlier in the DetectedCharsetOrder than our current top guess
resultPriority, resultHas := setting.Repository.DetectedCharsetScore[strings.ToLower(strings.TrimSpace(result.Charset))] resultPriority, resultHas := setting.Repository.DetectedCharsetScore[strings.ToLower(strings.TrimSpace(result.Charset))]
if resultHas && (!has || resultPriority < priority) { if resultHas && (!has || resultPriority < priority) {
topResult = result topResult = result

View File

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

View File

@ -103,7 +103,7 @@ func (m *Manager) getLevelDB(connection string) (*leveldb.DB, error) {
db, ok = m.LevelDBConnections[dataDir] db, ok = m.LevelDBConnections[dataDir]
if ok { if ok {
db.count++ db.count++
log.Warn("Duplicate connnection to level db: %s with different connection strings. Initial connection: %s. This connection: %s", dataDir, db.name[0], connection) log.Warn("Duplicate connection to level db: %s with different connection strings. Initial connection: %s. This connection: %s", dataDir, db.name[0], connection)
db.name = append(db.name, connection) db.name = append(db.name, connection)
m.LevelDBConnections[connection] = db m.LevelDBConnections[connection] = db
return db.db, nil return db.db, nil

View File

@ -60,7 +60,7 @@ func SetLocaleCookie(resp http.ResponseWriter, lang string, expiry int) {
} }
// DeleteLocaleCookie convenience function to delete the locale cookie consistently // DeleteLocaleCookie convenience function to delete the locale cookie consistently
// Setting the lang cookie will trigger the middleware to reset the language ot previous state. // Setting the lang cookie will trigger the middleware to reset the language to previous state.
func DeleteLocaleCookie(resp http.ResponseWriter) { func DeleteLocaleCookie(resp http.ResponseWriter) {
SetCookie(resp, "lang", "", SetCookie(resp, "lang", "",
-1, -1,

View File

@ -25,7 +25,7 @@ func UpdateFuncInfo(ctx context.Context, funcInfo *FuncInfo) {
record.lock.Unlock() record.lock.Unlock()
} }
// MarkLongPolling marks the reuqest is a long-polling request, and the logger may output different message for it // MarkLongPolling marks the request is a long-polling request, and the logger may output different message for it
func MarkLongPolling(resp http.ResponseWriter, req *http.Request) { func MarkLongPolling(resp http.ResponseWriter, req *http.Request) {
record, ok := req.Context().Value(contextKey).(*requestRecord) record, ok := req.Context().Value(contextKey).(*requestRecord)
if !ok { if !ok {

View File

@ -6,7 +6,7 @@
/bazel-* /bazel-*
# Directories for the Bazel IntelliJ plugin containing the generated # Directories for the Bazel IntelliJ plugin containing the generated
# IntelliJ project files and plugin configuration. Seperate directories are # IntelliJ project files and plugin configuration. Separate directories are
# for the IntelliJ, Android Studio and CLion versions of the plugin. # for the IntelliJ, Android Studio and CLion versions of the plugin.
/.ijwb/ /.ijwb/
/.aswb/ /.aswb/

View File

@ -76,7 +76,7 @@ type PackageVersionMetadata struct {
Dist Dist `json:"dist"` Dist Dist `json:"dist"`
} }
// Dist contains package download informations // Dist contains package download information
type Dist struct { type Dist struct {
Type string `json:"type"` Type string `json:"type"`
URL string `json:"url"` URL string `json:"url"`

View File

@ -429,14 +429,14 @@ func uploadFile(ctx *context.Context, fileFilter stringSet, fileKey string) {
ctx.Status(http.StatusCreated) ctx.Status(http.StatusCreated)
} }
// DownloadRecipeFile serves the conent of the requested recipe file // DownloadRecipeFile serves the content of the requested recipe file
func DownloadRecipeFile(ctx *context.Context) { func DownloadRecipeFile(ctx *context.Context) {
rref := ctx.Data[recipeReferenceKey].(*conan_module.RecipeReference) rref := ctx.Data[recipeReferenceKey].(*conan_module.RecipeReference)
downloadFile(ctx, recipeFileList, rref.AsKey()) downloadFile(ctx, recipeFileList, rref.AsKey())
} }
// DownloadPackageFile serves the conent of the requested package file // DownloadPackageFile serves the content of the requested package file
func DownloadPackageFile(ctx *context.Context) { func DownloadPackageFile(ctx *context.Context) {
pref := ctx.Data[packageReferenceKey].(*conan_module.PackageReference) pref := ctx.Data[packageReferenceKey].(*conan_module.PackageReference)

View File

@ -37,7 +37,7 @@ func EnumeratePackages(ctx *context.Context) {
enumeratePackages(ctx, "specs.4.8", packages) enumeratePackages(ctx, "specs.4.8", packages)
} }
// EnumeratePackagesLatest serves the list of the lastest version of every package // EnumeratePackagesLatest serves the list of the latest version of every package
func EnumeratePackagesLatest(ctx *context.Context) { func EnumeratePackagesLatest(ctx *context.Context) {
pvs, _, err := packages_model.SearchLatestVersions(ctx, &packages_model.PackageSearchOptions{ pvs, _, err := packages_model.SearchLatestVersions(ctx, &packages_model.PackageSearchOptions{
OwnerID: ctx.Package.Owner.ID, OwnerID: ctx.Package.Owner.ID,

View File

@ -1440,7 +1440,7 @@ func UpdatePullRequestTarget(ctx *context.Context) {
err := err.(issues_model.ErrPullRequestAlreadyExists) err := err.(issues_model.ErrPullRequestAlreadyExists)
RepoRelPath := ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name RepoRelPath := ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name
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 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
ctx.Flash.Error(errorMessage) ctx.Flash.Error(errorMessage)
ctx.JSON(http.StatusConflict, map[string]interface{}{ ctx.JSON(http.StatusConflict, map[string]interface{}{

View File

@ -98,8 +98,8 @@ func releasesOrTags(ctx *context.Context, isTagList bool) {
listOptions.PageSize = setting.API.MaxResponseItems listOptions.PageSize = setting.API.MaxResponseItems
} }
// TODO(20073) tags are used for compare feature witch needs all tags // TODO(20073) tags are used for compare feature which needs all tags
// filtering is doen at the client side atm // filtering is done on the client-side atm
tagListStart, tagListEnd := 0, 0 tagListStart, tagListEnd := 0, 0
if isTagList { if isTagList {
tagListStart, tagListEnd = listOptions.GetStartEnd() tagListStart, tagListEnd = listOptions.GetStartEnd()
@ -514,12 +514,12 @@ func EditReleasePost(ctx *context.Context) {
ctx.Redirect(ctx.Repo.RepoLink + "/releases") ctx.Redirect(ctx.Repo.RepoLink + "/releases")
} }
// DeleteRelease delete a release // DeleteRelease deletes a release
func DeleteRelease(ctx *context.Context) { func DeleteRelease(ctx *context.Context) {
deleteReleaseOrTag(ctx, false) deleteReleaseOrTag(ctx, false)
} }
// DeleteTag delete a tag // DeleteTag deletes a tag
func DeleteTag(ctx *context.Context) { func DeleteTag(ctx *context.Context) {
deleteReleaseOrTag(ctx, true) deleteReleaseOrTag(ctx, true)
} }

View File

@ -85,7 +85,7 @@ func CorsHandler() func(next http.Handler) http.Handler {
// for users that have already signed in. // for users that have already signed in.
func buildAuthGroup() *auth_service.Group { func buildAuthGroup() *auth_service.Group {
group := auth_service.NewGroup( group := auth_service.NewGroup(
&auth_service.OAuth2{}, // FIXME: this should be removed and only applied in download and oauth realted routers &auth_service.OAuth2{}, // FIXME: this should be removed and only applied in download and oauth related routers
&auth_service.Basic{}, // FIXME: this should be removed and only applied in download and git/lfs routers &auth_service.Basic{}, // FIXME: this should be removed and only applied in download and git/lfs routers
&auth_service.Session{}, &auth_service.Session{},
) )

View File

@ -33,7 +33,7 @@ type webfingerLink struct {
Properties map[string]interface{} `json:"properties,omitempty"` Properties map[string]interface{} `json:"properties,omitempty"`
} }
// WebfingerQuery returns informations about a resource // WebfingerQuery returns information about a resource
// https://datatracker.ietf.org/doc/html/rfc7565 // https://datatracker.ietf.org/doc/html/rfc7565
func WebfingerQuery(ctx *context.Context) { func WebfingerQuery(ctx *context.Context) {
appURL, _ := url.Parse(setting.AppURL) appURL, _ := url.Parse(setting.AppURL)

View File

@ -35,7 +35,7 @@ type GothProvider interface {
GothProviderCreator GothProviderCreator
} }
// ImagedProvider provide an overrided image setting for the provider // ImagedProvider provide an overridden image setting for the provider
type ImagedProvider struct { type ImagedProvider struct {
GothProvider GothProvider
image string image string

View File

@ -254,7 +254,7 @@
{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}} {{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}}
{{/* admin can merge without checks, writer can merge when checkes succeed */}} {{/* admin can merge without checks, writer can merge when checks succeed */}}
{{$canMergeNow := and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}} {{$canMergeNow := and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}}
{{/* admin and writer both can make an auto merge schedule */}} {{/* admin and writer both can make an auto merge schedule */}}

View File

@ -192,7 +192,7 @@ function setLabelColor(label, color) {
} }
/** /**
* Inspired by W3C recommandation https://www.w3.org/TR/WCAG20/#relativeluminancedef * Inspired by W3C recommendation https://www.w3.org/TR/WCAG20/#relativeluminancedef
*/ */
function getRelativeColor(color) { function getRelativeColor(color) {
color /= 255; color /= 255;

View File

@ -68,7 +68,7 @@
.dashboard-repos, .dashboard-repos,
.dashboard-orgs { .dashboard-orgs {
margin: 0 1px; /* Accomodate for Semantic's 1px hacks on .attached elements */ margin: 0 1px; /* Accommodate for Semantic's 1px hacks on .attached elements */
} }
.dashboard-navbar { .dashboard-navbar {