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.
fix(i18n): If the translation content is not found, use the default language for translation
LinkinStar5c2723e61751
diff --git a/internal/base/handler/response.go b/internal/base/handler/response.goindex 876ba765..c8f59b33 100644--- a/internal/base/handler/response.go+++ b/internal/base/handler/response.go@@ -21,7 +21,7 @@ type RespBody struct {// TrMsg translate the reason cause as a messagefunc (r *RespBody) TrMsg(lang i18n.Language) *RespBody {if len(r.Message) == 0 {- r.Message = translator.GlobalTrans.Tr(lang, r.Reason)+ r.Message = translator.Tr(lang, r.Reason)}return r}diff --git a/internal/base/translator/provider.go b/internal/base/translator/provider.goindex 518132ea..3d903a14 100644--- a/internal/base/translator/provider.go+++ b/internal/base/translator/provider.go@@ -106,3 +106,12 @@ func CheckLanguageIsValid(lang string) bool {}return false}++// Tr use language to translate data. If this language translation is not available, return default english translation.+func Tr(lang i18n.Language, data string) string {+ translation := GlobalTrans.Tr(lang, data)+ if translation == data {+ return GlobalTrans.Tr(i18n.DefaultLanguage, data)+ }+ return translation+}diff --git a/internal/base/validator/validator.go b/internal/base/validator/validator.goindex 6ed4d358..8eae14e1 100644--- a/internal/base/validator/validator.go+++ b/internal/base/validator/validator.go@@ -102,7 +102,7 @@ func createDefaultValidator(la i18n.Language) *validator.Validate {validate.RegisterTagNameFunc(func(fld reflect.StructField) (res string) {defer func() {if len(res) > 0 {- res = translator.GlobalTrans.Tr(la, res)+ res = translator.Tr(la, res)}}()if jsonTag := fld.Tag.Get("json"); len(jsonTag) > 0 {@@ -168,7 +168,7 @@ func (m *MyValidator) Check(value interface{}) (errFields []*FormErrorField, errreturn nil, nil}for _, errField := range errFields {- errField.ErrorMsg = translator.GlobalTrans.Tr(m.Lang, errField.ErrorMsg)+ errField.ErrorMsg = translator.Tr(m.Lang, errField.ErrorMsg)}return errFields, err}diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.goindex cc632b7f..909581cc 100644--- a/internal/controller/user_controller.go+++ b/internal/controller/user_controller.go@@ -113,7 +113,7 @@ func (uc *UserController) UserEmailLogin(ctx *gin.Context) {if !captchaPass {errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "captcha_code",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),})handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)return@@ -124,7 +124,7 @@ func (uc *UserController) UserEmailLogin(ctx *gin.Context) {_, _ = uc.actionService.ActionRecordAdd(ctx, schema.ActionRecordTypeLogin, ctx.ClientIP())errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "e_mail",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLang(ctx), reason.EmailOrPasswordWrong),+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.EmailOrPasswordWrong),})handler.HandleResponse(ctx, errors.BadRequest(reason.EmailOrPasswordWrong), errFields)return@@ -151,7 +151,7 @@ func (uc *UserController) RetrievePassWord(ctx *gin.Context) {if !captchaPass {errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "captcha_code",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),})handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)return@@ -236,7 +236,7 @@ func (uc *UserController) UserRegisterByEmail(ctx *gin.Context) {if !captchaPass {errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "captcha_code",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),})handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)return@@ -245,7 +245,8 @@ func (uc *UserController) UserRegisterByEmail(ctx *gin.Context) {resp, errFields, err := uc.userService.UserRegisterByEmail(ctx, req)if len(errFields) > 0 {for _, field := range errFields {- field.ErrorMsg = translator.GlobalTrans.Tr(handler.GetLang(ctx), field.ErrorMsg)+ field.ErrorMsg = translator.+ Tr(handler.GetLang(ctx), field.ErrorMsg)}handler.HandleResponse(ctx, err, errFields)} else {@@ -312,7 +313,7 @@ func (uc *UserController) UserVerifyEmailSend(ctx *gin.Context) {if !captchaPass {errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "captcha_code",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),})handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)return@@ -350,7 +351,7 @@ func (uc *UserController) UserModifyPassWord(ctx *gin.Context) {if !oldPassVerification {errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "old_pass",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLang(ctx), reason.OldPasswordVerificationFailed),+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.OldPasswordVerificationFailed),})handler.HandleResponse(ctx, errors.BadRequest(reason.OldPasswordVerificationFailed), errFields)return@@ -358,7 +359,7 @@ func (uc *UserController) UserModifyPassWord(ctx *gin.Context) {if req.OldPass == req.Pass {errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "pass",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLang(ctx), reason.NewPasswordSameAsPreviousSetting),+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.NewPasswordSameAsPreviousSetting),})handler.HandleResponse(ctx, errors.BadRequest(reason.NewPasswordSameAsPreviousSetting), errFields)return@@ -386,7 +387,7 @@ func (uc *UserController) UserUpdateInfo(ctx *gin.Context) {req.UserID = middleware.GetLoginUserIDFromContext(ctx)errFields, err := uc.userService.UpdateInfo(ctx, req)for _, field := range errFields {- field.ErrorMsg = translator.GlobalTrans.Tr(handler.GetLang(ctx), field.ErrorMsg)+ field.ErrorMsg = translator.Tr(handler.GetLang(ctx), field.ErrorMsg)}handler.HandleResponse(ctx, err, errFields)}@@ -491,7 +492,7 @@ func (uc *UserController) UserChangeEmailSendCode(ctx *gin.Context) {if !captchaPass {errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "captcha_code",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),})handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)returndiff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.goindex 6d0f93c5..4d4bda23 100644--- a/internal/schema/question_schema.go+++ b/internal/schema/question_schema.go@@ -246,9 +246,9 @@ type QuestionPageReq struct {}const (- QuestionPageRespOperationTypeAsked = "question.operation_type.asked"- QuestionPageRespOperationTypeAnswered = "question.operation_type.answered"- QuestionPageRespOperationTypeModified = "question.operation_type.modified"+ QuestionPageRespOperationTypeAsked = "asked"+ QuestionPageRespOperationTypeAnswered = "answered"+ QuestionPageRespOperationTypeModified = "modified")type QuestionPageResp struct {diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.goindex a05c10c4..ccd92c73 100644--- a/internal/schema/siteinfo_schema.go+++ b/internal/schema/siteinfo_schema.go@@ -134,7 +134,7 @@ type SiteThemeResp struct {func (s *SiteThemeResp) TrTheme(ctx context.Context) {la := handler.GetLangByCtx(ctx)for _, option := range s.ThemeOptions {- tr := translator.GlobalTrans.Tr(la, option.Value)+ tr := translator.Tr(la, option.Value)// if tr is equal the option value means not found translation, so use the original labelif tr != option.Value {option.Label = trdiff --git a/internal/service/notification/notification_service.go b/internal/service/notification/notification_service.goindex 17534f8c..b6338258 100644--- a/internal/service/notification/notification_service.go+++ b/internal/service/notification/notification_service.go@@ -134,7 +134,7 @@ func (ns *NotificationService) GetNotificationPage(ctx context.Context, searchCocontinue}lang, _ := ctx.Value(constant.AcceptLanguageFlag).(i18n.Language)- item.NotificationAction = translator.GlobalTrans.Tr(lang, item.NotificationAction)+ item.NotificationAction = translator.Tr(lang, item.NotificationAction)item.ID = notificationInfo.IDitem.UpdateTime = notificationInfo.UpdatedAt.Unix()if notificationInfo.IsRead == schema.NotificationRead {diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.goindex 3a525b89..deafa5b1 100644--- a/internal/service/question_common/question.go+++ b/internal/service/question_common/question.go@@ -6,9 +6,7 @@ import ("time""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/translator""github.com/answerdev/answer/internal/service/activity_common""github.com/answerdev/answer/internal/service/activity_queue""github.com/answerdev/answer/internal/service/config"@@ -250,13 +248,7 @@ func (qs *QuestionCommon) Info(ctx context.Context, questionID string, loginUserfunc (qs *QuestionCommon) FormatQuestionsPage(ctx context.Context, questionList []*entity.Question, loginUserID string, orderCond string) (formattedQuestions []*schema.QuestionPageResp, err error) {- language := handler.GetLangByCtx(ctx)- askedOp := translator.GlobalTrans.Tr(language, schema.QuestionPageRespOperationTypeAsked)- answeredOp := translator.GlobalTrans.Tr(language, schema.QuestionPageRespOperationTypeAnswered)- modifiedOp := translator.GlobalTrans.Tr(language, schema.QuestionPageRespOperationTypeModified)-formattedQuestions = make([]*schema.QuestionPageResp, 0)-questionIDs := make([]string, 0)userIDs := make([]string, 0)for _, questionInfo := range questionList {@@ -300,20 +292,20 @@ func (qs *QuestionCommon) FormatQuestionsPage(// if order condition is newest or nobody edited or nobody answered, only show question authorif orderCond == schema.QuestionOrderCondNewest || (!haveEdited && !haveAnswered) {- t.OperationType = askedOp+ t.OperationType = schema.QuestionPageRespOperationTypeAskedt.OperatedAt = questionInfo.CreatedAt.Unix()t.Operator = &schema.QuestionPageRespOperator{ID: questionInfo.UserID}} else {// if no oneif haveEdited {- t.OperationType = modifiedOp+ t.OperationType = schema.QuestionPageRespOperationTypeModifiedt.OperatedAt = questionInfo.UpdatedAt.Unix()t.Operator = &schema.QuestionPageRespOperator{ID: questionInfo.LastEditUserID}}if haveAnswered {if t.LastAnsweredAt.Unix() > t.OperatedAt {- t.OperationType = answeredOp+ t.OperationType = schema.QuestionPageRespOperationTypeAnsweredt.OperatedAt = t.LastAnsweredAt.Unix()t.Operator = &schema.QuestionPageRespOperator{ID: t.LastAnsweredUserID}}diff --git a/internal/service/question_service.go b/internal/service/question_service.goindex 41a7f409..63a11596 100644--- a/internal/service/question_service.go+++ b/internal/service/question_service.go@@ -140,8 +140,8 @@ func (qs *QuestionService) CloseMsgList(ctx context.Context, lang i18n.Language)return nil, errors.InternalServer(reason.UnknownError).WithError(err).WithStack()}for _, t := range resp {- t.Name = translator.GlobalTrans.Tr(lang, t.Name)- t.Description = translator.GlobalTrans.Tr(lang, t.Description)+ t.Name = translator.Tr(lang, t.Name)+ t.Description = translator.Tr(lang, t.Description)}return resp, err}@@ -163,7 +163,7 @@ func (qs *QuestionService) CheckAddQuestion(ctx context.Context, req *schema.Queerrorlist := make([]*validator.FormErrorField, 0)errorlist = append(errorlist, &validator.FormErrorField{ErrorField: "tags",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.TagNotFound),+ ErrorMsg: translator.Tr(handler.GetLangByCtx(ctx), reason.TagNotFound),})err = errors.BadRequest(reason.RecommendTagEnter)return errorlist, err@@ -176,7 +176,7 @@ func (qs *QuestionService) CheckAddQuestion(ctx context.Context, req *schema.Queerrorlist := make([]*validator.FormErrorField, 0)errorlist = append(errorlist, &validator.FormErrorField{ErrorField: "tags",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),+ ErrorMsg: translator.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),})err = errors.BadRequest(reason.RecommendTagEnter)return errorlist, err@@ -213,7 +213,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Questionerrorlist := make([]*validator.FormErrorField, 0)errorlist = append(errorlist, &validator.FormErrorField{ErrorField: "tags",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.TagNotFound),+ ErrorMsg: translator.Tr(handler.GetLangByCtx(ctx), reason.TagNotFound),})err = errors.BadRequest(reason.RecommendTagEnter)return errorlist, err@@ -226,7 +226,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Questionerrorlist := make([]*validator.FormErrorField, 0)errorlist = append(errorlist, &validator.FormErrorField{ErrorField: "tags",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),+ ErrorMsg: translator.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),})err = errors.BadRequest(reason.RecommendTagEnter)return errorlist, err@@ -539,7 +539,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Questerrorlist := make([]*validator.FormErrorField, 0)errorlist = append(errorlist, &validator.FormErrorField{ErrorField: "tags",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),+ ErrorMsg: translator.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),})err = errors.BadRequest(reason.RecommendTagEnter)return errorlist, errdiff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.goindex 112996bf..f67fdaa7 100644--- a/internal/service/report/report_service.go+++ b/internal/service/report/report_service.go@@ -74,8 +74,8 @@ func (rs *ReportService) GetReportTypeList(ctx context.Context, lang i18n.Languaerr = errors.BadRequest(reason.UnknownError)}for _, t := range resp {- t.Name = translator.GlobalTrans.Tr(lang, t.Name)- t.Description = translator.GlobalTrans.Tr(lang, t.Description)+ t.Name = translator.Tr(lang, t.Name)+ t.Description = translator.Tr(lang, t.Description)}return resp, err}diff --git a/internal/service/role/role_service.go b/internal/service/role/role_service.goindex ae18f762..846e91a7 100644--- a/internal/service/role/role_service.go+++ b/internal/service/role/role_service.go@@ -72,13 +72,13 @@ func (rs *RoleService) GetRoleMapping(ctx context.Context) (roleMapping map[int]func (rs *RoleService) translateRole(ctx context.Context, role *entity.Role) {switch role.Name {case roleUserName:- role.Name = translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), trRoleNameUser)- role.Description = translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), trRoleDescriptionUser)+ role.Name = translator.Tr(handler.GetLangByCtx(ctx), trRoleNameUser)+ role.Description = translator.Tr(handler.GetLangByCtx(ctx), trRoleDescriptionUser)case roleAdminName:- role.Name = translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), trRoleNameAdmin)- role.Description = translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), trRoleDescriptionAdmin)+ role.Name = translator.Tr(handler.GetLangByCtx(ctx), trRoleNameAdmin)+ role.Description = translator.Tr(handler.GetLangByCtx(ctx), trRoleDescriptionAdmin)case roleModeratorName:- role.Name = translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), trRoleNameModerator)- role.Description = translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), trRoleDescriptionModerator)+ role.Name = translator.Tr(handler.GetLangByCtx(ctx), trRoleNameModerator)+ role.Description = translator.Tr(handler.GetLangByCtx(ctx), trRoleDescriptionModerator)}}diff --git a/internal/service/user_service.go b/internal/service/user_service.goindex 8afefa93..e7bd4374 100644--- a/internal/service/user_service.go+++ b/internal/service/user_service.go@@ -510,7 +510,7 @@ func (us *UserService) UserChangeEmailSendCode(ctx context.Context, req *schema.if exist {resp = append([]*validator.FormErrorField{}, &validator.FormErrorField{ErrorField: "e_mail",- ErrorMsg: translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.EmailDuplicate),+ ErrorMsg: translator.Tr(handler.GetLangByCtx(ctx), reason.EmailDuplicate),})return resp, errors.BadRequest(reason.EmailDuplicate)}