Merge pull request #163 from Hexastack/fix/i18n-customblock-settings

fix: i18n custom blocks settings
Hexastack · Oct 6, 2024 · e70c705 · e70c705
2 parents fa49158 + 123f9bf
commit e70c705
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/api/src/setting/schemas/setting.schema.ts b/api/src/setting/schemas/setting.schema.ts
@@ -7,6 +7,7 @@
  */
 
 import { Prop, Schema, SchemaFactory, ModelDefinition } from '@nestjs/mongoose';
+import { Transform } from 'class-transformer';
 import { IsArray, IsIn } from 'class-validator';
 
 import { BaseSchema } from '@/utils/generics/base-schema';
@@ -45,6 +46,13 @@ export class Setting extends BaseSchema {
  @Prop({ type: JSON, default: {} })
  config?: Record<string, any>;
 
+ @Prop({
+ type: String,
+ default: '',
+ })
+ @Transform(({ obj }) => obj.help || undefined)
+ help?: string;
+
  @Prop({
  type: Number,
  default: 0,

diff --git a/frontend/src/components/settings/SettingInput.tsx b/frontend/src/components/settings/SettingInput.tsx
@@ -36,9 +36,11 @@ const SettingInput: React.FC<RenderSettingInputProps> = ({
 }) => {
  const { t } = useTranslate();
  const nestedLabel = setting.label as TNestedTranslation<"label">;
- const nestedHelp = setting.label as TNestedTranslation<"help">;
- const label = t("label", nestedLabel);
- const helperText = t("help", nestedHelp);
+ const nestedHelp = setting.help as TNestedTranslation<"help">;
+ const label = t("label", nestedLabel, { defaultValue: nestedLabel });
+ const helperText = nestedHelp
+ ? t("help", nestedHelp, { defaultValue: nestedHelp })
+ : "";
 
  switch (setting.type) {
  case "text":

diff --git a/frontend/src/types/setting.types.ts b/frontend/src/types/setting.types.ts
@@ -93,6 +93,7 @@ export interface ISettingAttributes {
  config?: Record<string, any>;
  weight?: number;
  title?: string;
+ help?: string;
 }
 
 export interface ISettingStub extends IBaseSchema, ISettingAttributes {}