From c619662a31cd2eac3a7e7ad8815922ab0721e115 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 27 Jan 2022 13:57:54 +0100 Subject: [PATCH] feat(lab): Respect language setting --- .../freesewing.shared/components/workbench/draft/index.js | 5 +---- .../components/workbench/draft/text-on-path/index.js | 2 +- .../components/workbench/draft/text/index.js | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/freesewing.shared/components/workbench/draft/index.js b/packages/freesewing.shared/components/workbench/draft/index.js index 7d41c1bbe27..981b14a85cb 100644 --- a/packages/freesewing.shared/components/workbench/draft/index.js +++ b/packages/freesewing.shared/components/workbench/draft/index.js @@ -5,12 +5,9 @@ import Part from './part' const LabDraft = ({ app, pattern, gist, updateGist }) => { - const patternInstance = new pattern(gist) - patternInstance.draft() + const patternInstance = new pattern(gist).draft() const patternProps = patternInstance.getRenderProps() - - return ( diff --git a/packages/freesewing.shared/components/workbench/draft/text-on-path/index.js b/packages/freesewing.shared/components/workbench/draft/text-on-path/index.js index 1228d6fca51..5874ab045d5 100644 --- a/packages/freesewing.shared/components/workbench/draft/text-on-path/index.js +++ b/packages/freesewing.shared/components/workbench/draft/text-on-path/index.js @@ -3,7 +3,7 @@ const TextOnPath = (props) => { // Handle translation let translated = '' for (let string of props.path.attributes.getAsArray('data-text')) { - translated += props.app.t(string).replace(/"/g, '"') + ' ' + translated += props.app.t(string, false, props.language).replace(/"/g, '"') + ' ' } const textPathProps = { xlinkHref: '#' + props.pathId, diff --git a/packages/freesewing.shared/components/workbench/draft/text/index.js b/packages/freesewing.shared/components/workbench/draft/text/index.js index 05655c43057..6bdd9c95716 100644 --- a/packages/freesewing.shared/components/workbench/draft/text/index.js +++ b/packages/freesewing.shared/components/workbench/draft/text/index.js @@ -3,7 +3,7 @@ const Text = (props) => { // Handle translation let translated = '' for (let string of props.point.attributes.getAsArray('data-text')) { - translated += props.app.t(string.toString()).replace(/"/g, '"') + ' ' + translated += props.app.t(string.toString(), false, props.language).replace(/"/g, '"') + ' ' } // Handle muti-line text if (translated.indexOf('\n') !== -1) {