improvements

Author: lunny

options/locale/locale_en-US.ini

@@ -2812,6 +2812,7 @@ team_permission_desc = Permission
 team_unit_desc = Allow Access to Repository Sections
 team_unit_disabled = (Disabled)
 
+form.name_been_taken = The organisation name "%s" has already been taken.
 form.name_reserved = The organization name "%s" is reserved.
 form.name_pattern_not_allowed = The pattern "%s" is not allowed in an organization name.
 form.create_org_not_allowed = You are not allowed to create an organization.

routers/web/org/setting.go

@@ -236,11 +236,11 @@ func SettingsRenamePost(ctx *context.Context) {
 
 	if err := user_service.RenameUser(ctx, ctx.Org.Organization.AsUser(), newOrgName); err != nil {
 		if user_model.IsErrUserAlreadyExist(err) {
-			ctx.JSONError(ctx.Tr("form.username_been_taken"))
+			ctx.JSONError(ctx.Tr("org.form.name_been_taken", newOrgName))
 		} else if db.IsErrNameReserved(err) {
-			ctx.JSONError(ctx.Tr("repo.form.name_reserved"))
+			ctx.JSONError(ctx.Tr("org.form.name_reserved", newOrgName))
 		} else if db.IsErrNamePatternNotAllowed(err) {
-			ctx.JSONError(ctx.Tr("repo.form.name_pattern_not_allowed"))
+			ctx.JSONError(ctx.Tr("org.form.name_pattern_not_allowed", newOrgName))
 		} else {
 			log.Error("RenameOrganization: %v", err)
 			ctx.JSONError(util.Iif(ctx.Doer.IsAdmin, err.Error(), string(ctx.Tr("org.settings.rename_failed"))))

services/forms/org.go

@@ -53,8 +53,8 @@ func (f *UpdateOrgSettingForm) Validate(req *http.Request, errs binding.Errors)
 }
 
 type RenameOrgForm struct {
-	OrgName    string `binding:"Required;Username;MaxSize(40)"`
-	NewOrgName string `binding:"Required;Username;MaxSize(40)"`
+	OrgName    string `binding:"Required"`
+	NewOrgName string `binding:"Required;Username;MaxSize(40)" locale:"org.org_name_holder"`
 }
 
 // ___________