VSinerva/freesewing
1
0
Fork 0
Code Activity

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

Browse source 
fyi @woutervdub
This commit is contained in:
joostdecock 2023-10-01 18:38:53 +02:00
parent 7db3b3c263
commit c8baaeecc4
4 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
designs/hortensia/i18n/en.json
View file

@ -13,15 +13,15 @@
},
"s": {
"cutBottomPanel.t": "The bottom panel is not shown",
"cutBottomPanel.d": "The **Bottom panel** is a rectangular of {{{ width }}} wide and {{{ length }}} long (this includes seam allowance). You need to cut 1 from the main fabric, and 1 from the lining fabric. \n\nThis part is not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part.",
"cutBottomPanel.d": "The **Bottom panel** is a rectangular of {{{ width }}} wide and {{{ length }}} long.",
"cutFrontPanel.t": "The front panel is not shown",
"cutFrontPanel.d": "The **Front panel** is a rectangular of {{{ width }}} wide and {{{ length }}} long (this includes seam allowance). You need to cut 2 from the main fabric, and 2 from the lining fabric. \n\nThis part is not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part.",
"cutFrontPanel.d": "The **Front panel** is a rectangular of {{{ width }}} wide and {{{ length }}} long.",
"cutStrap.t": "The strap is not shown",
"cutStrap.d": "The **Strap** is a rectangular of {{{ width }}} wide and {{{ length }}} long (this includes seam allowance). You need to cut 2 from the main fabric. \n\nThis part is not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part.",
"cutStrap.d": "The **Strap** is a rectangular of {{{ width }}} wide and {{{ length }}} long.",
"cutStrapReducedSa.t": "The strap is not shown (and has reduced seam allowance)",
"cutStrapReducedSa.d": "The **Strap** is a rectangular of {{{ width }}} wide and {{{ length }}} long (this includes a reduced seam allowance of 80% of the strap width). You need to cut 2 from the main fabric. \n\nThis part is not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part.",
"cutStrapReducedSa.d": "The **Strap** is a rectangular of {{{ width }}} wide and {{{ length }}} long.",
"cutZipperPanel.t": "The zipper panel is not shown",
"cutZipperPanel.d": "The **Zipper panel** is a rectangular of {{{ width }}} wide and {{{ length }}} long (this includes seam allowance). You need to cut 1 from the main fabric. \n\nThis part is not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part.",
"cutZipperPanel.d": "The **Zipper panel** is a rectangular of {{{ width }}} wide and {{{ length }}} long.",
"strapLength": "Length of the handles",
"strapSaReduced.t": "The strap seam allowance is reduced",
"strapSaReduced.d": "Because of how narrow the strap is, we have reduced the seam allowance on it to be 80% of the strap width",

6
designs/hortensia/src/bottompanel.mjs
View file

@ -25,11 +25,13 @@ export const bottomPanel = {
store.flag.preset('expandIsOn')
} else {
// Expand is off, do not draw the part but flag this to the user
const extraSa = sa ? 2 * sa : 0
store.flag.note({
msg: `hortensia:cutBottomPanel`,
notes: [sa ? 'flag:saIncluded' : 'flag:saExcluded', 'flag:partHiddenByExpand'],
replace: {
width: units(w + 2 * sa),
length: units(h + 2 * sa),
width: units(w + extraSa),
length: units(h + extraSa),
},
suggest: {
text: 'flag:show',

6
designs/hortensia/src/frontpanel.mjs
View file

@ -33,11 +33,13 @@ export const frontPanel = {
store.flag.preset('expandIsOn')
} else {
// Expand is off, do not draw the part but flag this to the user
const extraSa = sa ? 2 * sa : 0
store.flag.note({
msg: `hortensia:cutFrontPanel`,
notes: [sa ? 'flag:saIncluded' : 'flag:saExcluded', 'flag:partHiddenByExpand'],
replace: {
width: units(w + 2 * sa),
length: units(h + 2 * sa),
width: units(w + extraSa),
length: units(h + extraSa),
},
suggest: {
text: 'flag:show',

19
designs/hortensia/src/strap.mjs
View file

@ -15,24 +15,23 @@ export const strap = {
if (sa > w * 0.8) {
sa = w * 0.8
reducedSa = true
store.flag.warn({
msg: `hortensia:strapSaReduced`,
replace: {
width: units(w + 2 * sa),
length: units(h + 2 * sa),
},
})
store.flag.warn({ msg: `hortensia:strapSaReduced` })
}
if (expand) store.flag.preset('expandIsOn')
else {
// Expand is on, do not draw the part but flag this to the user
const extraSa = sa ? 2 * sa : 0
store.flag.note({
msg: reducedSa ? `hortensia:cutStrapReducedSa` : `hortensia:cutStrap`,
notes: [
sa ? 'flag:saIncluded' : 'flag:saExcluded',
'flag:partHiddenByExpand',
reducedSa ? `hortensia:strapSaReduced.d` : '',
],
replace: {
width: units(w + 2 * sa),
length: units(h + 2 * sa),
width: units(w + extraSa),
length: units(h + extraSa),
},
suggest: {
text: 'flag:show',