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.

Merge remote-tracking branch 'origin/main' into dev

LinkinStars47c666200ef1
diff --cc internal/base/middleware/accept_language.go
index 3eaad75e,3f1abd5a..7a8ee391
--- a/internal/base/middleware/accept_language.go
+++ b/internal/base/middleware/accept_language.go
@@@ -20,13 -20,27 +20,13 @@@
package middleware
import (
- "github.com/apache/incubator-answer/internal/base/constant"
- "github.com/apache/incubator-answer/internal/base/handler"
- "github.com/apache/incubator-answer/internal/base/translator"
+ "github.com/apache/answer/internal/base/constant"
+ "github.com/apache/answer/internal/base/handler"
++ "github.com/apache/answer/internal/base/translator"
"github.com/gin-gonic/gin"
"github.com/segmentfault/pacman/i18n"
-)
-
-var (
- langMapping = map[i18n.Language]bool{
- i18n.LanguageChinese: true,
- i18n.LanguageChineseTraditional: true,
- i18n.LanguageEnglish: true,
- i18n.LanguageGerman: true,
- i18n.LanguageSpanish: true,
- i18n.LanguageFrench: true,
- i18n.LanguageItalian: true,
- i18n.LanguageJapanese: true,
- i18n.LanguageKorean: true,
- i18n.LanguagePortuguese: true,
- i18n.LanguageRussian: true,
- i18n.LanguageVietnamese: true,
- }
+ "golang.org/x/text/language"
+ "strings"
)
// ExtractAndSetAcceptLanguage extract accept language from header and set to context
diff --cc internal/schema/answer_schema.go
index 6c6e0881,72f5a9d0..3a404ed1
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@@ -20,10 -20,8 +20,10 @@@
package schema
import (
- "github.com/apache/incubator-answer/internal/base/reason"
- "github.com/apache/incubator-answer/internal/base/validator"
- "github.com/apache/incubator-answer/pkg/converter"
++ "github.com/apache/answer/internal/base/reason"
+ "github.com/apache/answer/internal/base/validator"
+ "github.com/apache/answer/pkg/converter"
+ "github.com/segmentfault/pacman/errors"
)
// RemoveAnswerReq delete answer request
diff --cc internal/schema/comment_schema.go
index 59ed898d,a5483322..104e3f33
--- a/internal/schema/comment_schema.go
+++ b/internal/schema/comment_schema.go
@@@ -20,12 -20,10 +20,12 @@@
package schema
import (
- "github.com/apache/incubator-answer/internal/base/reason"
- "github.com/apache/incubator-answer/internal/base/validator"
- "github.com/apache/incubator-answer/internal/entity"
- "github.com/apache/incubator-answer/pkg/converter"
++ "github.com/apache/answer/internal/base/reason"
+ "github.com/apache/answer/internal/base/validator"
+ "github.com/apache/answer/internal/entity"
+ "github.com/apache/answer/pkg/converter"
"github.com/jinzhu/copier"
+ "github.com/segmentfault/pacman/errors"
)
// AddCommentReq add comment request
diff --cc internal/schema/question_schema.go
index 9cbd8cc7,8adc7484..45de312e
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@@ -23,12 -23,10 +23,13 @@@ import
"strings"
"time"
- "github.com/apache/incubator-answer/internal/base/validator"
- "github.com/apache/incubator-answer/internal/entity"
- "github.com/apache/incubator-answer/pkg/converter"
- "github.com/apache/incubator-answer/pkg/uid"
++ "github.com/apache/answer/internal/base/reason"
++ "github.com/segmentfault/pacman/errors"
++
+ "github.com/apache/answer/internal/base/validator"
+ "github.com/apache/answer/internal/entity"
+ "github.com/apache/answer/pkg/converter"
+ "github.com/apache/answer/pkg/uid"
)
const (
diff --cc internal/service/user_admin/user_backyard.go
index 6c1d50c1,a414ec4e..9693c485
--- a/internal/service/user_admin/user_backyard.go
+++ b/internal/service/user_admin/user_backyard.go
@@@ -22,18 -22,15 +22,18 @@@ package user_admi
import (
"context"
"fmt"
- "github.com/apache/incubator-answer/internal/base/constant"
- "github.com/apache/incubator-answer/internal/base/handler"
- "github.com/apache/incubator-answer/internal/base/translator"
- "github.com/apache/incubator-answer/internal/base/validator"
- answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
- "github.com/apache/incubator-answer/internal/service/badge"
- "github.com/apache/incubator-answer/internal/service/comment_common"
- "github.com/apache/incubator-answer/internal/service/export"
- notificationcommon "github.com/apache/incubator-answer/internal/service/notification_common"
- "github.com/apache/incubator-answer/internal/service/plugin_common"
- questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
- "github.com/apache/incubator-answer/pkg/token"
+ "github.com/apache/answer/internal/base/constant"
+ "github.com/apache/answer/internal/base/handler"
+ "github.com/apache/answer/internal/base/translator"
+ "github.com/apache/answer/internal/base/validator"
+ answercommon "github.com/apache/answer/internal/service/answer_common"
++ "github.com/apache/answer/internal/service/badge"
+ "github.com/apache/answer/internal/service/comment_common"
+ "github.com/apache/answer/internal/service/export"
++ notificationcommon "github.com/apache/answer/internal/service/notification_common"
++ "github.com/apache/answer/internal/service/plugin_common"
+ questioncommon "github.com/apache/answer/internal/service/question_common"
+ "github.com/apache/answer/pkg/token"
"net/mail"
"strings"
"time"