Improve usage of config and i18n #7972

enonic · Oct 22, 2024 · a24cd25 · a24cd25
1 parent 8f59617
commit a24cd25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/modules/app/src/main/resources/assets/js/main.ts b/modules/app/src/main/resources/assets/js/main.ts
@@ -645,9 +645,7 @@ function initProjectContext(application: Application): Q.Promise<void> {
     }
 
     CONFIG.setConfig(JSON.parse(document.getElementById(configScriptId).innerText) as JSONObject);
-    if (Messages.isEmpty()) {
-        Messages.setMessages(JSON.parse(CONFIG.getString('phrasesAsJson')) as object);
-    }
+    Messages.addMessages(JSON.parse(CONFIG.getString('phrasesAsJson')) as object);
 
     const body = Body.get();
 

diff --git a/modules/lib/src/main/resources/assets/js/page-editor/LiveEditPage.ts b/modules/lib/src/main/resources/assets/js/page-editor/LiveEditPage.ts
@@ -141,9 +141,7 @@ export class LiveEditPage {
         }
 
         CONFIG.setConfig(event.getConfig());
-        if (Messages.isEmpty()) {
-            Messages.setMessages(JSON.parse(CONFIG.getString('phrasesAsJson')) as object);
-        }
+        Messages.addMessages(JSON.parse(CONFIG.getString('phrasesAsJson')) as object);
 
         ProjectContext.get().setProject(Project.fromJson(event.getProjectJson()));
         PageState.setState(event.getPageJson() ? new PageBuilder().fromJson(event.getPageJson()).build() : null);