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(ui,internal): correct i18n implementation for variables and add min=0 to minimumContent in siteInfo schema
Dinesht042d2451f78dd1
diff --git a/i18n/en_US.yaml b/i18n/en_US.yamlindex 91bfa2af..17038d07 100644--- a/i18n/en_US.yaml+++ b/i18n/en_US.yaml@@ -1164,7 +1164,7 @@ ui:empty: Body cannot be empty.hint:optional_body: Share what the question is about.- minimum_characters: "Share what the question is about, at least {{ min_content_length }} characters are required."+ minimum_characters: "Share what the question is about, at least {{min_content_length}} characters are required."tags:label: Tagsmsg:@@ -1188,7 +1188,7 @@ ui:search_tag: Search taghint: Describe what your content is about, at least one tag is required.hint_zero_tags: Describe what your content is about.- hint_more_than_one_tag: "Describe what your content is about, at least {{ min_tags_number }} tags are required."+ hint_more_than_one_tag: "Describe what your content is about, at least {{min_tags_number}} tags are required."no_result: No tags matchedtag_required_text: Required tag (at least one)header:diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.goindex d946589d..15acb6d6 100644--- a/internal/schema/siteinfo_schema.go+++ b/internal/schema/siteinfo_schema.go@@ -75,7 +75,7 @@ type SiteBrandingReq struct {// SiteWriteReq site write requesttype SiteWriteReq struct {- MinimumContent int `validate:"omitempty" json:"min_content"`+ MinimumContent int `validate:"omitempty,min=0" json:"min_content"`RestrictAnswer bool `validate:"omitempty" json:"restrict_answer"`MinimumTags int `validate:"omitempty" json:"min_tags"`RequiredTag bool `validate:"omitempty" json:"required_tag"`diff --git a/ui/src/components/TagSelector/index.tsx b/ui/src/components/TagSelector/index.tsxindex 94e95325..4419d359 100644--- a/ui/src/components/TagSelector/index.tsx+++ b/ui/src/components/TagSelector/index.tsx@@ -304,9 +304,9 @@ const TagSelector: FC<IProps> = ({return t(`hint`);}- let str: string = t(`hint_more_than_one_tag`);- str = str.replace(`{{ min_tags_number }}`, writeInfo.min_tags.toString());- return str;+ return t(`hint_more_than_one_tag`, {+ min_tags_number: writeInfo.min_tags,+ });};useEffect(() => {diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsxindex d7804195..cac75dd8 100644--- a/ui/src/pages/Questions/Ask/index.tsx+++ b/ui/src/pages/Questions/Ask/index.tsx@@ -435,12 +435,9 @@ const Ask = () => {return t(`form.fields.body.hint.optional_body`);}- let str: string = t(`form.fields.body.hint.minimum_characters`);- str = str.replace(- `{{ min_content_length }}`,- writeInfo.min_content.toString(),- );- return str;+ return t(`form.fields.body.hint.minimum_characters`, {+ min_content_length: writeInfo.min_content,+ });};return (