Components doesn't include into used locales strings from internal qu…

…estions fix #7510
surveyjs · Dec 15, 2023 · 78b7b79 · 78b7b79
1 parent 54a21e5
commit 78b7b79
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/src/base.ts b/src/base.ts
@@ -865,7 +865,7 @@ export class Base {
       // this.propertyValueChanged(name, oldValue, value);
     }
   }
-  public addUsedLocales(locales: Array<string>) {
+  public addUsedLocales(locales: Array<string>): void {
     if (!!this.localizableStrings) {
       for (let key in this.localizableStrings) {
         let item = this.getLocalizableString(key);

diff --git a/src/question_custom.ts b/src/question_custom.ts
@@ -420,6 +420,12 @@ export abstract class QuestionCustomModelBase extends Question
       this.getElement().localeChanged();
     }
   }
+  public addUsedLocales(locales: Array<string>): void {
+    super.addUsedLocales(locales);
+    if(!!this.getElement()) {
+      this.getElement().addUsedLocales(locales);
+    }
+  }
   protected createWrapper(): void { }
   protected onPropertyValueChanged(name: string, oldValue: any, newValue: any): void {
     super.onPropertyValueChanged(name, oldValue, newValue);

diff --git a/tests/question_customtests.ts b/tests/question_customtests.ts
@@ -1790,6 +1790,35 @@ QUnit.test("Composite: change locale, Bug#2730", function (assert) {
   survey.locale = "";
   ComponentCollection.Instance.clear();
 });
+QUnit.test("getUsedLocale, Bug#7510", function (assert) {
+  ComponentCollection.Instance.add({
+    name: "comp1",
+    questionJSON: {
+      type: "text",
+      title: { en: "Title en", de: "Title de" }
+    }
+  });
+  ComponentCollection.Instance.add({
+    name: "comp2",
+    elementsJSON: [
+      {
+        type: "text",
+        name: "q1",
+        title: { en: "Title en", fr: "Title fr" }
+      },
+      {
+        type: "text",
+        name: "q2",
+        title: { en: "Title en", it: "Title it" }
+      },
+    ]
+  });
+  const survey = new SurveyModel({
+    elements: [{ type: "comp1", name: "q1" }, { type: "comp2", name: "q2" }],
+  });
+  assert.deepEqual(survey.getUsedLocales(), ["en", "de", "fr", "it"], "Pick-up locales from components");
+  ComponentCollection.Instance.clear();
+});
 QUnit.test("getDisplayValue from component JSON function", function (assert) {
   var json = {
     name: "fullname",