diff --git a/config/software/designs.json b/config/software/designs.json
index 2c3a875aa9a..c6e243b3589 100644
--- a/config/software/designs.json
+++ b/config/software/designs.json
@@ -97,8 +97,8 @@
"difficulty": 3,
"tags": ["bottoms", "trousers"]
},
- "collab": {
- "description": "FIXME: A FreeSewing pattern that is a work in progress",
+ "naomiwu": {
+ "description": "A FreeSewing pattern for Naomi Wu's signature cargo skirt",
"code": "Joost De Cock",
"design": "Joost De Cock & x",
"difficulty": 3,
diff --git a/designs/collab/CHANGELOG.md b/designs/naomiwu/CHANGELOG.md
similarity index 83%
rename from designs/collab/CHANGELOG.md
rename to designs/naomiwu/CHANGELOG.md
index 198f67bd15f..a9bb531063d 100644
--- a/designs/collab/CHANGELOG.md
+++ b/designs/naomiwu/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Change log for: @freesewing/collab
+# Change log for: @freesewing/naomiwu
diff --git a/designs/collab/README.md b/designs/naomiwu/README.md
similarity index 97%
rename from designs/collab/README.md
rename to designs/naomiwu/README.md
index cbaf6841b0e..76518d8feff 100644
--- a/designs/collab/README.md
+++ b/designs/naomiwu/README.md
@@ -1,13 +1,13 @@

+ href="https://www.npmjs.com/package/@freesewing/naomiwu"
+ title="@freesewing/naomiwu on NPM"
+ >

+ href="https://github.com/freesewing/freesewing/issues?q=is%3Aissue+is%3Aopen+label%3Apkg%3Anaomiwu"
+ title="Open issues tagged pkg:naomiwu"
+ >

-# @freesewing/collab
+# @freesewing/naomiwu
-FIXME: A FreeSewing pattern that is a work in progress
+A FreeSewing pattern for Naomi Wu's signature cargo skirt
@@ -65,7 +65,7 @@ FIXME: A FreeSewing pattern that is a work in progress
This repository is our *monorepo* holding all our NPM designs, plugins, other NPM packages, and (web)sites.
-This folder holds: @freesewing/collab
+This folder holds: @freesewing/naomiwu
If you're not entirely sure what to do or how to start, type this command:
@@ -189,103 +189,105 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 Ikko Ashimine π |
 Irapeke π |
+  Ivo Bek π |
 Jacek Sawoszczuk π |
 Jason Williams π |
 Jeremy Jackson π» |
 Jeroen Hoek π |
-  Joe Schofield π |
+  Joe Schofield π |
 Joebidido π |
 Joost De Cock π§ |
 Josh Essman π |
 Kake π |
 Kapunahele Wong π |
 Karen π π |
-  Katie McGinley π |
+  Katie McGinley π |
 Kieran Klaassen π» |
 Kittycatou π |
 Kris π |
 Kristin Ruben π» |
 Loudepeuter π |
 Lucian π |
-  Luiz Saggioro π» |
+  Luiz Saggioro π» |
 MA-TATAS π |
 Marcus π |
 Martin Tribo π |
 Nadege Michel β οΈ π |
 Natalia π» π¨ π |
 Nathan Yergler π |
-  Nick Dower π π» π |
+  Nick Dower π π» π |
 Nikhil Chelliah π |
 OysteinHoiby π» |
 Patrick Forringer π |
 Paul π π π |
 Phillip Thelen π» |
 Pixieish π |
-  Prof. dr. Sorcha NΓ Dhubhghaill π |
+  Prof. dr. Sorcha NΓ Dhubhghaill π |
 Quentin FELIX π» π¨ |
 Rik Hekker π |
 Sam Livingston-Gray π |
 Sanne π» π |
 Sara Latorre π |
 SeaZeeZee π π» |
-  SimonbJohnson π |
+  SimonbJohnson π |
 SirCharlotte π |
 Slylele π π |
 Soazillon π |
 SoneaTheBest π |
 Stefan Sydow π π π» |
-  TrΓona π |
-  Unmutual π |
+  Trent Trama π» |
+  TrΓona π |
+  Unmutual π |
 Wouter van Wageningen π» π¨ π§ |
 amysews π |
 anna-puk π» |
 beautifulsummermoon π |
 berce π |
-  biou π» |
-  bobgeorgethe3rd π» π π¨ |
+  biou π» |
+  bobgeorgethe3rd π» π π¨ |
 brmlyklr π |
 chri5b π» β οΈ |
 dingcycle π |
 drowned-in-books π¬ |
 econo202 π |
-  ericamattos π |
-  fightingrabbit π» |
+  ericamattos π |
+  fightingrabbit π» |
 gaylyndie π |
 grimlokason π» |
 hellgy π¨ |
 jackseye π |
 marckiesel π |
-  marpants π» |
-  mergerg π |
+  marpants π» |
+  mergerg π |
 mesil π |
 starfetch π» π π π¨ |
 timorl π» |
 ttimearl π |
 tuesgloomsday π |
-  valadaptive π» |
-  viocky π |
+  valadaptive π» |
+  viocky π |
 woolishboy π» |
 yc π |
diff --git a/designs/collab/build.mjs b/designs/naomiwu/build.mjs
similarity index 100%
rename from designs/collab/build.mjs
rename to designs/naomiwu/build.mjs
diff --git a/designs/collab/data.mjs b/designs/naomiwu/data.mjs
similarity index 78%
rename from designs/collab/data.mjs
rename to designs/naomiwu/data.mjs
index 5a0f1e36cbf..abd297fc31e 100644
--- a/designs/collab/data.mjs
+++ b/designs/naomiwu/data.mjs
@@ -1,4 +1,4 @@
// This file is auto-generated | All changes you make will be overwritten.
-export const name = '@freesewing/collab'
+export const name = '@freesewing/naomiwu'
export const version = '3.0.0-alpha.10'
export const data = { name, version }
diff --git a/designs/collab/package.json b/designs/naomiwu/package.json
similarity index 92%
rename from designs/collab/package.json
rename to designs/naomiwu/package.json
index 9bcc97ffe21..c040b271df0 100644
--- a/designs/collab/package.json
+++ b/designs/naomiwu/package.json
@@ -1,7 +1,7 @@
{
- "name": "@freesewing/collab",
+ "name": "@freesewing/naomiwu",
"version": "3.0.0-alpha.10",
- "description": "FIXME: A FreeSewing pattern that is a work in progress",
+ "description": "A FreeSewing pattern for Naomi Wu's signature cargo skirt",
"author": "Joost De Cock (https://github.com/joostdecock)",
"homepage": "https://freesewing.org/",
"repository": "github:freesewing/freesewing",
@@ -65,7 +65,7 @@
"tag": "next"
},
"engines": {
- "node": ">=16.0.0",
- "npm": ">=8"
+ "node": "18",
+ "npm": "9"
}
}
diff --git a/designs/collab/src/back-attachment-back.mjs b/designs/naomiwu/src/back-attachment-back.mjs
similarity index 100%
rename from designs/collab/src/back-attachment-back.mjs
rename to designs/naomiwu/src/back-attachment-back.mjs
diff --git a/designs/collab/src/back-attachment-flap.mjs b/designs/naomiwu/src/back-attachment-flap.mjs
similarity index 100%
rename from designs/collab/src/back-attachment-flap.mjs
rename to designs/naomiwu/src/back-attachment-flap.mjs
diff --git a/designs/collab/src/back-attachment-front.mjs b/designs/naomiwu/src/back-attachment-front.mjs
similarity index 100%
rename from designs/collab/src/back-attachment-front.mjs
rename to designs/naomiwu/src/back-attachment-front.mjs
diff --git a/designs/collab/src/back-attachment-side.mjs b/designs/naomiwu/src/back-attachment-side.mjs
similarity index 100%
rename from designs/collab/src/back-attachment-side.mjs
rename to designs/naomiwu/src/back-attachment-side.mjs
diff --git a/designs/collab/src/back-pocket-flap.mjs b/designs/naomiwu/src/back-pocket-flap.mjs
similarity index 100%
rename from designs/collab/src/back-pocket-flap.mjs
rename to designs/naomiwu/src/back-pocket-flap.mjs
diff --git a/designs/collab/src/back-pocket.mjs b/designs/naomiwu/src/back-pocket.mjs
similarity index 100%
rename from designs/collab/src/back-pocket.mjs
rename to designs/naomiwu/src/back-pocket.mjs
diff --git a/designs/collab/src/back.mjs b/designs/naomiwu/src/back.mjs
similarity index 100%
rename from designs/collab/src/back.mjs
rename to designs/naomiwu/src/back.mjs
diff --git a/designs/collab/src/fly-shield.mjs b/designs/naomiwu/src/fly-shield.mjs
similarity index 100%
rename from designs/collab/src/fly-shield.mjs
rename to designs/naomiwu/src/fly-shield.mjs
diff --git a/designs/collab/src/front-attachment-facing.mjs b/designs/naomiwu/src/front-attachment-facing.mjs
similarity index 100%
rename from designs/collab/src/front-attachment-facing.mjs
rename to designs/naomiwu/src/front-attachment-facing.mjs
diff --git a/designs/collab/src/front-attachment.mjs b/designs/naomiwu/src/front-attachment.mjs
similarity index 100%
rename from designs/collab/src/front-attachment.mjs
rename to designs/naomiwu/src/front-attachment.mjs
diff --git a/designs/collab/src/front-base.mjs b/designs/naomiwu/src/front-base.mjs
similarity index 100%
rename from designs/collab/src/front-base.mjs
rename to designs/naomiwu/src/front-base.mjs
diff --git a/designs/collab/src/front-left.mjs b/designs/naomiwu/src/front-left.mjs
similarity index 100%
rename from designs/collab/src/front-left.mjs
rename to designs/naomiwu/src/front-left.mjs
diff --git a/designs/collab/src/front-pocket-bag.mjs b/designs/naomiwu/src/front-pocket-bag.mjs
similarity index 100%
rename from designs/collab/src/front-pocket-bag.mjs
rename to designs/naomiwu/src/front-pocket-bag.mjs
diff --git a/designs/collab/src/front-pocket-facing.mjs b/designs/naomiwu/src/front-pocket-facing.mjs
similarity index 100%
rename from designs/collab/src/front-pocket-facing.mjs
rename to designs/naomiwu/src/front-pocket-facing.mjs
diff --git a/designs/collab/src/front-right.mjs b/designs/naomiwu/src/front-right.mjs
similarity index 100%
rename from designs/collab/src/front-right.mjs
rename to designs/naomiwu/src/front-right.mjs
diff --git a/designs/collab/src/index.mjs b/designs/naomiwu/src/index.mjs
similarity index 61%
rename from designs/collab/src/index.mjs
rename to designs/naomiwu/src/index.mjs
index 236e24e1a61..5bfeb4d9c64 100644
--- a/designs/collab/src/index.mjs
+++ b/designs/naomiwu/src/index.mjs
@@ -1,5 +1,6 @@
import { Design } from '@freesewing/core'
import { data } from '../data.mjs'
+import { i18n } from '../i18n/index.mjs'
// Parts
import { shared } from './shared.mjs'
import { back } from './back.mjs'
@@ -19,8 +20,10 @@ import { backAttachmentFront } from './back-attachment-front.mjs'
import { backAttachmentFlap } from './back-attachment-flap.mjs'
//import { backAttachmentSide } from './back-attachment-side.mjs'
-// Create new design
-const Collab = new Design({
+/*
+ * Create new design
+ */
+const Naomiwu = new Design({
data,
parts: [
shared,
@@ -43,6 +46,26 @@ const Collab = new Design({
],
})
+/*
+ * Note that we are creating this above as 'Naomiwu' and not 'NaomiWu', which
+ * would be the correctly camel-cased name of the person it's named after.
+ *
+ * The reason is that when discussing the name with Naomi, she originally
+ * suggested 'Open Cargo Skirt'. After explaining that we typically use
+ * first-names for our designs because we provide a website in multiple
+ * languages and want to have a name that does not need translation, she
+ * suggested either 'Wu Cargo Skirt' or 'Naomi Wu Cargo Skirt'.
+ *
+ * So we landed on 'Naomi Wu Cargo Skirt' which makes the short name of this
+ * pattern (as used in the NPM package and URLs) 'naomiwu'.
+ * To get the constructure from that, we capitalize the design name, so that
+ * is why 'Naomiwu' is exported.
+ *
+ * However, to be flexible, we also export this design as NaomiWu below.
+ * This way, both ways work.
+ */
+const NaomiWu = Naomiwu
+
// Named exports
export {
shared,
@@ -62,5 +85,7 @@ export {
backAttachmentFront,
backAttachmentFlap,
//backAttachmentSide,
- Collab,
+ Naomiwu,
+ NaomiWu, // See note above
+ i18n,
}
diff --git a/designs/collab/src/shared.mjs b/designs/naomiwu/src/shared.mjs
similarity index 100%
rename from designs/collab/src/shared.mjs
rename to designs/naomiwu/src/shared.mjs
diff --git a/designs/collab/src/waistband.mjs b/designs/naomiwu/src/waistband.mjs
similarity index 100%
rename from designs/collab/src/waistband.mjs
rename to designs/naomiwu/src/waistband.mjs
diff --git a/designs/collab/tests/shared.test.mjs b/designs/naomiwu/tests/shared.test.mjs
similarity index 63%
rename from designs/collab/tests/shared.test.mjs
rename to designs/naomiwu/tests/shared.test.mjs
index be5c9ae4629..715fa93954d 100644
--- a/designs/collab/tests/shared.test.mjs
+++ b/designs/naomiwu/tests/shared.test.mjs
@@ -1,16 +1,20 @@
// This file is auto-generated | Any changes you make will be overwritten.
-import { Collab } from '../src/index.mjs'
+import { Naomiwu, i18n } from '../src/index.mjs'
// Shared tests
import { testPatternConfig } from '../../../tests/designs/config.mjs'
+import { testPatternI18n } from '../../../tests/designs/i18n.mjs'
import { testPatternDrafting } from '../../../tests/designs/drafting.mjs'
import { testPatternSampling } from '../../../tests/designs/sampling.mjs'
// Test config
-testPatternConfig(Collab)
+testPatternConfig(Naomiwu)
+
+// Test translation
+testPatternI18n(Naomiwu, i18n)
// Test drafting - Change the second parameter to `true` to log errors
-testPatternDrafting(Collab, false)
+testPatternDrafting(Naomiwu, false)
// Test sampling - Change the second parameter to `true` to log errors
-testPatternSampling(Collab, false)
+testPatternSampling(Naomiwu, false)
diff --git a/sites/shared/hooks/use-design.mjs b/sites/shared/hooks/use-design.mjs
index 2b934cf2890..a8e3e37f3d5 100644
--- a/sites/shared/hooks/use-design.mjs
+++ b/sites/shared/hooks/use-design.mjs
@@ -12,7 +12,6 @@ import { Carlita } from '@freesewing/carlita'
import { Carlton } from '@freesewing/carlton'
import { Cathrin } from '@freesewing/cathrin'
import { Charlie } from '@freesewing/charlie'
-import { Collab } from '@freesewing/collab'
import { Cornelius } from '@freesewing/cornelius'
import { Diana } from '@freesewing/diana'
import { Florence } from '@freesewing/florence'
@@ -26,6 +25,7 @@ import { Jaeger } from '@freesewing/jaeger'
import { Lucy } from '@freesewing/lucy'
import { Lunetius } from '@freesewing/lunetius'
import { Magde } from '@freesewing/magde'
+import { Naomiwu } from '@freesewing/naomiwu'
import { Noble } from '@freesewing/noble'
import { Octoplushy } from '@freesewing/octoplushy'
import { Paco } from '@freesewing/paco'
@@ -76,6 +76,7 @@ const designs = {
lucy: Lucy,
lunetius: Lunetius,
magde: Magde,
+ naomiwu: Naomiwu,
noble: Noble,
octoplushy: Octoplushy,
paco: Paco,