Skip to content

Fix typo overrided -> overridden #20687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 7, 2022
Merged

Fix typo overrided -> overridden #20687

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2af810
Fix typo overrided -> overridden
luzpaz Aug 5, 2022
ff9e26d
Merge branch 'main' into typo/overrided
techknowlogick Aug 5, 2022
d879c7a
Merge branch 'main' into typo/overrided
lunny Aug 6, 2022
0913b20
Merge branch 'main' into typo/overrided
techknowlogick Aug 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ func setAppHelpTemplates() {
}

func adjustHelpTemplate(originalTemplate string) string {
overrided := ""
overridden := ""
if _, ok := os.LookupEnv("GITEA_CUSTOM"); ok {
overrided = "(GITEA_CUSTOM)"
overridden = "(GITEA_CUSTOM)"
}

return fmt.Sprintf(`%s
Expand All @@ -183,7 +183,7 @@ DEFAULT CONFIGURATION:
AppPath: %s
AppWorkPath: %s

`, originalTemplate, setting.CustomPath, overrided, setting.CustomConf, setting.AppPath, setting.AppWorkPath)
`, originalTemplate, setting.CustomPath, overridden, setting.CustomConf, setting.AppPath, setting.AppWorkPath)
}

func formatBuiltWith() string {
Expand Down