From 30de46e3f5feeb05542c39b1c9d9d59ac867bb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mauro=20Ferr=C3=A3o?= Date: Mon, 21 Aug 2023 17:21:12 +0100 Subject: [PATCH] Fix extend for translation (#2001) relates to xibosignageltd/xibo-private#407 --- ui/src/editor-core/bottombar.js | 2 +- ui/src/editor-core/topbar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/editor-core/bottombar.js b/ui/src/editor-core/bottombar.js index cb02ee4d85..825134bc2b 100644 --- a/ui/src/editor-core/bottombar.js +++ b/ui/src/editor-core/bottombar.js @@ -20,7 +20,7 @@ Bottombar.prototype.render = function(object) { const readOnlyModeOn = (app?.readOnlyMode === true); // Get topbar trans - const newBottomBarTrans = $.extend(toolbarTrans, topbarTrans); + const newBottomBarTrans = $.extend({}, toolbarTrans, topbarTrans); const checkHistory = app.checkHistory(); newBottomBarTrans.undoActiveTitle = diff --git a/ui/src/editor-core/topbar.js b/ui/src/editor-core/topbar.js index fee95912eb..79651f458e 100644 --- a/ui/src/editor-core/topbar.js +++ b/ui/src/editor-core/topbar.js @@ -71,7 +71,7 @@ Topbar.prototype.render = function() { mainObject.duration = Math.round(Number(mainObject.duration) * 100) / 100; // Get topbar trans - const newTopbarTrans = $.extend(toolbarTrans, topbarTrans, editorsTrans); + const newTopbarTrans = $.extend({}, toolbarTrans, topbarTrans, editorsTrans); // Compile layout template with data const html = topbarTemplate({