From a24cd2530a7237d948ce546a5a606031f1e4955c Mon Sep 17 00:00:00 2001 From: Anatol Sialitski Date: Tue, 22 Oct 2024 13:11:46 +0200 Subject: [PATCH] Improve usage of config and i18n #7972 --- modules/app/src/main/resources/assets/js/main.ts | 4 +--- .../src/main/resources/assets/js/page-editor/LiveEditPage.ts | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/app/src/main/resources/assets/js/main.ts b/modules/app/src/main/resources/assets/js/main.ts index cb6bdffee6..0b1ae3c947 100644 --- 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 { } 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 index 3f1befc7d4..f19379013d 100644 --- 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);