fixed JavaScript translations generation (#1880)

shopsys · Jul 1, 2020 · 1c103b8 · 1c103b8
2 parents c4ec5e5 + 72980f4
commit 1c103b8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/assets/js/frontend/utils/Window.js b/assets/js/frontend/utils/Window.js
@@ -7,8 +7,6 @@ const defaults = {
     buttonClose: true,
     buttonCancel: false,
     buttonContinue: false,
-    textContinue: Translator.trans('Yes'),
-    textCancel: Translator.trans('No'),
     textHeading: '',
     urlContinue: '#',
     cssClass: 'window-popup--standard',
@@ -40,7 +38,11 @@ export default class Window {
     constructor (inputOptions) {
         this.$activeWindow = null;
 
-        this.options = $.extend(defaults, inputOptions);
+        this.options = $.extend(
+            { textContinue: Translator.trans('Yes'), textCancel: Translator.trans('No') },
+            defaults,
+            inputOptions
+        );
 
         if (this.$activeWindow !== null) {
             this.$activeWindow.trigger('windowFastClose');

diff --git a/build.xml b/build.xml
@@ -7,7 +7,7 @@
     <property name="path.root" value="${project.basedir}"/>
     <property name="path.vendor" value="${path.root}/vendor"/>
     <property name="path.framework" value="${path.vendor}/shopsys/framework"/>
-    <property name="path.framework.assets" value="node_modules/@shopsys/framework"/>
+    <property name="path.framework.assets" value="${path.root}/node_modules/@shopsys/framework"/>
     <property name="path.frontend-api" value="${path.vendor}/shopsys/frontend-api"/>
 
     <property name="phpstan.level" value="4"/>

diff --git a/webpack.config.js b/webpack.config.js
@@ -60,7 +60,7 @@ Encore
                 sources.getFrameworkVendorDir() + '/src/Resources/translations/*.po',
                 './translations/*.po',
             ];
-            const outputDirForExportedTranslations = Encore.isProduction() ? './web/build/' : './assets/js/';
+            const outputDirForExportedTranslations = './assets/js/';
 
             try {
                 processTrans(dirWithJsFiles, dirWithTranslations, outputDirForExportedTranslations);