Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

update vote

aichy12645f2f0669837
diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index b4121379..eaa06739 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -100,6 +100,8 @@ backend:
rank:
fail_to_meet_the_condition:
other: Rank fail to meet the condition.
+ vote_fail_to_meet_the_condition:
+ other: Thanks for the feedback. You need at least {{ rank }} reputation to cast a vote.
report:
handle_failed:
other: Report handle failed.
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index abd710dc..f4fca2ea 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -99,6 +99,8 @@ backend:
rank:
fail_to_meet_the_condition:
other: 级别不符合条件
+ vote_fail_to_meet_the_condition:
+ other: 感谢您的投票。您至少需要{{ rank }}声望才能投票。
report:
handle_failed:
other: 报告处理失败
diff --git a/internal/base/handler/handler.go b/internal/base/handler/handler.go
index c3b6025e..22784a81 100644
--- a/internal/base/handler/handler.go
+++ b/internal/base/handler/handler.go
@@ -3,6 +3,7 @@ package handler
import (
"errors"
"net/http"
+ "strings"
"github.com/answerdev/answer/internal/base/constant"
"github.com/answerdev/answer/internal/base/reason"
@@ -73,3 +74,10 @@ func BindAndCheckReturnErr(ctx *gin.Context, data interface{}) (errFields []*val
errFields, _ = validator.GetValidatorByLang(lang).Check(data)
return errFields
}
+
+func MsgWithParameter(msg string, list map[string]string) string {
+ for k, v := range list {
+ msg = strings.Replace(msg, "{{ "+k+" }}", v, -1)
+ }
+ return msg
+}
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index 2e4c8c82..5f9e316a 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -48,6 +48,7 @@ const (
TagIsUsedCannotDelete = "error.tag.is_used_cannot_delete"
TagAlreadyExist = "error.tag.already_exist"
RankFailToMeetTheCondition = "error.rank.fail_to_meet_the_condition"
+ VoteRankFailToMeetTheCondition = "error.rank.vote_fail_to_meet_the_condition"
ThemeNotFound = "error.theme.not_found"
LangNotFound = "error.lang.not_found"
ReportHandleFailed = "error.report.handle_failed"
diff --git a/internal/controller/vote_controller.go b/internal/controller/vote_controller.go
index e36fd08c..46fe8e32 100644
--- a/internal/controller/vote_controller.go
+++ b/internal/controller/vote_controller.go
@@ -1,9 +1,12 @@
package controller
import (
+ "fmt"
+
"github.com/answerdev/answer/internal/base/handler"
"github.com/answerdev/answer/internal/base/middleware"
"github.com/answerdev/answer/internal/base/reason"
+ "github.com/answerdev/answer/internal/base/translator"
"github.com/answerdev/answer/internal/schema"
"github.com/answerdev/answer/internal/service"
"github.com/answerdev/answer/internal/service/rank"
@@ -41,13 +44,16 @@ func (vc *VoteController) VoteUp(ctx *gin.Context) {
}
req.ObjectID = uid.DeShortID(req.ObjectID)
req.UserID = middleware.GetLoginUserIDFromContext(ctx)
- can, _, err := vc.rankService.CheckVotePermission(ctx, req.UserID, req.ObjectID, true)
+ can, rank, err := vc.rankService.CheckVotePermission(ctx, req.UserID, req.ObjectID, true)
if err != nil {
handler.HandleResponse(ctx, err, nil)
return
}
if !can {
- handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+ lang := handler.GetLang(ctx)
+ msg := translator.Tr(lang, reason.VoteRankFailToMeetTheCondition)
+ msg = handler.MsgWithParameter(msg, map[string]string{"rank": fmt.Sprintf("%d", rank)})
+ handler.HandleResponse(ctx, errors.Forbidden(reason.VoteRankFailToMeetTheCondition).WithMsg(msg), nil)
return
}
@@ -78,13 +84,16 @@ func (vc *VoteController) VoteDown(ctx *gin.Context) {
}
req.ObjectID = uid.DeShortID(req.ObjectID)
req.UserID = middleware.GetLoginUserIDFromContext(ctx)
- can, _, err := vc.rankService.CheckVotePermission(ctx, req.UserID, req.ObjectID, false)
+ can, rank, err := vc.rankService.CheckVotePermission(ctx, req.UserID, req.ObjectID, false)
if err != nil {
handler.HandleResponse(ctx, err, nil)
return
}
if !can {
- handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+ lang := handler.GetLang(ctx)
+ msg := translator.Tr(lang, reason.VoteRankFailToMeetTheCondition)
+ msg = handler.MsgWithParameter(msg, map[string]string{"rank": fmt.Sprintf("%d", rank)})
+ handler.HandleResponse(ctx, errors.Forbidden(reason.VoteRankFailToMeetTheCondition).WithMsg(msg), nil)
return
}