templates/user/settings/emial.tmpl: little fix on UI

- routers/user: little code format
- conf/locale: update French locale

routers/user/auth.go

@@ -351,15 +351,12 @@ func ActivateEmail(ctx *middleware.Context) {
 
 	// Verify code.
 	if email := models.VerifyActiveEmailCode(code, email_string); email != nil {
-		err := email.Activate()
-		if err != nil {
+		if err := email.Activate(); err != nil {
 			ctx.Handle(500, "ActivateEmail", err)
 		}
 
 		log.Trace("Email activated: %s", email.Email)
-
 		ctx.Flash.Success(ctx.Tr("settings.activate_email_success"))
-
 	}
 
 	ctx.Redirect(setting.AppSubUrl + "/user/settings/email")