From 9eaf2515b084e04b33ed0ba936d0494b04acc3b2 Mon Sep 17 00:00:00 2001 From: woutervdub Date: Thu, 12 Oct 2023 21:01:09 +0000 Subject: [PATCH] Removal of Mini option and some i18n --- designs/waralee/i18n/en.json | 50 ++++++++++++++++++++++++++-------- designs/waralee/src/cutout.mjs | 8 ++++-- designs/waralee/src/mini.mjs | 5 ++-- designs/waralee/src/pants.mjs | 2 +- designs/waralee/src/pocket.mjs | 2 +- 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/designs/waralee/i18n/en.json b/designs/waralee/i18n/en.json index ede664f813c..cb9a085c419 100644 --- a/designs/waralee/i18n/en.json +++ b/designs/waralee/i18n/en.json @@ -86,24 +86,52 @@ "d": "This setting raises the waist in the back. Our waist does not sit horizontally, but is angled up at the back. This seting allows you to raise this in the back if you need it for a good fit." }, "fitWaist": { - "t": "FIXME: Give this option a name", - "d": "FIXME: Give this option a description" + "t": "Fit the garment to the waist", + "d": "Traditionally, wrap pants are not fitted to the waist, and just use the flexibility of the fabric to adjust." + }, + "fitWaistNo": { + "t": "Do not fit the garment to the waist", + "d": "The traditional wrap pants." + }, + "fitWaistYes": { + "t": "Fit the garment to the waist", + "d": "Adjust the crotch cutout to make the waist fit better." }, "frontPocketStyle": { - "t": "FIXME: Give this option a name", - "d": "FIXME: Give this option a description" + "t": "Front pocket style", + "d": "A welt pocket, or a pocket hidden in the waistband." + }, + "frontPocketStyle.welt": { + "t": "Welt style Front pocket", + "d": "The front pocket will be a welt pocket, slanted, and hidden by the overlap." + }, + "frontPocketStyle.waistband": { + "t": "Waistband Front pocket", + "d": "The front pocket will be hidden in the seam of the waistband." }, "knotInFront": { - "t": "FIXME: Give this option a name", - "d": "FIXME: Give this option a description" + "t": "Placement of the knot", + "d": "The knot of the wrap straps can be place in the front or back." + }, + "knotInFrontNo": { + "t": "Knot in the back", + "d": "The knot of the wrap straps will be in the back." + }, + "knotInFrontYes": { + "t": "Knot in the front", + "d": "The knot of the wrap straps will be in the front." }, "separateWaistband": { - "t": "FIXME: Give this option a name", - "d": "FIXME: Give this option a description" + "t": "Create a separate waistband", + "d": "Create a separate waistband, or have a hem the size of the waistband." }, - "showMini": { - "t": "FIXME: Give this option a name", - "d": "FIXME: Give this option a description" + "separateWaistbandNo": { + "t": "No separate waistband", + "d": "The waistband is created by a folded hem." + }, + "separateWaistbandYes": { + "t": "Separate waistband", + "d": "The waistband is a separate piece, and sewn onto the pants." } } } diff --git a/designs/waralee/src/cutout.mjs b/designs/waralee/src/cutout.mjs index 78b70ac9713..d7efc65dac2 100644 --- a/designs/waralee/src/cutout.mjs +++ b/designs/waralee/src/cutout.mjs @@ -4,6 +4,10 @@ export const cutout = { name: 'waralee.cutout', from: pantsProto, draft: ({ options, Path, points, paths, Snippet, snippets, sa, macro, expand, part }) => { + if (expand) { + return part.hide() + } + const separateWaistband = options.separateWaistband || 'waistband' == options.frontPocketStyle paths.seam = new Path() @@ -17,7 +21,7 @@ export const cutout = { .close() .attr('class', 'fabric') - paths.cutout.hide() + // paths.cutout.hide() points.title = points.mWaist.shift(270, 75) macro('title', { @@ -66,6 +70,6 @@ export const cutout = { x: points.mWaist.x + 15, }) - return part.hide(expand) + return part }, } diff --git a/designs/waralee/src/mini.mjs b/designs/waralee/src/mini.mjs index 50c9953e3be..5ba37654f0f 100644 --- a/designs/waralee/src/mini.mjs +++ b/designs/waralee/src/mini.mjs @@ -12,7 +12,7 @@ export const mini = { return part.hide() } - const mini = options.minimizer + const mini = points.bWaistBackOverlapSeam.dist(points.fWaistFrontOverlapSeam) / 150 const separateWaistband = options.separateWaistband || 'waistband' == options.frontPocketStyle for (const p in points) { @@ -175,7 +175,6 @@ export const mini = { force: true, }) } - - return part.setHidden(!options.showMini && !expand) + return part }, } diff --git a/designs/waralee/src/pants.mjs b/designs/waralee/src/pants.mjs index c965ede955c..9a208a4da87 100644 --- a/designs/waralee/src/pants.mjs +++ b/designs/waralee/src/pants.mjs @@ -182,6 +182,6 @@ export const pants = { } } - return part.setHidden(options.showMini && !expand) + return part }, } diff --git a/designs/waralee/src/pocket.mjs b/designs/waralee/src/pocket.mjs index 8443fae2cdb..0fc7c7c3d11 100644 --- a/designs/waralee/src/pocket.mjs +++ b/designs/waralee/src/pocket.mjs @@ -137,7 +137,7 @@ export const pocket = { } } - if ('welt' == options.frontPocketStyle) { + if ('welt' != options.frontPocketStyle) { macro('hd', { id: 1, from: points.topLeft,