This is an automated email from the ASF dual-hosted git repository. linkinstar pushed a commit to branch test in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit be8098a4ad96780e457d411814b90771a3c3c738 Merge: 86cf384b 0df7bec0 Author: LinkinStars <[email protected]> AuthorDate: Wed Dec 25 16:06:50 2024 +0800 Merge branch 'dev' into test docs/docs.go | 55 ++++++++++++++++++++++ docs/swagger.json | 55 ++++++++++++++++++++++ docs/swagger.yaml | 35 ++++++++++++++ i18n/en_US.yaml | 15 +++++- i18n/zh_CN.yaml | 15 +++++- internal/base/constant/user.go | 6 +++ internal/base/middleware/accept_language.go | 34 ++++++------- internal/base/reason/reason.go | 3 ++ .../controller_admin/user_backyard_controller.go | 20 ++++++++ internal/repo/activity/vote_repo.go | 3 ++ internal/repo/answer/answer_repo.go | 8 ++++ internal/repo/question/question_repo.go | 8 ++++ internal/repo/user/user_backyard_repo.go | 9 ++++ internal/router/answer_api_router.go | 2 + internal/schema/answer_schema.go | 14 ++++++ internal/schema/backyard_user_schema.go | 5 ++ internal/schema/comment_schema.go | 14 ++++++ internal/schema/question_schema.go | 29 ++++++++++++ internal/service/answer_common/answer.go | 1 + internal/service/question_common/question.go | 3 +- internal/service/user_admin/user_backyard.go | 13 +++++ internal/service/user_common/user.go | 10 ++++ pkg/checker/zero_string.go | 11 +++++ pkg/converter/markdown.go | 7 +-- ui/src/pages/Admin/Answers/index.tsx | 46 ++++++++++++++---- ui/src/pages/Admin/Questions/index.tsx | 46 ++++++++++++++---- ui/src/pages/Admin/Users/index.tsx | 28 +++++++++++ ui/src/services/common.ts | 4 ++ 28 files changed, 456 insertions(+), 43 deletions(-) diff --cc i18n/en_US.yaml index df83c6e8,9d904622..8391a1d6 --- a/i18n/en_US.yaml +++ b/i18n/en_US.yaml @@@ -1498,11 -1504,9 +1504,12 @@@ ui normal: Normal closed: Closed deleted: Deleted + deleted_permanently: Deleted permanently pending: Pending more: More + view: View + card: Card + compact: Compact search: title: Search Results keywords: Keywords diff --cc i18n/zh_CN.yaml index 2ce84a02,d06733fb..17ba2e47 --- a/i18n/zh_CN.yaml +++ b/i18n/zh_CN.yaml @@@ -1465,11 -1474,9 +1474,12 @@@ ui normal: 正常 closed: 已关闭 deleted: 已删除 + deleted_permanently: 永久删除 pending: 等待处理 more: 更多 + view: 视图 + card: 卡片模式 + compact: 简洁模式 search: title: 搜索结果 keywords: 关键词
