Merge branch 'master' of https://github.com/gogits/gogs

Conflicts:
	routers/repo/download.go

1 files changed, 10 insertions, 7 deletions

diff --git a/routers/org/org.go b/routers/org/org.go
index ab589832..ed4f2abd 100644
--- a/routers/org/org.go
+++ b/routers/org/org.go
@@ -65,19 +65,22 @@ func CreatePost(ctx *middleware.Context, form auth.CreateOrgForm) {
 	}
 
 	var err error
-	if org, err = models.CreateOrganization(org, ctx.User); err != nil {
-		switch err {
-		case models.ErrUserAlreadyExist:
+	if err = models.CreateOrganization(org, ctx.User); err != nil {
+		switch {
+		case models.IsErrUserAlreadyExist(err):
 			ctx.Data["Err_OrgName"] = true
 			ctx.RenderWithErr(ctx.Tr("form.org_name_been_taken"), CREATE, &form)
-		case models.ErrEmailAlreadyUsed:
+		case models.IsErrEmailAlreadyUsed(err):
 			ctx.Data["Err_Email"] = true
 			ctx.RenderWithErr(ctx.Tr("form.email_been_used"), CREATE, &form)
-		case models.ErrUserNameIllegal:
+		case models.IsErrNameReserved(err):
 			ctx.Data["Err_OrgName"] = true
-			ctx.RenderWithErr(ctx.Tr("form.illegal_org_name"), CREATE, &form)
+			ctx.RenderWithErr(ctx.Tr("org.form.name_reserved", err.(models.ErrNameReserved).Name), CREATE, &form)
+		case models.IsErrNamePatternNotAllowed(err):
+			ctx.Data["Err_OrgName"] = true
+			ctx.RenderWithErr(ctx.Tr("org.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), CREATE, &form)
 		default:
-			ctx.Handle(500, "CreateUser", err)
+			ctx.Handle(500, "CreateOrganization", err)
 		}
 		return
 	}