diff --git a/config/social.mjs b/config/social.mjs
index 9b7219178f7..0b2ad9dcb4e 100644
--- a/config/social.mjs
+++ b/config/social.mjs
@@ -6,4 +6,5 @@ export const social = {
GitHub: 'https://github.com/freesewing',
Reddit: 'https://www.reddit.com/r/freesewing/',
Mastodon: 'https://freesewing.social/@freesewing',
+ Bluesky: 'https://bsky.app/profile/freesewing.org',
}
diff --git a/config/templates/readme.dflt.md b/config/templates/readme.dflt.md
index 27b85126066..ab9543f8178 100644
--- a/config/templates/readme.dflt.md
+++ b/config/templates/readme.dflt.md
@@ -59,7 +59,7 @@ show you how to create your first parametric design.
FreeSewing is an open source project maintained by Joost De Cock and financially supported by the FreeSewing patrons.
-If you feel FreeSewing is worthwhile, and you can spend a few coind without
+If you feel FreeSewing is worthwhile, and you can spend a few coins without
hardship, then you should [join us and become a patron](https://freesewing.org/community/join).
## Links 👩💻
diff --git a/config/templates/readme.main.md b/config/templates/readme.main.md
index b35f5778a16..141d107f850 100644
--- a/config/templates/readme.main.md
+++ b/config/templates/readme.main.md
@@ -92,7 +92,7 @@ show you how to create your first parametric design.
FreeSewing is an open source project maintained by Joost De Cock and financially supported by the FreeSewing patrons.
-If you feel FreeSewing is worthwhile, and you can spend a few coind without
+If you feel FreeSewing is worthwhile, and you can spend a few coins without
hardship, then you should [join us and become a patron](https://freesewing.org/community/join).
## Links 👩💻
diff --git a/markdown/org/blog/v3-umbrella-post/en.md b/markdown/org/blog/v3-umbrella-post/en.md
index 7ddbf2f28dd..5f4734e357f 100644
--- a/markdown/org/blog/v3-umbrella-post/en.md
+++ b/markdown/org/blog/v3-umbrella-post/en.md
@@ -8,5 +8,27 @@ author: joost
There's a flurry of news and announcements about FreeSewing v3, so this _umbrella post_ gathers all of them into one place.
-If you're looking for the best link to share regarding the v3 release and migration, this is probably the one.
+If you're looking for the best link to share regarding the v3 release and migration, this post is your best bet.
+
+##### FreeSewing is now pay-what-you-want
+
+[This post outlines the reasoning behind FreeSewing's new pricing](/blog/freesewing-is-now-pay-what-you-want)
+
+##### Welcome to the new FreeSewing.org site, powered by v3
+
+[This is the _official_ announcement post for the new website](/blog/welcome-to-freesewining-3)
+
+##### Announcing FreeSewing.social
+
+[Announcement of FreeSewing's own Mastodon instance, and our departure from Twitter](/blog/announcing-freesewing-social)
+
+##### Opening up the FreeSewing backend API
+
+[Announcement of the new API keys feature that lets anyone connect to our backend to retrieve data](/blog/open-backend-api)
+
+##### Announcing FreeSewing v3.0
+
+[Announcement of the release of v3.0.0 of FreeSewing's core library](/blog/announcing-freesewing-v30)
+
+
diff --git a/markdown/org/docs/about/site/draft/en.md b/markdown/org/docs/about/site/draft/en.md
index 0f47173fd11..185cc319328 100644
--- a/markdown/org/docs/about/site/draft/en.md
+++ b/markdown/org/docs/about/site/draft/en.md
@@ -56,3 +56,4 @@ This allows you to quickly verify the specific role of a setting or option witho
## Editor modes
+Complete these docs
diff --git a/sites/org/pages/blog/index.mjs b/sites/org/pages/blog/index.mjs
index 7723224ce15..78fb3b1c1c0 100644
--- a/sites/org/pages/blog/index.mjs
+++ b/sites/org/pages/blog/index.mjs
@@ -15,7 +15,11 @@ const namespaces = nsMerge('designs', 'sections', pageNs)
// Helper object to order posts
const order = {}
-for (const [slug, props] of Object.entries(meta)) order[props.d] = slug
+let i = 0 // Avoid posts with same date not showing up
+for (const [slug, props] of Object.entries(meta)) {
+ i++
+ order[props.d + i] = slug
+}
export const recentBlogPosts = Object.keys(order)
.sort()
diff --git a/sites/org/pages/support.mjs b/sites/org/pages/support.mjs
index b2be2007b97..80097467043 100644
--- a/sites/org/pages/support.mjs
+++ b/sites/org/pages/support.mjs
@@ -16,7 +16,7 @@ import {
GitHubIcon,
InstagramIcon,
RedditIcon,
- TwitterIcon,
+ MastodonIcon,
YouTubeIcon,
CommunityIcon,
ChatIcon,
@@ -47,12 +47,12 @@ const SupportCard = ({ bg, textColor, title, icon, nr }) => (
)
const socialIcon = {
+ mastodon: ,
+ github: ,
discord: ,
facebook: ,
- github: ,
instagram: ,
reddit: ,
- twitter: ,
youtube: ,
}
@@ -85,7 +85,7 @@ const SupportPage = ({ page }) => {
-
{Object.entries(logs).map(([type, lines], key) => (
))}
diff --git a/sites/shared/config/social.mjs b/sites/shared/config/social.mjs
index 585eb9918b5..cf82252b633 100644
--- a/sites/shared/config/social.mjs
+++ b/sites/shared/config/social.mjs
@@ -7,4 +7,5 @@ export const social = {
GitHub: 'https://github.com/freesewing',
Reddit: 'https://www.reddit.com/r/freesewing/',
Mastodon: 'https://freesewing.social/@freesewing',
+ Bluesky: 'https://bsky.app/profile/freesewing.org',
}
diff --git a/sites/shared/i18n/support/en.yaml b/sites/shared/i18n/support/en.yaml
index 56fcd6145b2..de9c838295b 100644
--- a/sites/shared/i18n/support/en.yaml
+++ b/sites/shared/i18n/support/en.yaml
@@ -1,13 +1,44 @@
-support: Support
+accountIssue: Account problem
+accountIssueDesc: Do you have trouble with your FreeSewing account?
+addImage: Add an image
+bugReport: Report a bug
+bugReportDesc: Is something broken, or not working as expected?
+createSupportRequest: Create a support request
communitySupport: Community Support
communitySupport1: For the fastest response, head over to discord.freesewing.org and post your question in the Support channel.
communitySupport2: The FreeSewing community is a helpful bunch, so there is a good chance they are able to help you.
contributorSupport: Contributor Support
contributorSupport1: If something is broken or you have found a bug, you can create an issue on GitHub.
contributorSupport2: Issues are more likely to attract the attention of core contributors, but tend to take longer to get a response.
+description: Description
+descriptionDocs1: This is where you can describe the issue
+design: Design
+designDocs1: Pick the FreeSewing design this issue applies to
+designIssue: Report an issue with a FreeSewing Design
+designIssueDesc: Are you having trouble with a FreeSewing design or the pattern you are generating from it?
+docsUpdate: Documentation update
+docsUpdateDesc: Is there something to be improved about our documentation?
+featureRequest: Feature request
+featureRequestDesc: Is there something you would like to see happen or implemented?
+howCanWeSupportYou: How can we support you?
+howCanYouSupportFreeSewing: How can you support FreeSewing?
maintainerSupport: Maintainer Support
maintainerSupport1: If you are a FreeSewing patron, you can go straight to the top and contact Joost directly.
maintainerSupport2: While Joost will treat requests from patrons with priority, he does also needs sleep. So keep that in mind, especially when you are in a different time zone.
+other: Something else
+otherDesc: Do you have something else you required assistance with?
+patronSponsor: Patrons / Sponsorship
+patronSponsorDesc: Do you have questions about FreeSewing patronship or (corporate) sponsorship?
+question: Question
+questionDesc: Do you have a general question to ask?
+security: Security
+securityDesc: Do you want to report a security issue or incident?
+submitSupportRequest: Submit support request
+support: Support
+title: Title
+titleDocs1: This is the title of the issue
+titleDocs2: Best to keep it short and to the point
+useGitHubInstead: Use GitHub instead
whatIsDiscord: What is Discord?
whatIsDiscord1: Discord is a free chat platform where communities can come together to chat discuss their interests. It also supports (group) voice and video calls.
whatIsDiscord2: FreeSewing has its own Discord community (a server in Discord terminology) at
diff --git a/sites/shared/prebuild/sitenav-org.mjs b/sites/shared/prebuild/sitenav-org.mjs
index b28d386057e..8d0fe7e0282 100644
--- a/sites/shared/prebuild/sitenav-org.mjs
+++ b/sites/shared/prebuild/sitenav-org.mjs
@@ -116,6 +116,7 @@ export const extendSiteNav = async (siteNav, lang) => {
t: 'Curated Measurement Sets',
s: 'admin/cset',
_: 1,
+ h: 1,
},
}