Translation - Introduce a public API for merging a locale with default …

…fix #5256 (#5263)
surveyjs · Feb 26, 2024 · 8a8a1e4 · 8a8a1e4
1 parent a5d12aa
commit 8a8a1e4
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/packages/survey-creator-core/src/components/tabs/translation.ts b/packages/survey-creator-core/src/components/tabs/translation.ts
@@ -1064,7 +1064,8 @@ export class Translation extends Base implements ITranslationLocales {
     this.setVisibleLocales([]);
     this.reset();
   }
-  public reset(): void {
+  public reset(alwaysReset: boolean = true): void {
+    if(!alwaysReset && !!this.root) return;
     var rootObj = !!this.filteredPage ? this.filteredPage : this.survey;
     var rootName = !!this.filteredPage ? rootObj["name"] : "survey";
     this.root = new TranslationGroup(rootName, rootObj, this);
@@ -1253,6 +1254,7 @@ export class Translation extends Base implements ITranslationLocales {
     });
   }
   public mergeLocaleWithDefault() {
+    this.reset(false);
     if (!this.hasLocale(this.defaultLocale)) return;
     this.root.mergeLocaleWithDefault(this.defaultLocale);
     this.setVisibleLocales([]);

diff --git a/packages/survey-creator-core/tests/tabs/translation-v1.tests.ts b/packages/survey-creator-core/tests/tabs/translation-v1.tests.ts
@@ -501,6 +501,44 @@ test("Merging a locale with default", () => {
   expect(translation.canMergeLocaleWithDefault).toBeTruthy();
   surveyLocalization.defaultLocale = "en";
 });
+test("Merging a locale with default - no reset", () => {
+  surveyLocalization.defaultLocale = "de";
+  const survey: SurveyModel = new SurveyModel({
+    locale: "de",
+    elements: [
+      {
+        type: "text",
+        name: "question1",
+        title: {
+          de: "title de",
+          fr: "title fr"
+        }
+      },
+      {
+        type: "text",
+        name: "question2",
+        title: {
+          default: "title default",
+          de: "title de",
+          fr: "title fr"
+        }
+      },
+      {
+        type: "text",
+        name: "question3",
+        title: {
+          default: "title default",
+          fr: "title fr"
+        }
+      }
+    ]
+  });
+  const translation: Translation = new Translation(survey);
+  translation.mergeLocaleWithDefault();
+  expect(translation.locales).toHaveLength(2);
+  expect(translation.canMergeLocaleWithDefault).toBeFalsy();
+  surveyLocalization.defaultLocale = "en";
+});
 test("Custom localizable property in question", () => {
   Serializer.addProperty("question", {
     name: "customProp",