p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(tr): Fix translation errors

This commit is contained in:
LinkinStar 2022-11-30 19:19:01 +08:00
parent 457c1cd798
commit 505fa7e6d3
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/base/handler/lang.go
View File

@ -1,6 +1,8 @@
package handler package handler
import ( import (
"context"
"github.com/answerdev/answer/internal/base/constant" "github.com/answerdev/answer/internal/base/constant"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/i18n"
@ -18,3 +20,12 @@ func GetLang(ctx *gin.Context) i18n.Language {
return i18n.DefaultLang return i18n.DefaultLang
} }
} }
// GetLangByCtx get language from header
func GetLangByCtx(ctx context.Context) i18n.Language {
acceptLanguage, ok := ctx.Value(constant.AcceptLanguageFlag).(i18n.Language)
if ok {
return acceptLanguage
}
return i18n.DefaultLang
}

5
internal/service/question_service.go
View File

@ -7,6 +7,7 @@ import (
"time" "time"
"github.com/answerdev/answer/internal/base/constant" "github.com/answerdev/answer/internal/base/constant"
"github.com/answerdev/answer/internal/base/handler"
"github.com/answerdev/answer/internal/base/reason" "github.com/answerdev/answer/internal/base/reason"
"github.com/answerdev/answer/internal/base/translator" "github.com/answerdev/answer/internal/base/translator"
"github.com/answerdev/answer/internal/base/validator" "github.com/answerdev/answer/internal/base/validator"
@ -129,7 +130,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
errorlist := make([]*validator.FormErrorField, 0) errorlist := make([]*validator.FormErrorField, 0)
errorlist = append(errorlist, &validator.FormErrorField{ errorlist = append(errorlist, &validator.FormErrorField{
ErrorField: "tags", ErrorField: "tags",
ErrorMsg: reason.RecommendTagEnter, ErrorMsg: translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),
}) })
err = errors.BadRequest(reason.RecommendTagEnter) err = errors.BadRequest(reason.RecommendTagEnter)
return errorlist, err return errorlist, err
@ -350,7 +351,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
errorlist := make([]*validator.FormErrorField, 0) errorlist := make([]*validator.FormErrorField, 0)
errorlist = append(errorlist, &validator.FormErrorField{ errorlist = append(errorlist, &validator.FormErrorField{
ErrorField: "tags", ErrorField: "tags",
ErrorMsg: reason.RecommendTagEnter, ErrorMsg: translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),
}) })
err = errors.BadRequest(reason.RecommendTagEnter) err = errors.BadRequest(reason.RecommendTagEnter)
return errorlist, err return errorlist, err