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.

fix: conflict

shuaie3151c1da969
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(() => {