From b23f5d45c351505d2fe25681b9cadc7ceb0314fc Mon Sep 17 00:00:00 2001 From: yshyuk Date: Thu, 26 Feb 2026 02:22:35 +0900 Subject: [PATCH 1/2] Fix typos and grammar in English locale and related Go code - Rename "enterred" to "entered" in locale keys and Go source files - Fix subject-verb agreement: "enables" -> "enable", "gives" -> "give" - Improve awkward phrasing: "Don't be shy to be a contributor" -> "Don't hesitate to contribute" Ref #35015 Signed-off-by: yshyuk --- options/locale/locale_en-US.json | 14 +++++++------- routers/web/org/setting.go | 4 ++-- routers/web/repo/setting/setting.go | 14 +++++++------- routers/web/user/setting/account.go | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index bcd28f2deba8d..8ac5815409a60 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -225,7 +225,7 @@ "startpage.lightweight": "Lightweight", "startpage.lightweight_desc": "Gitea has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy!", "startpage.license": "Open Source", - "startpage.license_desc": "Go get %[2]s! Join us by contributing to make this project even better. Don't be shy to be a contributor!", + "startpage.license_desc": "Go get %[2]s! Join us by contributing to make this project even better. Don't hesitate to contribute!", "install.install": "Installation", "install.installing_desc": "Installing now, please wait…", "install.title": "Initial Configuration", @@ -579,10 +579,10 @@ "form.password_uppercase_one": "At least one uppercase character", "form.password_digit_one": "At least one digit", "form.password_special_one": "At least one special character (punctuation, brackets, quotes, etc.)", - "form.enterred_invalid_repo_name": "The repository name you entered is incorrect.", - "form.enterred_invalid_org_name": "The organization name you entered is incorrect.", - "form.enterred_invalid_owner_name": "The new owner name is not valid.", - "form.enterred_invalid_password": "The password you entered is incorrect.", + "form.entered_invalid_repo_name": "The repository name you entered is incorrect.", + "form.entered_invalid_org_name": "The organization name you entered is incorrect.", + "form.entered_invalid_owner_name": "The new owner name is not valid.", + "form.entered_invalid_password": "The password you entered is incorrect.", "form.unset_password": "The login user has not set the password.", "form.unsupported_login_type": "The login type is not supported to delete account.", "form.user_not_exist": "The user does not exist.", @@ -872,7 +872,7 @@ "settings.permissions_list": "Permissions:", "settings.manage_oauth2_applications": "Manage OAuth2 Applications", "settings.edit_oauth2_application": "Edit OAuth2 Application", - "settings.oauth2_applications_desc": "OAuth2 applications enables your third-party application to securely authenticate users at this Gitea instance.", + "settings.oauth2_applications_desc": "OAuth2 applications enable your third-party application to securely authenticate users at this Gitea instance.", "settings.remove_oauth2_application": "Remove OAuth2 Application", "settings.remove_oauth2_application_desc": "Removing an OAuth2 application will revoke access to all signed access tokens. Continue?", "settings.remove_oauth2_application_success": "The application has been deleted.", @@ -891,7 +891,7 @@ "settings.oauth2_regenerate_secret_hint": "Lost your secret?", "settings.oauth2_client_secret_hint": "The secret will not be shown again after you leave or refresh this page. Please ensure that you have saved it.", "settings.oauth2_application_edit": "Edit", - "settings.oauth2_application_create_description": "OAuth2 applications gives your third-party application access to user accounts on this instance.", + "settings.oauth2_application_create_description": "OAuth2 applications give your third-party application access to user accounts on this instance.", "settings.oauth2_application_remove_description": "Removing an OAuth2 application will prevent it from accessing authorized user accounts on this instance. Continue?", "settings.oauth2_application_locked": "Gitea pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected behavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information.", "settings.authorized_oauth2_applications": "Authorized OAuth2 Applications", diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 04baa58b73416..e51b62ccd0e7a 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -124,7 +124,7 @@ func SettingsDeleteAvatar(ctx *context.Context) { // SettingsDeleteOrgPost response for deleting an organization func SettingsDeleteOrgPost(ctx *context.Context) { if ctx.Org.Organization.Name != ctx.FormString("org_name") { - ctx.JSONError(ctx.Tr("form.enterred_invalid_org_name")) + ctx.JSONError(ctx.Tr("form.entered_invalid_org_name")) return } @@ -205,7 +205,7 @@ func SettingsRenamePost(ctx *context.Context) { oldOrgName, newOrgName := ctx.Org.Organization.Name, form.NewOrgName if form.OrgName != oldOrgName { - ctx.JSONError(ctx.Tr("form.enterred_invalid_org_name")) + ctx.JSONError(ctx.Tr("form.entered_invalid_org_name")) return } if newOrgName == oldOrgName { diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 8475c8e21e226..368562ee3d7f0 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -733,7 +733,7 @@ func handleSettingsPostConvert(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) return } @@ -767,7 +767,7 @@ func handleSettingsPostConvertFork(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) return } @@ -803,14 +803,14 @@ func handleSettingsPostTransfer(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) return } newOwner, err := user_model.GetUserByName(ctx, ctx.FormString("new_owner_name")) if err != nil { if user_model.IsErrUserNotExist(err) { - ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_owner_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_owner_name"), tplSettingsOptions, nil) return } ctx.ServerError("IsUserExist", err) @@ -820,7 +820,7 @@ func handleSettingsPostTransfer(ctx *context.Context) { if newOwner.Type == user_model.UserTypeOrganization { if !ctx.Doer.IsAdmin && newOwner.Visibility == structs.VisibleTypePrivate && !organization.OrgFromUser(newOwner).HasMemberWithUserID(ctx, ctx.Doer.ID) { // The user shouldn't know about this organization - ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_owner_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_owner_name"), tplSettingsOptions, nil) return } } @@ -895,7 +895,7 @@ func handleSettingsPostDelete(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) return } @@ -922,7 +922,7 @@ func handleSettingsPostDeleteWiki(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) return } diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index b333f364627ca..f3ab0ed53bedf 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -263,7 +263,7 @@ func DeleteAccount(ctx *context.Context) { case errors.As(err, &db.ErrUserPasswordInvalid{}): loadAccountData(ctx) - ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_password"), tplSettingsAccount, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_password"), tplSettingsAccount, nil) default: ctx.ServerError("UserSignIn", err) } From e56c60c66e3b753e4f31610cb5da0034f92d4b6b Mon Sep 17 00:00:00 2001 From: yshyuk Date: Sat, 28 Feb 2026 01:15:18 +0900 Subject: [PATCH 2/2] Revert locale key renames to avoid re-translation of all languages Co-Authored-By: Claude Opus 4.6 --- options/locale/locale_en-US.json | 8 ++++---- routers/web/org/setting.go | 4 ++-- routers/web/repo/setting/setting.go | 14 +++++++------- routers/web/user/setting/account.go | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index 8ac5815409a60..cdf1170460172 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -579,10 +579,10 @@ "form.password_uppercase_one": "At least one uppercase character", "form.password_digit_one": "At least one digit", "form.password_special_one": "At least one special character (punctuation, brackets, quotes, etc.)", - "form.entered_invalid_repo_name": "The repository name you entered is incorrect.", - "form.entered_invalid_org_name": "The organization name you entered is incorrect.", - "form.entered_invalid_owner_name": "The new owner name is not valid.", - "form.entered_invalid_password": "The password you entered is incorrect.", + "form.enterred_invalid_repo_name": "The repository name you entered is incorrect.", + "form.enterred_invalid_org_name": "The organization name you entered is incorrect.", + "form.enterred_invalid_owner_name": "The new owner name is not valid.", + "form.enterred_invalid_password": "The password you entered is incorrect.", "form.unset_password": "The login user has not set the password.", "form.unsupported_login_type": "The login type is not supported to delete account.", "form.user_not_exist": "The user does not exist.", diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index e51b62ccd0e7a..04baa58b73416 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -124,7 +124,7 @@ func SettingsDeleteAvatar(ctx *context.Context) { // SettingsDeleteOrgPost response for deleting an organization func SettingsDeleteOrgPost(ctx *context.Context) { if ctx.Org.Organization.Name != ctx.FormString("org_name") { - ctx.JSONError(ctx.Tr("form.entered_invalid_org_name")) + ctx.JSONError(ctx.Tr("form.enterred_invalid_org_name")) return } @@ -205,7 +205,7 @@ func SettingsRenamePost(ctx *context.Context) { oldOrgName, newOrgName := ctx.Org.Organization.Name, form.NewOrgName if form.OrgName != oldOrgName { - ctx.JSONError(ctx.Tr("form.entered_invalid_org_name")) + ctx.JSONError(ctx.Tr("form.enterred_invalid_org_name")) return } if newOrgName == oldOrgName { diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 368562ee3d7f0..8475c8e21e226 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -733,7 +733,7 @@ func handleSettingsPostConvert(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) return } @@ -767,7 +767,7 @@ func handleSettingsPostConvertFork(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) return } @@ -803,14 +803,14 @@ func handleSettingsPostTransfer(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) return } newOwner, err := user_model.GetUserByName(ctx, ctx.FormString("new_owner_name")) if err != nil { if user_model.IsErrUserNotExist(err) { - ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_owner_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_owner_name"), tplSettingsOptions, nil) return } ctx.ServerError("IsUserExist", err) @@ -820,7 +820,7 @@ func handleSettingsPostTransfer(ctx *context.Context) { if newOwner.Type == user_model.UserTypeOrganization { if !ctx.Doer.IsAdmin && newOwner.Visibility == structs.VisibleTypePrivate && !organization.OrgFromUser(newOwner).HasMemberWithUserID(ctx, ctx.Doer.ID) { // The user shouldn't know about this organization - ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_owner_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_owner_name"), tplSettingsOptions, nil) return } } @@ -895,7 +895,7 @@ func handleSettingsPostDelete(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) return } @@ -922,7 +922,7 @@ func handleSettingsPostDeleteWiki(ctx *context.Context) { return } if repo.Name != form.RepoName { - ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_repo_name"), tplSettingsOptions, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil) return } diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index f3ab0ed53bedf..b333f364627ca 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -263,7 +263,7 @@ func DeleteAccount(ctx *context.Context) { case errors.As(err, &db.ErrUserPasswordInvalid{}): loadAccountData(ctx) - ctx.RenderWithErrDeprecated(ctx.Tr("form.entered_invalid_password"), tplSettingsAccount, nil) + ctx.RenderWithErrDeprecated(ctx.Tr("form.enterred_invalid_password"), tplSettingsAccount, nil) default: ctx.ServerError("UserSignIn", err) }