This is an automated email from the ASF dual-hosted git repository. shuai pushed a commit to branch test in repository https://gitbox.apache.org/repos/asf/answer.git
commit e3151c1da9690b2b9ebc27760819b04adfabe74d Merge: 433b8d5d 2d2451f7 Author: shuai <[email protected]> AuthorDate: Thu Oct 23 18:12:50 2025 +0800 fix: conflict i18n/en_US.yaml | 16 ++++++++--- internal/base/reason/reason.go | 1 + internal/migrations/init.go | 1 + internal/migrations/v28.go | 2 ++ internal/schema/question_schema.go | 26 +++--------------- internal/schema/siteinfo_schema.go | 1 + internal/service/content/question_service.go | 40 ++++++++++++++++++++++++++++ internal/service/question_common/question.go | 8 ++++++ ui/src/common/interface.ts | 3 ++- ui/src/components/TagSelector/index.tsx | 5 ++-- ui/src/pages/Admin/Write/index.tsx | 33 +++++++++++++++++++---- ui/src/pages/Questions/Ask/index.tsx | 23 ++++++++++++---- ui/src/stores/writeSetting.ts | 1 + 13 files changed, 119 insertions(+), 41 deletions(-) diff --cc ui/src/common/interface.ts index bade01ea,b5a242e4..f2901908 --- a/ui/src/common/interface.ts +++ b/ui/src/common/interface.ts @@@ -439,7 -439,8 +439,8 @@@ export interface AdminSettingsLegal export interface AdminSettingsWrite { restrict_answer?: boolean; -- min_tags?: number, - min_content?:number, ++ min_tags?: number; ++ min_content?: number; recommend_tags?: Tag[]; required_tag?: boolean; reserved_tags?: Tag[]; diff --cc ui/src/components/TagSelector/index.tsx index c9eb3c97,4419d359..9be0e744 --- a/ui/src/components/TagSelector/index.tsx +++ b/ui/src/components/TagSelector/index.tsx @@@ -301,13 -301,12 +301,12 @@@ const TagSelector: FC<IProps> = ( } if (writeInfo.min_tags === 1) { - return t(`hint`); + return t('hint'); } - const str = t('hint_more_than_one_tag', { - min_content_length: writeInfo.min_tags, + return t(`hint_more_than_one_tag`, { + min_tags_number: writeInfo.min_tags, }); - return str; }; useEffect(() => {
