VSinerva/freesewing
1
0
Fork 0
Code Activity

fix(charlie): Avoid flag/sa confusion. See #5057

Browse source
This commit is contained in:
joostdecock 2023-10-01 18:46:33 +02:00
parent c8baaeecc4
commit 8580077479
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
designs/charlie/i18n/en.json
View file

@ -18,11 +18,11 @@
}, },
"s": { "s": {
"cutBeltloops.t": "The belt loops are not shown", "cutBeltloops.t": "The belt loops are not shown",
"cutBeltloops.d": "The **Belt loops** are {{{ count }}} rectangular piece of fabric {{{ width }}} wide and {{{ length }}} long (there is no seam allowance). They are not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part.", "cutBeltloops.d": "The **Belt loops** are {{{ count }}} rectangular piece of fabric {{{ width }}} wide and {{{ length }}} long.",
"cutBackPocketInterfacing.t": "The back pocket interfacing is not shown", "cutBackPocketInterfacing.t": "The back pocket interfacing is not shown",
"cutBackPocketInterfacing.d": "The **Back pocket interfacing** is a rectangular piece of fusible interfacing {{{ width }}} wide and {{{ length }}} long (there is no seam allowance). The interfacing is not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part.", "cutBackPocketInterfacing.d": "The **Back pocket interfacing** is a rectangular piece of fusible interfacing {{{ width }}} wide and {{{ length }}} long.",
"cutWaistband.t": "The waistband is not shown", "cutWaistband.t": "The waistband is not shown",
"cutWaistband.d": "The **Waistband** is a rectangular piece of fusible interfacing {{{ width }}} wide and {{{ length }}} long (there is no seam allowance). The interfacing is not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part." "cutWaistband.d": "The **Waistband** is a rectangular piece of fabric {{{ width }}} wide and {{{ length }}} long."
}, },
"o": { "o": {
"backPocketHorizontalPlacement": { "backPocketHorizontalPlacement": {

1
designs/charlie/src/back-pocket-interfacing.mjs
View file

@ -22,6 +22,7 @@ function draftCharlieBackPocketInterfacing({
// Expand is off, do not draw the part but flag this to the user // Expand is off, do not draw the part but flag this to the user
store.flag.note({ store.flag.note({
msg: `charlie:cutBackPocketInterfacing`, msg: `charlie:cutBackPocketInterfacing`,
notes: ['flag:saUnused', 'flag:partHiddenByExpand'],
replace: { replace: {
width: units(w), width: units(w),
length: units(h), length: units(h),

1
designs/charlie/src/beltloops.mjs
View file

@ -23,6 +23,7 @@ function draftCharlieBeltLoops({
// Expand is off, do not draw the part but flag this to the user // Expand is off, do not draw the part but flag this to the user
store.flag.note({ store.flag.note({
msg: `charlie:cutBeltloops`, msg: `charlie:cutBeltloops`,
notes: ['flag:saUnused', 'flag:partHiddenByExpand'],
replace: { replace: {
count: 7, count: 7,
width: units(width * 4), width: units(width * 4),

6
designs/charlie/src/waistband.mjs
View file

@ -28,15 +28,17 @@ function draftCharlieWaistband({
store.flag.preset('expandIsOn') store.flag.preset('expandIsOn')
} else { } else {
// Expand is off, do not draw the part but flag this to the user // Expand is off, do not draw the part but flag this to the user
const extraSa = sa ? 2 * sa : 0
store.flag.note({ store.flag.note({
msg: `charlie:cutWaistband`, msg: `charlie:cutWaistband`,
notes: [sa ? 'flag:saIncluded' : 'flag:saExcluded', 'flag:partHiddenByExpand'],
replace: { replace: {
width: units(absoluteOptions.waistbandWidth + 2 * sa), width: units(2 * absoluteOptions.waistbandWidth + extraSa),
length: units( length: units(
2 * store.get('waistbandBack') + 2 * store.get('waistbandBack') +
2 * store.get('waistbandFront') + 2 * store.get('waistbandFront') +
store.get('waistbandFly') + store.get('waistbandFly') +
2 * sa extraSa
), ),
}, },
suggest: { suggest: {