diff --git a/designs/aaron/src/index.mjs b/designs/aaron/src/index.mjs
index 6a08a7866e7..f5431ee315c 100644
--- a/designs/aaron/src/index.mjs
+++ b/designs/aaron/src/index.mjs
@@ -27,6 +27,8 @@ const i18n = mergeI18n([brianI18n, aaronI18n], {
'legacyArmholeDepthNo',
'legacyArmholeDepthYes',
'armholeDepth',
+ 'draftForHighBustNo',
+ 'draftForHighBustYes',
],
},
s: { drop: [] },
diff --git a/packages/react/components/Editor/components/HeaderMenu.mjs b/packages/react/components/Editor/components/HeaderMenu.mjs
index 6fa5598c6ab..50d664d5f0b 100644
--- a/packages/react/components/Editor/components/HeaderMenu.mjs
+++ b/packages/react/components/Editor/components/HeaderMenu.mjs
@@ -114,7 +114,7 @@ export const HeaderMenuDropdown = (props) => {
{props.children}
@@ -517,7 +517,7 @@ export const HeaderMenuViewMenu = (props) => {
>
diff --git a/packages/react/components/Editor/components/menus/Input.mjs b/packages/react/components/Editor/components/menus/Input.mjs
index 534de1906a0..dc859e79dc1 100644
--- a/packages/react/components/Editor/components/menus/Input.mjs
+++ b/packages/react/components/Editor/components/menus/Input.mjs
@@ -70,6 +70,7 @@ export const MenuListInput = ({
changed,
design,
isDesignOption = false,
+ i18n,
}) => {
const handleChange = useSharedHandlers({
dflt: config.dflt,
@@ -79,13 +80,23 @@ export const MenuListInput = ({
})
return config.list.map((entry) => {
- const titleKey = config.choiceTitles
+ let titleKey = config.choiceTitles
? config.choiceTitles[entry]
: isDesignOption
- ? `${design}:${name}.${entry}`
+ ? i18n.en.o[name]
: `${name}.o.${entry}`
- const title = config.titleMethod ? config.titleMethod(entry, t) : t(`${titleKey}.t`)
- const desc = config.valueMethod ? config.valueMethod(entry, t) : t(`${titleKey}.d`)
+ if (i18n.en.o[`${name}.${entry}`]) titleKey = i18n.en.o[`${name}.${entry}`]
+ console.log({ titleKey, titles: config.choiceTitles, isDesignOption })
+ const title = config.titleMethod
+ ? config.titleMethod(entry)
+ : typeof titleKey === 'string'
+ ? i18n.en.o[titleKey]?.t
+ : titleKey.t
+ const desc = config.valueMethod
+ ? config.valueMethod(entry)
+ : typeof titleKey === 'string'
+ ? i18n.en.o[titleKey]?.d
+ : titleKey.d
const sideBySide = config.sideBySide || desc.length + title.length < 42
return (
diff --git a/packages/react/components/Editor/components/views/index.mjs b/packages/react/components/Editor/components/views/index.mjs
index b80f40b877f..2084a6377ca 100644
--- a/packages/react/components/Editor/components/views/index.mjs
+++ b/packages/react/components/Editor/components/views/index.mjs
@@ -100,7 +100,7 @@ export const viewLabels = {
t: 'Time Design',
d: 'Shows detailed timing of the pattern being drafted, allowing you to find bottlenecks in performance',
},
- layout: {
+ printLayout: {
t: 'Pattern Layout',
d: 'Organize your pattern parts to minimize paper use',
},
diff --git a/packages/react/components/Editor/lib/editor.mjs b/packages/react/components/Editor/lib/editor.mjs
index 3ff8b15f217..773084dd8d9 100644
--- a/packages/react/components/Editor/lib/editor.mjs
+++ b/packages/react/components/Editor/lib/editor.mjs
@@ -2,7 +2,7 @@
import React from 'react'
import { defaultConfig } from '../config/index.mjs'
import { round } from '@freesewing/utils'
-import { formatDesignOptionValue } from './index.mjs'
+import { formatDesignOptionValue, menuCoreSettingsStructure } from './index.mjs'
// Components
import {
ErrorIcon,
diff --git a/packages/react/components/Editor/lib/formatting.mjs b/packages/react/components/Editor/lib/formatting.mjs
index fa1d16ad98c..b0b922be06c 100644
--- a/packages/react/components/Editor/lib/formatting.mjs
+++ b/packages/react/components/Editor/lib/formatting.mjs
@@ -1,4 +1,6 @@
+import React from 'react'
import { designOptionType } from '@freesewing/utils'
+import { BoolNoIcon, BoolYesIcon } from '@freesewing/react/components/Icon'
/*
* Method that capitalizes a string (make the first character uppercase)