This is an automated email from the ASF dual-hosted git repository. linkinstar pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/answer.git
commit 2d2451f78dd1df4b5e698700b6ee769bd5e65c20 Author: Dinesht04 <[email protected]> AuthorDate: Tue Oct 21 16:24:25 2025 +0530 fix(ui,internal): correct i18n implementation for variables and add min=0 to minimumContent in siteInfo schema --- i18n/en_US.yaml | 4 ++-- internal/schema/siteinfo_schema.go | 2 +- ui/src/components/TagSelector/index.tsx | 6 +++--- ui/src/pages/Questions/Ask/index.tsx | 9 +++------ 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml index 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: Tags msg: @@ -1188,7 +1188,7 @@ ui: search_tag: Search tag hint: 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 matched tag_required_text: Required tag (at least one) header: diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.go index 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 request type 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.tsx index 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.tsx index 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 (
