From 250152cc1b6a67bd18f4b211856fa98ec06d8eda Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 1 Dec 2023 19:31:08 +0000 Subject: Update production (#37) * Edit README (#28) * Corrects Lallans instructions * Adds instructions for adding a Scotsoun release * Documents infrastructure * Better contribution guidance * Update README (#29) * Updates references to branch names in README * ESLint ignores Markdown * Documents Coding Style * Specifies upstream branch in README where salient * Fixes Sangschaw winners list in Eiks 30 (#35) * Fixes Sangschaw winners list in Eiks 30 (#36) * Fixes Sangschaw winners list in Eiks 30 (#38) --- .eslintrc.json | 2 +- README.md | 178 +++++++++++++++------ .../news/en-GB/2023-03-17-eiks-an-ens-30.mdx | 41 +++++ src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx | 28 ++++ 4 files changed, 201 insertions(+), 48 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f0cdd75..a055dd2 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -8,7 +8,7 @@ "plugin:astro/recommended", "plugin:@typescript-eslint/recommended" ], - "ignorePatterns": ["api"], + "ignorePatterns": ["api", "*.md"], "overrides": [ { "files": ["*.astro"], diff --git a/README.md b/README.md index 69c8925..f24a853 100644 --- a/README.md +++ b/README.md @@ -11,59 +11,143 @@ git clone https://github.com/Sycamost/lallans-wabsteid-astro.git \ && npm run dev ``` -## All you need to edit the website +## Contributing -* Has a text editor or IDE and can use it to edit text files. -* Can write Markdown. (Beginners can learn in an afternoon by following the +### All you need to edit the website + +- Has a text editor or IDE and can use it to edit text files. +- Can write Markdown. (Beginners can learn in an afternoon by following the [getting started guide](https://www.markdownguide.org/getting-started/)!) -* Has a [GitHub](https://github.com/join) account. -* Can use Git to clone, pull, push, stage files, commit staged files, branch and - checkout. Here's a great [beginner's tutorial to Git](https://www.atlassian.com/git) - and here's another great, interactive - [Git tutorial focusing on branching](https://learngitbranching.js.org/). -* Can use GitHub to make a fork and make a Pull Request back into the upstream - repository. Here's - [a basic GitHub tutorial](https://docs.github.com/en/get-started/quickstart/hello-world) - and here's a - [GitHub guide to forking](https://docs.github.com/en/get-started/quickstart/fork-a-repo). -* Can use a [command-line terminal](https://www.freecodecamp.org/news/command-line-for-beginners/). -* Can use [NPM](https://nodesource.com/blog/an-absolute-beginners-guide-to-using-npm/) - to install dependencies and run scripts. - -## Writing a news post +- Has a [GitHub](https://github.com/join) account. +- Can use Git to clone, pull, push, stage files, commit staged files, branch and checkout. Here's a + great [beginner's tutorial to Git](https://www.atlassian.com/git) and here's another great, + interactive [Git tutorial focusing on branching](https://learngitbranching.js.org/). +- Can use GitHub to make a fork and make a Pull Request back into the upstream repository. Here's + [a basic GitHub tutorial](https://docs.github.com/en/get-started/quickstart/hello-world) and + here's a [GitHub guide to forking](https://docs.github.com/en/get-started/quickstart/fork-a-repo). +- Can use a [command-line terminal](https://www.freecodecamp.org/news/command-line-for-beginners/). +- Can use [NPM](https://nodesource.com/blog/an-absolute-beginners-guide-to-using-npm/) to install + dependencies and run scripts. + +### General guidance 1. If you haven't already, fork the repository, and clone your fork. -2. Copy and paste an existing news article in both English and Scots. You will - find these in `src/content/news/en-GB` and `src/content/news/scots` respectively. -3. Rename the news article following the existing pattern, which is the date of - publication in `YYYY-MM-DD` format followed by the title in +2. Make a suitably named branch on your fork. +3. Make your desired changes (see sections below for common cases). +4. Commit and push them on your branch. +5. Make a Pull Request to merge your changes into `Sycamost/deployment-staging`. +6. A code owner (probably the Scots Language Society Webmaster) will review your Pull Request, ask + for any necessary changes, and when satisfied, merge it into `Sycamost/deployment-staging`. (This will + update the [staging deployment](#cicd) on + [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org).) +7. Code owners will merge `Sycamost/deployment-staging` into `Sycamost/deployment-production` at their discretion. + (This will update the production deployment on + [scotsleidassocie.org](https://scotsleidassocie.org).) + +### Coding style + +Coding style is enforced by ESLint and Prettier. These tools are run on a commit hook, and you will +not be able to commit if they fail. Please refrain from using `git commit --no-verify` except in +extraordinary cases, and make it clear in your Pull Request when you have done so. + +### Writing a news post + +Follow this guidance alongside the [general guidance](#general-guidance). + +1. Copy and paste an existing news article in both English and Scots. You will find these in + `src/content/news/en-GB` and `src/content/news/scots` respectively. +2. Rename the news article following the existing pattern, which is the date of publication in + `YYYY-MM-DD` format followed by the title in [kebab case](https://www.freecodecamp.org/news/snake-case-vs-camel-case-vs-pascal-case-vs-kebab-case-whats-the-difference/#whatiskebabcaseanamekebabcasea) - and the `.mdx` file extension. For example, `2023-12-24-eiks-an-ens-3000.mdx` - would be Eiks an Ens 3000, published on the 24th of December 2023. -4. Edit the news articles to contain your desired content. -5. Check it looks OK by running the website locally with `npm install && npm start`. -6. When it looks OK, stage, commit and push your new news articles. -7. Make a pull request to merge your new news articles into the `dev` branch upstream. -8. Once a code owner approves your pull request, it'll get merged into `dev`, and - (unless you yourself are a code owner) it is from that point no longer your - problem! From that point, it'll be live on - [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org), - and it'll go live on [scotsleidassocie.org](https://scotsleidassocie.org) once - a code owner merges `dev` into `main`. - -## Adding an issue of Lallans + and the `.mdx` file extension. For example, `2023-12-24-eiks-an-ens-3000.mdx` would be Eiks an + Ens 3000, published on the 24th of December 2023. +3. Edit the news articles to contain your desired content. +4. Check it looks OK by running the website locally with `npm install && npm start`. + +### Adding an issue of Lallans + +Follow this guidance alongside the [general guidance](#general-guidance). 1. Add the issue number to `src/types/LallansIssueNumber.d.ts`. -2. Add the original issue cover photo as `src/images/issueXYZ.jpg`, where `XYZ` - is the issue number. Most of the examples are `.jpg`, but the file type isn't important. -3. Make copies of the cover image that are scaled to 192 and 274 pixels wide. - Name them `issueXYZ-192w.jpg` and `issueXYZ-274w.jpg` respectively. -4. Copy one of the existing Lallans issues in `src/data/lallans` and name the - copy `issueXYZ.ts`. -5. Edit the file you just made with the new issue's information, including the - locations of the correctly scaled cover images that you just made. +2. Add the original issue cover photo as `src/images/lallans/issueXYZ.jpg`, where `XYZ` is the issue + number. Most of the examples are `.jpg`, but the file type isn't important. +3. Make copies of the cover image that are scaled to 192 and 274 pixels wide. Name them + `issueXYZ-192w.jpg` and `issueXYZ-274w.jpg` respectively. +4. Copy one of the existing Lallans issues in `src/data/lallans` and name the copy `issueXYZ.ts`. +5. Edit the file you just made with the new issue's information, including the locations of the + correctly scaled cover images that you just made. 6. Import that data file into the Lallans data index file, `src/data/lallans/index.ts`. -7. Check that everything's working: the issue should appear at the top on the - Lallans page, `/furthsettins/lallans`, and the issue information should appear - at `/furthsettins/lallans/XYZ`. Check both the English and Scots versions. +7. Check that everything's working: the issue should appear at the top on the Lallans page, + `/furthsettins/lallans`, and the issue information should appear at `/furthsettins/lallans/XYZ`. + Check both the English and Scots versions. + +### Adding a Scotsoun release + +Follow this guidance alongside the [general guidance](#general-guidance). + +1. Add the release ID to `src/types/ScotsounId.d.ts`. +2. Add the original cover image as `src/images/scotsoun/scotsounXYZ.jpg`, where `XYZ` is the release + ID. Most of the examples are `.jpg`, but the file type isn't important. +3. Make a copy of the cover image which is scaled to 192 pixels wide, and name it + `scotsounXYZ-192w.jpg`. +4. Copy one of the existing Scotsoun releases in `src/data/scotsoun` and name the copy + `scotsounXYZ.ts`. +5. Edit the file you just made with the new release's information, including the location of the + correctly scaled cover image that you just made. +6. Import that data file into the Scotsoun data index file, `src/data/scotsoun/index.ts`. +7. Check that everything's working: the release should appear at the top on the Scotsoun page, + `/furthsettins/scotsoun`, and the release information should appear at + `/furthsettins/scotsoun/XYZ`. Check both the English and Scots versions. + +## Infrastructure + +The deployment infrastructure for the website is in four parts: the domains, the SSL certificates, +the hosting, and the CI/CD. + +### Domains + +The website is served on two domain names: [lallans.co.uk](https://www.lallans.co.uk) and +[scotsleidassocie.org](https://scotsleidassocie.org). The lallans.co.uk domain is legacy, but will +redirect to scotsleidassocie.org until at least September 2024. + +Firstly, lallans.co.uk is registered with [JoomlaWired](https://www.joomlawired.com), a hosting +company specialising in hosting Joomla! and WordPress websites. We used to host a Joomla! website +with them, hence the connection. We don't host anything with them any more, but we still rent the +lallans.co.uk domain from them. The [Scots Language Society Webmaster](mailto:lallans@hotmail.co.uk) +should have access to JoomlaWired. + +Redirecting requests to lallans.co.uk to scotsleidassocie.org is handled by [Vercel](#hosting). + +Meanwhile, scotsleidassocie.org is rented from AWS. Again, the Webmaster should have access to the +AWS Console. + +### SSL certificates + +The SSL certificate for scotsleidassocie.org is bought from AWS Certificates Manager. Again, the +Webmaster should have access to the AWS Console. + +### Hosting + +The website is hosted on [Vercel](https://vercel.com/sycamost/lallans-wabsteid-astro). Because we +have the free plan, unfortunately only the Webmaster can access the Vercel dashboard. + +Vercel also handles redirecting from lallans.co.uk to scotsleidassocie.org. + +### CI/CD + +Our CI/CD pipeline is, thanks to the fantastic integration between GitHub and Vercel, no-code! We +just need to make commits to the repo to see them deployed automagically. + +Ideally, we should check everything's working on deployment before everyone on the internet starts +looking at it. For that reason, we have a staging deployment at +[staging.scotsleidassocie.org](https://staging.scotsleidassocie.org). To update the staging +deployment, simply commit to `deployment-staging` by making a Pull Request and getting it approved +by a code owner and then merged. +To update production, you'll want to first merge your changes into `deployment-staging` by making a +Pull Request and getting it approved and merged. Once you've done that, given it five minutes to +deploy, and you've checked that everything looks good on +[staging.scotsleidassocie.org](https://staging.scotsleidassocie.org), +[make a Pull Request to merge deployment-staging into deployment-production](https://github.com/Sycamost/lallans-wabsteid-astro/compare/deployment-production...deployment-staging). +Once that Pull Request is approved by a code owner, merge it in and it should update production in +under five minutes. diff --git a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx index bc75660..34a83ac 100644 --- a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx +++ b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx @@ -49,13 +49,43 @@ _Haymarket Wumman_ by Jerry Randalls #### Ruisit _Bother wi a Babby Bird_ by Anne Jones + _Benny_ by Andrew G Matthews + _Kafka_ by Pete Fortune ### The John MacPhail Law Tassie for Owersettin #### Winner +_A Sang tae the Heir_ by Derrick McClure + +#### Jynt Rinner-up + +_The King o the Bees_ by Dorothy Lawrenson + +_Salome_ by Jerry Randalls + +#### Ruisit + +_Mylkwiffe_ by Donald Adamson + +_Weddin Blessin_ by Gordon Davidson + +_A Dug wi Nae Maister_ by Tom Ellett + +_Seeven Auld Fodies_ by WS Milne + +_The Tale o Thorstein Grue_ by Colin Mackenzie + +_The Yirdin o Sorley MacLean_ by Derrick McClure + +_Propertius_ by John Erskine + +### The Hugh MacDiarmaid Tassie for Poesie + +#### Winner + _Roond Stane_ by Finola Scott #### Jynt Rinner-up @@ -66,16 +96,27 @@ _Aliens_ by James Sinclair #### Ruisit _Chale Shaw_ by Joe Carstairs + _John MacLean’s Coat_ by Robert Duncan + _Jock Tamson’s Luve-Bairns_ by David Bleiman + _Bauk in the USSR_ by Alastair McLeish + _Eldritch, Cretaceous Man Jinkin_ by Alan Millar + _The Ootgaun_ by Hamish Scott + _Mindin Joe_ by Jock Stein + _The Ceremonie o Cairnholy_ by Donald Adamson + _A New Sang_ by David Bleiman + _Ahint the Haund_ by Kevin Connelly + _The Marriage Lair_ by Irene Howat + _Leid in ma Heid_ by Alan Millar ## Wittins: Sangschaw, Lallans 102-103 diff --git a/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx b/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx index ef094d4..201642c 100644 --- a/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx +++ b/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx @@ -59,6 +59,34 @@ _Kafka_ bi Pete Fortune #### Winner +_A Sang tae the Heir_ bi Derrick McClure + +#### Jynt Rinner-up + +_The King o the Bees_ bi Dorothy Lawrenson + +_Salome_ bi Jerry Randalls + +#### Ruisit + +_Mylkwiffe_ bi Donald Adamson + +_Weddin Blessin_ bi Gordon Davidson + +_A Dug wi Nae Maister_ bi Tom Ellett + +_Seeven Auld Fodies_ bi WS Milne + +_The Tale o Thorstein Grue_ bi Colin Mackenzie + +_The Yirdin o Sorley MacLean_ bi Derrick McClure + +_Propertius_ bi John Erskine + +### The Hugh MacDiarmaid Tassie for Poesie + +#### Winner + _Roond Stane_ bi Finola Scott #### Jynt Rinner-up -- cgit v1.2.3 From fe9844b8eac1daf3eeedf141e223d0733c892fa0 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Sun, 17 Dec 2023 14:06:23 +0000 Subject: Update production from staging (#48) * Edit README (#28) * Corrects Lallans instructions * Adds instructions for adding a Scotsoun release * Documents infrastructure * Better contribution guidance * Update README (#29) * Updates references to branch names in README * ESLint ignores Markdown * Documents Coding Style * Specifies upstream branch in README where salient * Fixes Sangschaw winners list in Eiks 30 (#35) * Fixes Sangschaw winners list in Eiks 30 (#36) * Fixes Sangschaw winners list in Eiks 30 (#38) * Eiks 31 (#41) * Eiks 31 * Prettier dl's * Prettier headings --------- Co-authored-by: Joe Carstairs * Reorder news (#42) * Reslugs news items * Fixes typo in getMostRecentNewsItem() * Fixes typo in newUtils.getDate() * Sorts news index from most recent to oldest * Eiks 31 fixes (#43) * Eiks 31 fixes * Improves list styling * Links to Leid title track on YouTube (#45) * Eiks 31 fixes (#47) * Links to Leid title track on YouTube * Corrects Sangschaw pricing * Update production (#37) (#49) * Edit README (#28) * Corrects Lallans instructions * Adds instructions for adding a Scotsoun release * Documents infrastructure * Better contribution guidance * Update README (#29) * Updates references to branch names in README * ESLint ignores Markdown * Documents Coding Style * Specifies upstream branch in README where salient * Fixes Sangschaw winners list in Eiks 30 (#35) * Fixes Sangschaw winners list in Eiks 30 (#36) * Fixes Sangschaw winners list in Eiks 30 (#38) --------- Co-authored-by: Joe Carstairs --- scss/base/dl.scss | 5 + scss/base/index.scss | 6 +- scss/base/typography.scss | 5 +- scss/modules/committee.scss | 3 +- scss/modules/link-gallery.scss | 1 + scss/modules/nav.scss | 9 +- scss/modules/product.scss | 11 ++ scss/modules/schedule.scss | 1 + scss/normalize.scss | 4 - src/components/LallansIssueContributions.astro | 8 +- src/components/LallansIssueContributors.astro | 4 +- src/components/Scotsoun.astro | 2 +- src/content/news/en-GB/2023-03-17-eiks-30.mdx | 171 ++++++++++++++++++++ .../news/en-GB/2023-03-17-eiks-an-ens-30.mdx | 171 -------------------- src/content/news/en-GB/2023-12-10-eiks-31.mdx | 120 ++++++++++++++ src/content/news/sco/2023-03-17-eiks-30.mdx | 173 +++++++++++++++++++++ src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx | 173 --------------------- src/content/news/sco/2023-12-10-eiks-31.mdx | 116 ++++++++++++++ src/lib/newsUtils.ts | 20 ++- src/pages/[locale]/news/[...slug].astro | 23 +-- src/pages/[locale]/news/index.astro | 6 +- 21 files changed, 642 insertions(+), 390 deletions(-) create mode 100644 scss/base/dl.scss create mode 100644 src/content/news/en-GB/2023-03-17-eiks-30.mdx delete mode 100644 src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx create mode 100644 src/content/news/en-GB/2023-12-10-eiks-31.mdx create mode 100644 src/content/news/sco/2023-03-17-eiks-30.mdx delete mode 100644 src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx create mode 100644 src/content/news/sco/2023-12-10-eiks-31.mdx diff --git a/scss/base/dl.scss b/scss/base/dl.scss new file mode 100644 index 0000000..95cc836 --- /dev/null +++ b/scss/base/dl.scss @@ -0,0 +1,5 @@ +dt { + font-weight: 700; + text-decoration: underline; + margin-top: 1rem; +} \ No newline at end of file diff --git a/scss/base/index.scss b/scss/base/index.scss index da4f59e..f338772 100644 --- a/scss/base/index.scss +++ b/scss/base/index.scss @@ -1,4 +1,4 @@ -@use 'typography'; -@use 'theme'; +@use 'dl'; @use 'list'; - +@use 'theme'; +@use 'typography'; diff --git a/scss/base/typography.scss b/scss/base/typography.scss index fb2ac17..9f40bcc 100644 --- a/scss/base/typography.scss +++ b/scss/base/typography.scss @@ -45,6 +45,8 @@ h3, h4 { font-family: var(--font-serif); font-weight: 700; + line-height: 1.15; + text-wrap: balance; } .title { @@ -52,6 +54,7 @@ h4 { font-size: var(--font-size-6); font-weight: 700; margin-block-start: var(--margin-block-sm); + text-wrap: balance; } .title--small { @@ -59,7 +62,7 @@ h4 { margin-block-start: 0; } -p:not(:first-child) { +:is(p, ol, ul):not(:first-child) { margin-block-start: var(--margin-block-sm); } diff --git a/scss/modules/committee.scss b/scss/modules/committee.scss index 8817fc1..2badf57 100644 --- a/scss/modules/committee.scss +++ b/scss/modules/committee.scss @@ -1,4 +1,5 @@ .committee__member { + list-style-type: none; margin-block-start: var(--margin-block-sm); } @@ -6,4 +7,4 @@ margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width)); width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width)); border-radius: 50%; -} \ No newline at end of file +} diff --git a/scss/modules/link-gallery.scss b/scss/modules/link-gallery.scss index c3788dc..56949e2 100644 --- a/scss/modules/link-gallery.scss +++ b/scss/modules/link-gallery.scss @@ -9,6 +9,7 @@ text-align: center; li { + list-style-type: none; grid-column: span var(--gallery-item-column-span); } diff --git a/scss/modules/nav.scss b/scss/modules/nav.scss index 44ec5c6..aebcbcf 100644 --- a/scss/modules/nav.scss +++ b/scss/modules/nav.scss @@ -1,5 +1,5 @@ .nav > :not(:last-child) { - margin-block-end: var(--margin-block-sm); + margin-block: 0 var(--margin-block-sm); } .nav__bottom-row { @@ -11,10 +11,11 @@ display: grid; grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); column-gap: var(--grid-gutter-width); -} -.nav__nav-links li { - margin: 0; + li { + list-style-type: none; + margin: 0; + } } .nav__logo { diff --git a/scss/modules/product.scss b/scss/modules/product.scss index 32fa37f..bc05dfd 100644 --- a/scss/modules/product.scss +++ b/scss/modules/product.scss @@ -18,3 +18,14 @@ width: 100%; height: auto; } + +:is(.product__contributors, .product__contributions) { + list-style-type: none; +} + +.product__contribution__title { + font-style: italic; + &:has(+ .product__contribution__author) { + margin-inline-end: 0.3em; + } +} diff --git a/scss/modules/schedule.scss b/scss/modules/schedule.scss index 140767c..40a9fee 100644 --- a/scss/modules/schedule.scss +++ b/scss/modules/schedule.scss @@ -6,6 +6,7 @@ font-weight: 700; margin-block-start: var(--margin-block-sm); text-align: center; + text-decoration: none; } .schedule dd { diff --git a/scss/normalize.scss b/scss/normalize.scss index 0130a0b..9d59ef8 100644 --- a/scss/normalize.scss +++ b/scss/normalize.scss @@ -110,7 +110,3 @@ a, :link, :visited { color: currentColor; text-decoration: none; } - -li { - list-style: none; -} diff --git a/src/components/LallansIssueContributions.astro b/src/components/LallansIssueContributions.astro index 5d3084d..165829d 100644 --- a/src/components/LallansIssueContributions.astro +++ b/src/components/LallansIssueContributions.astro @@ -15,13 +15,15 @@ const t = translate(locale);

Contributions

-
    +
      { contributions.map((contribution) => (
    • - {contribution.title} + {contribution.title} {'author' in contribution && ( - {t(tSite, { key: 'by' }) + ' ' + contribution.author} + + {t(tSite, { key: 'by' }) + ' ' + contribution.author} + )}
      • )) diff --git a/src/components/LallansIssueContributors.astro b/src/components/LallansIssueContributors.astro index 5ac5d42..4a5683c 100644 --- a/src/components/LallansIssueContributors.astro +++ b/src/components/LallansIssueContributors.astro @@ -8,9 +8,9 @@ interface Props { const { contributors } = Astro.props; --- -
      +

      Contributors

      -
        +
          {contributors.map((contributor) =>
        • {contributor}
          • )}
      diff --git a/src/components/Scotsoun.astro b/src/components/Scotsoun.astro index bbf9730..cca330d 100644 --- a/src/components/Scotsoun.astro +++ b/src/components/Scotsoun.astro @@ -56,7 +56,7 @@ const t = translate(locale); scotsoun?.trackList && scotsoun.trackList.length > 1 && ( <>

      Track list

      -
        +
          {scotsoun.trackList.map((track) => (
        1. {track}
          2. ))} diff --git a/src/content/news/en-GB/2023-03-17-eiks-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-30.mdx new file mode 100644 index 0000000..34a83ac --- /dev/null +++ b/src/content/news/en-GB/2023-03-17-eiks-30.mdx @@ -0,0 +1,171 @@ +--- +title: Eiks an Ens 30 +summary: >- + Included in this issue of Eiks an Ens are details of our next + Conference in Perth and of our anthologies, which are having + very positive reviews and are well worth the money. +--- +import Link from '$components/Link.astro'; +import Schedule from '$components/Schedule.astro'; + +## Annual Conference + +The Annual Conference of the Scots Language Society will be held on Saturday the +3rd in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 +8EP. This year’s theme will be _The Art of Flyting in Scottish Literature_. + + + +The cost of attending the Collogue is £20. Contact George Watt on +lallans@hotmail.co.uk +or Elaine Morton on +failte@go-plus.net. + +## Sangschaw 2023 Winners + +### The Robert McLellan Tassie fur Scots Prose + +#### Winner + +_Aince_ by Jamie Purves + +#### Rinner-up + +_Haymarket Wumman_ by Jerry Randalls + +#### Ruisit + +_Bother wi a Babby Bird_ by Anne Jones + +_Benny_ by Andrew G Matthews + +_Kafka_ by Pete Fortune + +### The John MacPhail Law Tassie for Owersettin + +#### Winner + +_A Sang tae the Heir_ by Derrick McClure + +#### Jynt Rinner-up + +_The King o the Bees_ by Dorothy Lawrenson + +_Salome_ by Jerry Randalls + +#### Ruisit + +_Mylkwiffe_ by Donald Adamson + +_Weddin Blessin_ by Gordon Davidson + +_A Dug wi Nae Maister_ by Tom Ellett + +_Seeven Auld Fodies_ by WS Milne + +_The Tale o Thorstein Grue_ by Colin Mackenzie + +_The Yirdin o Sorley MacLean_ by Derrick McClure + +_Propertius_ by John Erskine + +### The Hugh MacDiarmaid Tassie for Poesie + +#### Winner + +_Roond Stane_ by Finola Scott + +#### Jynt Rinner-up + +_The Black Loch_ by Robert Duncan +_Aliens_ by James Sinclair + +#### Ruisit + +_Chale Shaw_ by Joe Carstairs + +_John MacLean’s Coat_ by Robert Duncan + +_Jock Tamson’s Luve-Bairns_ by David Bleiman + +_Bauk in the USSR_ by Alastair McLeish + +_Eldritch, Cretaceous Man Jinkin_ by Alan Millar + +_The Ootgaun_ by Hamish Scott + +_Mindin Joe_ by Jock Stein + +_The Ceremonie o Cairnholy_ by Donald Adamson + +_A New Sang_ by David Bleiman + +_Ahint the Haund_ by Kevin Connelly + +_The Marriage Lair_ by Irene Howat + +_Leid in ma Heid_ by Alan Millar + +## Wittins: Sangschaw, Lallans 102-103 + +Our own Lord Braxfield, Judge of the Sangschaw, will deliver his summary of +this year’s happenings in Lallans 102. The word on the street is that the +cranky old grump was pretty impressed by what was put before him. So keep at +it, Scots writers - it vexes him no end to see the Scots language being put to +such good effect! It’s not too early to start working on your masterpiece for +next year. The winner of the poetry class is printed below, but the editor will +endeavour to include as many entries as possible in the forthcoming Lallans +102/103. The summer number in particular will have an extraordinary and broad +showing of further Scots writing, including an interview with Scots Radio +broadcaster Frieda Morrison; Fred Freeman’s epic on Burns, Hamish Henderson +and song; the final instalment of Sam Burns’ Deacon Broadie play and an +abundance of thought-provoking poetry, stories, reviews and news concerning +all the other ventures in the ever-expanding world of the Scots language. + +## _The Galloway Hoard, Kirkcudbright Museum_ by Finola Scott + +_Winner of the Hugh MacDiarmid Cup for Poetry, Sangschaw 2023_ + +Aw muscle and glaur, he’s preenin
          +An muckle boastin. Yi’d think
          +He wis the first. In he struts
          +Aw Cock o the walk,
          +King o Faithers, comb throbbin.
          + +Aye unnerfit, he wants tae feel
          +Ma flutters, tae cup the load I coorie.
          +He brags aboot the hero it’ll be.
          +Weel mibbe, but fir noo it’s jist
          +A wee will o the wisp, ma treisur.
          + +I shouldnae compleen, sure he broucht
          +thon gift - a wee baa. Its hollow jinglet
          +when I joogelt it. I thocht it a toy
          +fir the bairn. But naw, seems it’s tae ease
          +an bless the birthin. Whit a man.
          + +## Anthologies + +The Scots Language Society is a registered charity run by volunteers. By being +a member of the Society, you are already giving the Scots language a boost. +You can help us further by purchasing one or both of our first-rate +50th-anniversary anthologies: contact our membership Secretary, George T Watt +at lallans@hotmail.co.uk +or Willie Hershaw at +w.hershaw678@btinternet.com. +Every book costs £12.99 including postage. Overseas orders incur an additional +£5 for postage. Included is a selection of the best Scots poetry and prose +from across 50 years and hundred issues of Lallans. diff --git a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx deleted file mode 100644 index 34a83ac..0000000 --- a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx +++ /dev/null @@ -1,171 +0,0 @@ ---- -title: Eiks an Ens 30 -summary: >- - Included in this issue of Eiks an Ens are details of our next - Conference in Perth and of our anthologies, which are having - very positive reviews and are well worth the money. ---- -import Link from '$components/Link.astro'; -import Schedule from '$components/Schedule.astro'; - -## Annual Conference - -The Annual Conference of the Scots Language Society will be held on Saturday the -3rd in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 -8EP. This year’s theme will be _The Art of Flyting in Scottish Literature_. - - - -The cost of attending the Collogue is £20. Contact George Watt on -lallans@hotmail.co.uk -or Elaine Morton on -failte@go-plus.net. - -## Sangschaw 2023 Winners - -### The Robert McLellan Tassie fur Scots Prose - -#### Winner - -_Aince_ by Jamie Purves - -#### Rinner-up - -_Haymarket Wumman_ by Jerry Randalls - -#### Ruisit - -_Bother wi a Babby Bird_ by Anne Jones - -_Benny_ by Andrew G Matthews - -_Kafka_ by Pete Fortune - -### The John MacPhail Law Tassie for Owersettin - -#### Winner - -_A Sang tae the Heir_ by Derrick McClure - -#### Jynt Rinner-up - -_The King o the Bees_ by Dorothy Lawrenson - -_Salome_ by Jerry Randalls - -#### Ruisit - -_Mylkwiffe_ by Donald Adamson - -_Weddin Blessin_ by Gordon Davidson - -_A Dug wi Nae Maister_ by Tom Ellett - -_Seeven Auld Fodies_ by WS Milne - -_The Tale o Thorstein Grue_ by Colin Mackenzie - -_The Yirdin o Sorley MacLean_ by Derrick McClure - -_Propertius_ by John Erskine - -### The Hugh MacDiarmaid Tassie for Poesie - -#### Winner - -_Roond Stane_ by Finola Scott - -#### Jynt Rinner-up - -_The Black Loch_ by Robert Duncan -_Aliens_ by James Sinclair - -#### Ruisit - -_Chale Shaw_ by Joe Carstairs - -_John MacLean’s Coat_ by Robert Duncan - -_Jock Tamson’s Luve-Bairns_ by David Bleiman - -_Bauk in the USSR_ by Alastair McLeish - -_Eldritch, Cretaceous Man Jinkin_ by Alan Millar - -_The Ootgaun_ by Hamish Scott - -_Mindin Joe_ by Jock Stein - -_The Ceremonie o Cairnholy_ by Donald Adamson - -_A New Sang_ by David Bleiman - -_Ahint the Haund_ by Kevin Connelly - -_The Marriage Lair_ by Irene Howat - -_Leid in ma Heid_ by Alan Millar - -## Wittins: Sangschaw, Lallans 102-103 - -Our own Lord Braxfield, Judge of the Sangschaw, will deliver his summary of -this year’s happenings in Lallans 102. The word on the street is that the -cranky old grump was pretty impressed by what was put before him. So keep at -it, Scots writers - it vexes him no end to see the Scots language being put to -such good effect! It’s not too early to start working on your masterpiece for -next year. The winner of the poetry class is printed below, but the editor will -endeavour to include as many entries as possible in the forthcoming Lallans -102/103. The summer number in particular will have an extraordinary and broad -showing of further Scots writing, including an interview with Scots Radio -broadcaster Frieda Morrison; Fred Freeman’s epic on Burns, Hamish Henderson -and song; the final instalment of Sam Burns’ Deacon Broadie play and an -abundance of thought-provoking poetry, stories, reviews and news concerning -all the other ventures in the ever-expanding world of the Scots language. - -## _The Galloway Hoard, Kirkcudbright Museum_ by Finola Scott - -_Winner of the Hugh MacDiarmid Cup for Poetry, Sangschaw 2023_ - -Aw muscle and glaur, he’s preenin
          -An muckle boastin. Yi’d think
          -He wis the first. In he struts
          -Aw Cock o the walk,
          -King o Faithers, comb throbbin.
          - -Aye unnerfit, he wants tae feel
          -Ma flutters, tae cup the load I coorie.
          -He brags aboot the hero it’ll be.
          -Weel mibbe, but fir noo it’s jist
          -A wee will o the wisp, ma treisur.
          - -I shouldnae compleen, sure he broucht
          -thon gift - a wee baa. Its hollow jinglet
          -when I joogelt it. I thocht it a toy
          -fir the bairn. But naw, seems it’s tae ease
          -an bless the birthin. Whit a man.
          - -## Anthologies - -The Scots Language Society is a registered charity run by volunteers. By being -a member of the Society, you are already giving the Scots language a boost. -You can help us further by purchasing one or both of our first-rate -50th-anniversary anthologies: contact our membership Secretary, George T Watt -at lallans@hotmail.co.uk -or Willie Hershaw at -w.hershaw678@btinternet.com. -Every book costs £12.99 including postage. Overseas orders incur an additional -£5 for postage. Included is a selection of the best Scots poetry and prose -from across 50 years and hundred issues of Lallans. diff --git a/src/content/news/en-GB/2023-12-10-eiks-31.mdx b/src/content/news/en-GB/2023-12-10-eiks-31.mdx new file mode 100644 index 0000000..aff0d2a --- /dev/null +++ b/src/content/news/en-GB/2023-12-10-eiks-31.mdx @@ -0,0 +1,120 @@ +--- +title: Eiks an Ens 31 +summary: >- + The 2024 Sangschaw is open for submissions! Not only that, learn about a new + Scots-language audio guide at Linlithgow Palace and an upcoming album release + from our very own Wullie Hershaw. +--- +import Link from '$components/Link.astro'; + +## Sangschaw open for submissions! + +Our annual writing competition, the _Sangschaw_, is open for submissions until +the 31st of January! As ever, we will provide feedback for every entry +regardless of whether or not you win an award. It’s unusual for competitions +like us to provide feedback on entries, but we think it’s important to help +writers develop. We have three prizes: + +- The **Robert McLellan Prize for Scots Prose**: up to 3000 words of original + Scots prose. +- The **John MacPhail Law Prize for Translation**: up to 3000 words of + original translation into Scots from another language. Provide along with a + copy of the original text. +- The **Hugh MacDiarmaid Tassie for Poetry**: up to 60 lines of original Scots + poetry. + +Writers new and old are all welcome, so don’t hold back! We look forward to +having your entries! + +You can enter for £5 for one category, £10 for two or £12 for all three, +whether that’s all in the same category or spread across the three. You can +submit either by email or by post. + +### Submitting by email + +If you would like to submit by email, first pay by bank transfer to the +following account. Remember, it’s £5 for one submission or £12 for three. + +
          +
          Account name
          +
          Scots Language Society
          + +
          Account number
          +
          00153458
          + +
          Sort code
          +
          83 47 00
          +
          + +Then, send your entries to +failte@go-plus.net along with +proof of payment. For example, you could send a picture of you bank statement, +or a copy of the transaction reference. + +### Submitting by post + +If you would rather submit by post, send your entries with cash or cheque, +as well as your name and address on a separate sheet of paper, to the following +address: + +
          + Sangschaw + c/o 6 Dryden Place + Edinburgh + EH9 1RP +
          + +Remember it’s £5 per submission or £12 for three. Address any +cheque to the Scots Language Society. + +## Upcoming album release: _Leid_ + +Our very own Wullie Hershaw will soon be releasing a new album of contemporary +Scots songs titled _Leid_. It will be coming early in the new year, so stay +tuned in! + +To whet your appetite, you can +listen to the title track on YouTube. +You can also have a listen to the musical work of his group, +the Bowhill Players on Bandcamp. + +## New audio guide at Linlithgow Palace + +This winter, the good folks at Historic Environment Scotland have translated +their audio guides for visitors into Scots for the first time. The aim is to +promote the status of the Scots language as well as to give visitors the +opportunity to hear the voices of the court in something approaching their own +language. + +You can read more +about the new audio guides on the Historic Environment Scotland website. + +As far as we know, this is the first such venture, not only by Historic +Environment Scotland, but at any major tourist attraction. Can anybody think of +anything similar? Answers on a postcard please! + +## Haven’t received Lallans 103 yet? + +It has come to the attention of George, our membership secretary, that there +has been an error with the posting of _Lallans_ 103. Two members, both +subscribers entitled to issue 103, failed to receive their copies. + +If you haven’t yet received your copy of _Lallans_ 103, which he posted out on +Wednesday the 7th of November, please email George at +georgetwatt@hotmail.com +and make us aware of it. A copy of _Lallans_ 103 will be posted out to you +straight away! + +## New format for Eiks an Ens + +Old friends will recall that _Eiks an Ens_ has formerly been a literary +magazine to accompany _Lallans_. We on the Committee felt that this neither +gave _Eiks_ the distinct identity which it deserved, nor took full advantage of +the opportunity it afforded to hold our community together. + +Therefore, this is the first issue of _Eiks_ to take a new format, where we’ll +be endeavouring to share current affairs in the world of Scots language and +literature, especially where it relates directly to our membership. + +So send us in your inside information! If you’ve spotted something you think we +ought to share in the next _Eiks_, send it to lallans@hotmail.co.uk. diff --git a/src/content/news/sco/2023-03-17-eiks-30.mdx b/src/content/news/sco/2023-03-17-eiks-30.mdx new file mode 100644 index 0000000..201642c --- /dev/null +++ b/src/content/news/sco/2023-03-17-eiks-30.mdx @@ -0,0 +1,173 @@ +--- +title: Eiks an Ens 30 +summary: >- + Includit i this issue o Eiks an Ens is details o oor neist Collogue in Perth an + o oor anthologies, that is haein fell positive reviews an weel wurth the siller. +--- +import Link from '$components/Link.astro'; +import Schedule from '$components/Schedule.astro'; + +## Annual Collogue + +The Annual Collogue o the Scots Leid Associe will be held on Setturday, June +3rd in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 8EP. +This year’s theme will be _The Art o Flyting in Scottish Leiterature_. + +### Events schedule + + + +The cost o attendin the Collogue is £20. Contact George Watt on +lallans@hotmail.co.uk +or Elaine Morton on +failte@go-plus.net. + + +## Sangschaw 2023 Winners + +### The Robert McLellan Tassie fur Scots Prose + +#### Winner + +_Aince_ bi Jamie Purves + +#### Rinner-up + +_Haymarket Wumman_ bi Jerry Randalls + +#### Ruisit + +_Bother wi a Babby Bird_ bi Anne Jones + +_Benny_ bi Andrew G. Matthews + +_Kafka_ bi Pete Fortune + +### The John MacPhail Law Tassie for Owersettin + +#### Winner + +_A Sang tae the Heir_ bi Derrick McClure + +#### Jynt Rinner-up + +_The King o the Bees_ bi Dorothy Lawrenson + +_Salome_ bi Jerry Randalls + +#### Ruisit + +_Mylkwiffe_ bi Donald Adamson + +_Weddin Blessin_ bi Gordon Davidson + +_A Dug wi Nae Maister_ bi Tom Ellett + +_Seeven Auld Fodies_ bi WS Milne + +_The Tale o Thorstein Grue_ bi Colin Mackenzie + +_The Yirdin o Sorley MacLean_ bi Derrick McClure + +_Propertius_ bi John Erskine + +### The Hugh MacDiarmaid Tassie for Poesie + +#### Winner + +_Roond Stane_ bi Finola Scott + +#### Jynt Rinner-up + +_The Black Loch_ bi Robert Duncan + +_Aliens_ bi James Sinclair + +#### Ruisit + +_Chale Shaw_ bi Joe Carstairs + +_John MacLean’s Coat_ bi Robert Duncan + +_Jock Tamson’s Luve-Bairns_ bi David Bleiman + +_Bauk in the USSR_ bi Alastair McLeish + +_Eldritch, Cretaceous Man Jinkin_ bi Alan Millar + +_The Ootgaun_ bi Hamish Scott + +_Mindin Joe_ bi Jock Stein + +_The Ceremonie o Cairnholy_ bi Donald Adamson + +_A New Sang_ bi David Bleiman + +_Ahint the Haund_ bi Kevin Connelly + +_The Marriage Lair_ bi Irene Howat + +_Leid in ma Heid_ bi Alan Millar + +## Wittins: Sangschaw, Lallans 102-103 + +Our ain Lord Braxfield, Jeidge o the Sangschaw, will deleiver his summation +o this year’s fairins in Lallans 102. The wird on the pavey is that the +crabbit auld scunner wass fair taen up wi whit was puit afore him. Sae caw +awaa Scots screivers - it deaves him sairly tae see the leid being yokit +tae sic guid effeck! It’s no ower airly tae get makkin your maisterpiece +for neist year. The winner o the poesie is prentit ablaw but the editor +will ettle tae include as monie entries as possible in the furthcoming Lallans +102/103. Forby, the simmer nummer will hae a byous kythin and spreid o Scots +screivin including an interview wi Scots Radio broadcaster Frieda Morrison, +Fred Freeman’s epic on Burns, Hamish Henderson and sang, the final instalment +o Sam Burns Deacon Brodie play and a wheen o thochtie poesie, tales, reviews +and wittins anent aa the ither ploys gaun on in the aye raxin warld o Scots Leid. + +## _The Galloway Hoard, Kirkcudbright Museum_ bi Finola Scott + +_Winner o the Hugh MacDiarmid Tassie fur Poesie, Sangschaw 2023_ + +Aw muscle and glaur, he’s preenin
          +An muckle boastin. Yi’d think
          +He wis the first. In he struts
          +Aw Cock o the walk,
          +King o Faithers, comb throbbin.
          + +Aye unnerfit, he wants tae feel
          +Ma flutters, tae cup the load I coorie.
          +He brags aboot the hero it’ll be.
          +Weel mibbe, but fir noo it’s jist
          +A wee will o the wisp, ma treisur.
          + +I shouldnae compleen, sure he broucht
          +thon gift - a wee baa. Its hollow jinglet
          +when I joogelt it. I thocht it a toy
          +fir the bairn. But naw, seems it’s tae ease
          +an bless the birthin. Whit a man.
          + +## Anthologies + +The Scots Leid Associe is a registered charity rin bi volunteers. Bi bein a +memmer o the Associe ye are aaready giein the Scots leid a heize. Ye can help +us faurther gin ye coff ane or baith o our braw 50th anniversairy anthologies: +contack our memmership secretar George T Watt at +lallans@hotmail.co.uk +or Willie Hershaw at +w.hershaw678@btinternet.com. +Ilka buik costs £12.99 includin postage. Owerseas orders £5 postage. +Includit is a walin o the best Scots poesie and prose fae 50 year +and a hunner nummers o Lallans. + diff --git a/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx b/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx deleted file mode 100644 index 201642c..0000000 --- a/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx +++ /dev/null @@ -1,173 +0,0 @@ ---- -title: Eiks an Ens 30 -summary: >- - Includit i this issue o Eiks an Ens is details o oor neist Collogue in Perth an - o oor anthologies, that is haein fell positive reviews an weel wurth the siller. ---- -import Link from '$components/Link.astro'; -import Schedule from '$components/Schedule.astro'; - -## Annual Collogue - -The Annual Collogue o the Scots Leid Associe will be held on Setturday, June -3rd in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 8EP. -This year’s theme will be _The Art o Flyting in Scottish Leiterature_. - -### Events schedule - - - -The cost o attendin the Collogue is £20. Contact George Watt on -lallans@hotmail.co.uk -or Elaine Morton on -failte@go-plus.net. - - -## Sangschaw 2023 Winners - -### The Robert McLellan Tassie fur Scots Prose - -#### Winner - -_Aince_ bi Jamie Purves - -#### Rinner-up - -_Haymarket Wumman_ bi Jerry Randalls - -#### Ruisit - -_Bother wi a Babby Bird_ bi Anne Jones - -_Benny_ bi Andrew G. Matthews - -_Kafka_ bi Pete Fortune - -### The John MacPhail Law Tassie for Owersettin - -#### Winner - -_A Sang tae the Heir_ bi Derrick McClure - -#### Jynt Rinner-up - -_The King o the Bees_ bi Dorothy Lawrenson - -_Salome_ bi Jerry Randalls - -#### Ruisit - -_Mylkwiffe_ bi Donald Adamson - -_Weddin Blessin_ bi Gordon Davidson - -_A Dug wi Nae Maister_ bi Tom Ellett - -_Seeven Auld Fodies_ bi WS Milne - -_The Tale o Thorstein Grue_ bi Colin Mackenzie - -_The Yirdin o Sorley MacLean_ bi Derrick McClure - -_Propertius_ bi John Erskine - -### The Hugh MacDiarmaid Tassie for Poesie - -#### Winner - -_Roond Stane_ bi Finola Scott - -#### Jynt Rinner-up - -_The Black Loch_ bi Robert Duncan - -_Aliens_ bi James Sinclair - -#### Ruisit - -_Chale Shaw_ bi Joe Carstairs - -_John MacLean’s Coat_ bi Robert Duncan - -_Jock Tamson’s Luve-Bairns_ bi David Bleiman - -_Bauk in the USSR_ bi Alastair McLeish - -_Eldritch, Cretaceous Man Jinkin_ bi Alan Millar - -_The Ootgaun_ bi Hamish Scott - -_Mindin Joe_ bi Jock Stein - -_The Ceremonie o Cairnholy_ bi Donald Adamson - -_A New Sang_ bi David Bleiman - -_Ahint the Haund_ bi Kevin Connelly - -_The Marriage Lair_ bi Irene Howat - -_Leid in ma Heid_ bi Alan Millar - -## Wittins: Sangschaw, Lallans 102-103 - -Our ain Lord Braxfield, Jeidge o the Sangschaw, will deleiver his summation -o this year’s fairins in Lallans 102. The wird on the pavey is that the -crabbit auld scunner wass fair taen up wi whit was puit afore him. Sae caw -awaa Scots screivers - it deaves him sairly tae see the leid being yokit -tae sic guid effeck! It’s no ower airly tae get makkin your maisterpiece -for neist year. The winner o the poesie is prentit ablaw but the editor -will ettle tae include as monie entries as possible in the furthcoming Lallans -102/103. Forby, the simmer nummer will hae a byous kythin and spreid o Scots -screivin including an interview wi Scots Radio broadcaster Frieda Morrison, -Fred Freeman’s epic on Burns, Hamish Henderson and sang, the final instalment -o Sam Burns Deacon Brodie play and a wheen o thochtie poesie, tales, reviews -and wittins anent aa the ither ploys gaun on in the aye raxin warld o Scots Leid. - -## _The Galloway Hoard, Kirkcudbright Museum_ bi Finola Scott - -_Winner o the Hugh MacDiarmid Tassie fur Poesie, Sangschaw 2023_ - -Aw muscle and glaur, he’s preenin
          -An muckle boastin. Yi’d think
          -He wis the first. In he struts
          -Aw Cock o the walk,
          -King o Faithers, comb throbbin.
          - -Aye unnerfit, he wants tae feel
          -Ma flutters, tae cup the load I coorie.
          -He brags aboot the hero it’ll be.
          -Weel mibbe, but fir noo it’s jist
          -A wee will o the wisp, ma treisur.
          - -I shouldnae compleen, sure he broucht
          -thon gift - a wee baa. Its hollow jinglet
          -when I joogelt it. I thocht it a toy
          -fir the bairn. But naw, seems it’s tae ease
          -an bless the birthin. Whit a man.
          - -## Anthologies - -The Scots Leid Associe is a registered charity rin bi volunteers. Bi bein a -memmer o the Associe ye are aaready giein the Scots leid a heize. Ye can help -us faurther gin ye coff ane or baith o our braw 50th anniversairy anthologies: -contack our memmership secretar George T Watt at -lallans@hotmail.co.uk -or Willie Hershaw at -w.hershaw678@btinternet.com. -Ilka buik costs £12.99 includin postage. Owerseas orders £5 postage. -Includit is a walin o the best Scots poesie and prose fae 50 year -and a hunner nummers o Lallans. - diff --git a/src/content/news/sco/2023-12-10-eiks-31.mdx b/src/content/news/sco/2023-12-10-eiks-31.mdx new file mode 100644 index 0000000..3569788 --- /dev/null +++ b/src/content/news/sco/2023-12-10-eiks-31.mdx @@ -0,0 +1,116 @@ +--- +title: Eiks an Ens 31 +summary: >- + The 2024 Sangschaw is open for submeissions! Forby, lairn about a new lug-in + guide at Lithgae Pailace and an upcomin album release bi our ain Wullie + Hershaw. +--- +import Link from '$components/Link.astro'; + +## Sangschaw open for submeissions! + +Our annual scrievin competeition, the _Sangschaw_, is open for submeissions +until the 31st o Januar! As ey, we will provide feedback for ilka entry nae +maiter whither ye win a tassie or no. There’s no mony competeitions provide +feedback on entries, but we think it’s important tae help writers develop. We +hae three tassies: + +- The **Robert McLellan Tassie for Scots Prose**: up til 3000 wirds o oreiginal + Scots prose. +- The **John MacPhail Law Tassie for Owersettin**: up til 3000 wirds o + oreiginal owersettin intil Scots frae anither leid. Provide alang wi a copy o + the oreiginal text. +- The **Hugh MacDiarmaid Tassie for Poesie**: up til 60 lines o oreiginal Scots + poesie. + +New writers and auld haunds ar aa walcome, sae dinnae be blate! We luik forrit +tae haein your entries! + +It’s £5 for ae submeission, or £12 for three, whither in the same categorie +or in different categories. Ye can either submit by email or by post. + +### Submittin by email + +Gin ye want tae submit by email, first pey by bank transfer til the follaein +account. Mind it’s £5 per submeission or £12 for three. + +
          +
          Account nem
          +
          Scots Language Society
          + +
          Account number
          +
          00153458
          + +
          Sort code
          +
          83 47 00
          +
          + +Syne, send your entries til +failte@go-plus.net alang wi pruif +o peyment. For ensaumple, you could send a photae o your bank +statement, or a copy o the transaction reference. + +### Submittin by post + +Gin ye want tae submit by post, send them wi cash or cheque as weill as your nem +and your return address on a separate sheet o paper til the follaein address: + +
          + Sangschaw + c/o 6 Dryden Place + Edinburgh + EH9 1RP +
          + +Mind it’s £5 per submeission or £12 for three. Address ony +cheque til the Scots Language Society. + +## Upcomin album release: _Leid_ + +Our ain Wullie Hershaw will shuin be releasin a new album o contemporar Scots +sangs titled _Leid_. It will be comin early in the new year, sae haud tuned in! + +For tae whet your appetite, you can +lug in til the title track on YouTube. +Ye can forby pree the muisical wark o his group, +the Bowhill Players on +Bandcamp. + +## New lug-in guide at Lithgae Pailace + +This winter, the guid fowks at Historic Environment Scotland hae owerset their +lug-in guides for veisitors intil Scots for the first time. The aim is tae +promuive the status o the Scots leid as weill as tae gie veisitors the +opportunitie tae hear the vyces o the court in somethin like their ain leid. + +Ye can read mair +about the new lug-in guides on the Historic Environment Scotland wabsteid. + +As faur as we ken, this is first sic ventur, no juist bi Historic Environment +Scotland, but frae ony major tourist attraction. Can onybody mind o ocht +similar? Answers on a postcaird pleise! + +## No received Lallans 103 yet? + +It haes cam tae the notice o George, our membership secretar, that thare haes +been a mishanter wi the postin o _Lallans_ 103. Twa memmers, baith subscribers +awed _Lallans_ 103, didnae receive thair copies. + +Gin ye haenae yet received yer copy o _Lallans_ 103, that he postit out on +Wadnesday 7th o November, pleise email George at + georgetwatt@hotmail.com an +mak us ken o it. A copy o _Lallans_ 103 will be postit out tae ye straucht awa! + +## New format for Eiks an Ens + +Auld freinds will mind that _Eiks an Ens_ haes formerlie been a leiterar magazine +tae accompanie _Lallans_. We on the Comatee felt that this didnae gie Eiks an +Ens the distinct purpose that it deserved, and it didnae tak fu advauntage o +the opportunitie _Eiks_ affuirdit tae jeel our communitie thegether. + +Sae this is the first issue o _Eiks_ tae tak a new format, whaur we’ll be +ettlin tae skair current affairs i the warld o Scots leid and leitratur, +especially whaur it effeirs directly til our membership. + +Sae send us in your inside information! Gin ye’ve spottit somethin you think +we shuid skair in the neist _Eiks_, send it til lallans@hotmail.co.uk. diff --git a/src/lib/newsUtils.ts b/src/lib/newsUtils.ts index aa711e3..bffc7d6 100644 --- a/src/lib/newsUtils.ts +++ b/src/lib/newsUtils.ts @@ -1,5 +1,6 @@ +import locales from '$i18n/locales'; import type Locale from '$types/Locale'; -import { CollectionEntry, getCollection } from 'astro:content'; +import { getCollection, type CollectionEntry } from 'astro:content'; export async function getMostRecentNewsItem(locale: Locale) { const allNews = await getCollection('news'); @@ -8,7 +9,7 @@ export async function getMostRecentNewsItem(locale: Locale) { if (!someNewsItem) { return null; } - return allNewsInLocale.reduce((prev, curr) => (isBefore(curr, prev) ? curr : prev), someNewsItem); + return allNewsInLocale.reduce((prev, curr) => (isBefore(prev, curr) ? curr : prev), someNewsItem); } export function getLocale(newsItem: CollectionEntry<'news'>) { @@ -18,7 +19,13 @@ export function getLocale(newsItem: CollectionEntry<'news'>) { export function getHref(newsItem: CollectionEntry<'news'>) { const locale = getLocale(newsItem); - return `/${locale}/news/${newsItem.slug.replace('/', '-')}`; + return `/${locale}/news/${getSlug(newsItem)}`; +} + +export function getSlug(newsItem: CollectionEntry<'news'>) { + const toLowerCase = (s: string) => s.toLowerCase(); + const matchLocales = new RegExp(`(${locales.map(toLowerCase).join('|')})/`); + return newsItem.slug.replace(matchLocales, ''); } export function isNewsItemInLocale(newsItem: CollectionEntry<'news'>, locale: Locale) { @@ -26,7 +33,7 @@ export function isNewsItemInLocale(newsItem: CollectionEntry<'news'>, locale: Lo return newsItemLocale === locale; } -function isBefore(item1: CollectionEntry<'news'>, item2: CollectionEntry<'news'>) { +export function isBefore(item1: CollectionEntry<'news'>, item2: CollectionEntry<'news'>) { const date1 = getDate(item1); const date2 = getDate(item2); if (!date2) { @@ -39,6 +46,7 @@ function isBefore(item1: CollectionEntry<'news'>, item2: CollectionEntry<'news'> } export function getDate(newsItem: CollectionEntry<'news'>) { - const match = newsItem.id.match(/(?<=(en-GB|sco))\/(\d\d\d\d-\d\d-\d\d)/)?.[2]; - return match ? new Date(match) : null; + const matchDate = new RegExp(`(${locales.join('|')})/(\\d\\d\\d\\d-\\d\\d-\\d\\d)`); + const date = newsItem.id.match(matchDate)?.[2]; + return date ? new Date(date) : null; } diff --git a/src/pages/[locale]/news/[...slug].astro b/src/pages/[locale]/news/[...slug].astro index e3b8b36..a24e65a 100644 --- a/src/pages/[locale]/news/[...slug].astro +++ b/src/pages/[locale]/news/[...slug].astro @@ -1,28 +1,13 @@ --- -import locales from '$i18n/locales'; import Article from '$layouts/Article.astro'; -import type Locale from '$types/Locale'; -import { CollectionEntry, getCollection } from 'astro:content'; +import { getCollection } from 'astro:content'; +import { getLocale, getSlug } from '$lib/newsUtils'; export async function getStaticPaths() { - function localeFromSlug(slug: CollectionEntry<'news'>['slug']): Locale | undefined { - const lowerCaseLocale = new RegExp(`^(${locales.map((l) => l.toLocaleLowerCase()).join('|')})`); - const matchedLowerCaseLocale = slug.match(lowerCaseLocale)?.[1]; - switch (matchedLowerCaseLocale) { - case 'sco': - return 'sco'; - case 'en-gb': - return 'en-GB'; - default: - console.warn('Could not find locale in slug %s', slug); - return undefined; - } - } - return (await getCollection('news')).map((entry) => ({ params: { - slug: entry.slug.replace('/', '-'), - locale: localeFromSlug(entry.slug), + slug: getSlug(entry), + locale: getLocale(entry), }, props: { entry }, })); diff --git a/src/pages/[locale]/news/index.astro b/src/pages/[locale]/news/index.astro index 37e7dd6..112f87b 100644 --- a/src/pages/[locale]/news/index.astro +++ b/src/pages/[locale]/news/index.astro @@ -5,12 +5,14 @@ import Page from '$layouts/Page.astro'; import { getLocaleFromPathOrThrow } from '$lib/getLocaleFromPath'; import localeStaticPaths from '$lib/localeStaticPaths'; import { getCollection } from 'astro:content'; -import { isNewsItemInLocale } from '$lib/newsUtils'; +import { isBefore, isNewsItemInLocale } from '$lib/newsUtils'; import NewsIndex from '$components/NewsIndex/NewsIndex.astro'; const allNews = await getCollection('news'); const locale = getLocaleFromPathOrThrow(Astro.url.pathname); -const allNewsInLocale = allNews.filter((item) => isNewsItemInLocale(item, locale)); +const allNewsInLocale = allNews + .filter((item) => isNewsItemInLocale(item, locale)) + .sort((a, b) => (isBefore(a, b) ? 1 : isBefore(b, a) ? -1 : 0)); const t = translate(locale); export async function getStaticPaths() { -- cgit v1.2.3 From a4f3cb02befe658594c076144be2e5200f36682a Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+joeacarstairs@users.noreply.github.com> Date: Thu, 11 Jan 2024 08:32:14 +0000 Subject: Update 2024/01/11 (#61) * Edit README (#28) * Corrects Lallans instructions * Adds instructions for adding a Scotsoun release * Documents infrastructure * Better contribution guidance * Update README (#29) * Updates references to branch names in README * ESLint ignores Markdown * Documents Coding Style * Specifies upstream branch in README where salient * Eiks 31 (#41) * Eiks 31 * Prettier dl's * Prettier headings --------- Co-authored-by: Joe Carstairs * Reorder news (#42) * Reslugs news items * Fixes typo in getMostRecentNewsItem() * Fixes typo in newUtils.getDate() * Sorts news index from most recent to oldest * Update production (#37) (#49) * Edit README (#28) * Corrects Lallans instructions * Adds instructions for adding a Scotsoun release * Documents infrastructure * Better contribution guidance * Update README (#29) * Updates references to branch names in README * ESLint ignores Markdown * Documents Coding Style * Specifies upstream branch in README where salient * Fixes Sangschaw winners list in Eiks 30 (#35) * Fixes Sangschaw winners list in Eiks 30 (#36) * Fixes Sangschaw winners list in Eiks 30 (#38) * Improve CSS reset (#51) * Font size inflation * Removes main adjustment for IE * Documents hr corrections * Documents pre corrections * Documents abbr[title] corrections * Documents b, strong corrections * Squishes pre rule with code,kbd,samp * Documents sub,sub line-height fix * Removes IE fix for img borders * Documents form control resets * Documents details display:block * Documents summary correction * Removes [hidden] fix for IE * Adds border-box sizing rules * Refactors links * Adds Sangschaw ad to top of homepage (#59) Co-authored-by: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> --------- Co-authored-by: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Co-authored-by: Joe Carstairs Co-authored-by: Joe Carstairs <118172583+jcarstairs-scottlogic@users.noreply.github.com> --- scss/modules/btn.scss | 9 +- scss/modules/link.scss | 33 +++---- scss/modules/nav.scss | 46 +++++---- scss/modules/news-index.scss | 7 +- scss/normalize.scss | 107 +++++++++++++++------ scss/utils.scss | 4 + src/components/LallansIssuesGallery.astro | 2 +- src/components/Link.astro | 9 -- src/components/Navbar/Breadcrumbs.astro | 4 +- src/components/ScotsounCdGallery.astro | 2 +- src/components/SwitchLanguageLink.astro | 2 +- src/content/news/en-GB/2023-03-17-eiks-30.mdx | 9 +- src/content/news/en-GB/2023-12-10-eiks-31.mdx | 11 +-- src/content/news/sco/2023-03-17-eiks-30.mdx | 9 +- src/content/news/sco/2023-12-10-eiks-31.mdx | 13 ++- src/data/committee.ts | 12 +-- src/i18n/translations/pages/404.ts | 4 +- src/i18n/translations/pages/home.ts | 54 +++++++---- src/pages/[locale]/furthsettins/index.astro | 4 +- .../payment-success-confirmation.astro | 2 +- .../payment-success-confirmation.astro | 2 +- src/pages/[locale]/index.astro | 3 +- 22 files changed, 205 insertions(+), 143 deletions(-) delete mode 100644 src/components/Link.astro diff --git a/scss/modules/btn.scss b/scss/modules/btn.scss index 1d52b9c..e9db392 100644 --- a/scss/modules/btn.scss +++ b/scss/modules/btn.scss @@ -1,7 +1,5 @@ .btn { display: block; - box-sizing: border-box; - color: var(--text-color); border: solid var(--relative-eighth-rem) var(--text-color); font-weight: 600; text-align: center; @@ -33,3 +31,10 @@ .btn:active { transform: scale(1.1, 1.1); } + +/* Override anchor styling. */ +a.btn { + color: var(--text-color); + text-decoration: none; +} + diff --git a/scss/modules/link.scss b/scss/modules/link.scss index dfcabcf..83206d4 100644 --- a/scss/modules/link.scss +++ b/scss/modules/link.scss @@ -1,32 +1,31 @@ -.link { +a, .link { color: var(--special-text-color); text-decoration-line: underline; text-decoration-color: var(--special-text-color); text-decoration-thickness: var(--relative-eighth-rem); text-underline-offset: var(--relative-eighth-rem); border: dotted transparent var(--relative-eighth-rem); - border-radius: calc(3 * var(--relative-eighth-rem)); transition: color 100ms, text-decoration-color 100ms, text-decoration-thickness 100ms, border-color 100ms; -} -.link:is(:hover, :focus, :focus-visible, :focus-within), -.group-hover:is(:hover, :focus, :focus-visible, :focus-within) .link { - text-decoration-color: currentColor; - text-decoration-thickness: calc(3 * var(--relative-eighth-rem)); - transition: - color 300ms, - text-decoration-color 300ms, - text-decoration-thickness 300ms, - border-color 300ms; -} + &:is(:hover, :focus, :focus-visible, :focus-within), + .group-hover:is(:hover, :focus, :focus-visible, :focus-within) & { + text-decoration-color: currentColor; + text-decoration-thickness: calc(3 * var(--relative-eighth-rem)); + transition: + color 300ms, + text-decoration-color 300ms, + text-decoration-thickness 300ms, + border-color 300ms; + } -.link:focus, .link:focus-visible { - box-shadow: none; - outline: none; - border-color: var(--special-text-color); + &:is(:focus, :focus-visible, :focus-within) { + box-shadow: none; + outline: none; + border-color: var(--special-text-color); + } } diff --git a/scss/modules/nav.scss b/scss/modules/nav.scss index aebcbcf..765c44f 100644 --- a/scss/modules/nav.scss +++ b/scss/modules/nav.scss @@ -1,5 +1,11 @@ -.nav > :not(:last-child) { - margin-block: 0 var(--margin-block-sm); +.nav { + & > :not(:last-child) { + margin-block: 0 var(--margin-block-sm); + } + + li { + list-style-type: none; + } } .nav__bottom-row { @@ -44,33 +50,31 @@ ); -webkit-background-clip: text; -webkit-text-fill-color: transparent; -} -.nav__logo a { - text-decoration: none; - border: var(--relative-eighth-rem) dotted transparent; - transition: border-color 100ms; -} + a { + text-decoration: none; + border: var(--relative-eighth-rem) dotted transparent; + transition: border-color 100ms; -.nav__logo a:is(:focus, :focus-visible, :focus-within) { - box-shadow: none; - outline: none; - border-color: var(--special-text-color); - transition: border-color 300ms; + &:is(:focus, :focus-visible, :focus-within) { + box-shadow: none; + outline: none; + border-color: var(--special-text-color); + transition: border-color 300ms; + } + } } .nav__breadcrumbs { display: flex; flex-wrap: wrap; -} - -.nav__breadcrumbs li { - list-style-type: none; - min-width: max-content; -} -.nav__breadcrumbs li::before { - content: '/' + li { + min-width: max-content; + &::before { + content: '/' + } + } } .nav__switch-language-link { diff --git a/scss/modules/news-index.scss b/scss/modules/news-index.scss index 0050f70..5d9bab2 100644 --- a/scss/modules/news-index.scss +++ b/scss/modules/news-index.scss @@ -8,6 +8,11 @@ width: var(--width-prose); } +a.news-index__item { + text-decoration: none; + color: var(--text-color); +} + .news-index__item:not(:first-child) { border-top-width: 0; } @@ -28,4 +33,4 @@ .news-index__item:is(:focus, :focus-visible, :focus-within) { border-color: var(--special-text-highlight-color); border-style: dotted; -} \ No newline at end of file +} diff --git a/scss/normalize.scss b/scss/normalize.scss index 9d59ef8..0f7e02f 100644 --- a/scss/normalize.scss +++ b/scss/normalize.scss @@ -1,3 +1,9 @@ +*, +*::before, +*::after { + box-sizing: border-box; +} + :root, html, body, @@ -22,31 +28,48 @@ h4 { padding: 0; } +/* + * Prevent font size inflation + * https://kilianvalkhof.com/2022/css-html/your-css-reset-needs-text-size-adjust-probably/ + */ html { - -webkit-text-size-adjust: 100%; -} - -main { - display: block; + -moz-text-size-adjust: none; + -webkit-text-size-adjust: none; + text-size-adjust: none; } +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ hr { box-sizing: content-box; height: 0; overflow: visible; } -pre { - font-family: monospace, monospace; - font-size: 1em; +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +code, kbd, pre, samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ } +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ abbr[title] { border-bottom: none; /* 1 */ text-decoration: underline; /* 2 */ text-decoration: underline dotted; /* 2 */ } +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ b, strong { font-weight: bolder; @@ -56,8 +79,12 @@ small { font-size: 80%; } -sub, -sup { +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +@mixin baseline-adjustment { font-size: 75%; line-height: 0; position: relative; @@ -65,48 +92,66 @@ sup { } sub { + @include baseline-adjustment; bottom: -0.25em; } sup { + @include baseline-adjustment; top: -0.5em; } -img { - border-style: none; -} - -button, [type='button'], [type='reset'], [type='submit'] { +@mixin form-control-reset { font-family: inherit; font-size: 100%; line-height: 1.15; - text-transform: none; - overflow: visible; + margin: 0; + text-transform: none; /* For buttons (Firefox, Edge) and selects (Firefox) */ } -:is(button, [type='button'], [type='reset'], [type='submit'])::-moz-focus-inner { - border-style: none; - padding: 0; +:is( + button, + [type='button'], + [type='reset'], + [type='submit'] +) { + @include form-control-reset; + text-transform: none; + + /** + * Remove the inner border and padding in Firefox. + */ + &::-moz-focus-inner { + border-style: none; + padding: 0; + } + + /** + * Restore the focus styles unset by the previous rule. + */ + &:-moz-focusring { + outline: 1px dotted ButtonText; + } } -:is(button, [type='button'], [type='reset'], [type='submit']):-moz-focusring { - outline: 1px dotted ButtonText; +input, +optgroup, +select, +textarea { + @include form-control-reset; } +/** + * Corrects the display in Firefox and Edge. + */ details { display: block; } +/* + * Add the correct display in all browsers. + */ summary { display: list-item; } -[hidden] { - display: none; -} - -a, :link, :visited { - background-color: transparent; - color: currentColor; - text-decoration: none; -} diff --git a/scss/utils.scss b/scss/utils.scss index a05a216..f8336eb 100644 --- a/scss/utils.scss +++ b/scss/utils.scss @@ -5,3 +5,7 @@ .font-weight-lighter { font-weight: lighter; } + +li.list-style-none, .list-style-none li { + list-style-type: none; +} diff --git a/src/components/LallansIssuesGallery.astro b/src/components/LallansIssuesGallery.astro index fd0ad0a..3e79de9 100644 --- a/src/components/LallansIssuesGallery.astro +++ b/src/components/LallansIssuesGallery.astro @@ -17,7 +17,7 @@ function issueNumberDescending(issue1: LallansIssue, issue2: LallansIssue) { issues.map(async (issue) => (
        2. diff --git a/src/components/Link.astro b/src/components/Link.astro deleted file mode 100644 index 365441e..0000000 --- a/src/components/Link.astro +++ /dev/null @@ -1,9 +0,0 @@ ---- -interface Props { - href: string; -} - -const { href } = Astro.props; ---- - - diff --git a/src/components/Navbar/Breadcrumbs.astro b/src/components/Navbar/Breadcrumbs.astro index 1e82fd9..f949873 100644 --- a/src/components/Navbar/Breadcrumbs.astro +++ b/src/components/Navbar/Breadcrumbs.astro @@ -23,9 +23,7 @@ const t = translate(locale); parentRoutes.map((route) => { return (
        3. - - {t(tBreadcrumbs, { key: route })} - + {t(tBreadcrumbs, { key: route })}
          4. ); }) diff --git a/src/components/ScotsounCdGallery.astro b/src/components/ScotsounCdGallery.astro index d2c7e0b..3908f4d 100644 --- a/src/components/ScotsounCdGallery.astro +++ b/src/components/ScotsounCdGallery.astro @@ -17,7 +17,7 @@ function scotsounIdDescending(scotsoun1: Scotsoun, scotsoun2: Scotsoun) { scotsoun.map((scotsounItem) => (
        4. diff --git a/src/components/SwitchLanguageLink.astro b/src/components/SwitchLanguageLink.astro index fce633f..abbf0cb 100644 --- a/src/components/SwitchLanguageLink.astro +++ b/src/components/SwitchLanguageLink.astro @@ -20,7 +20,7 @@ const otherLocalePath = currentPath const t = translate(otherLocale); --- - + { t(tPage, { key: 'language-link-text', diff --git a/src/content/news/en-GB/2023-03-17-eiks-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-30.mdx index 34a83ac..20c280f 100644 --- a/src/content/news/en-GB/2023-03-17-eiks-30.mdx +++ b/src/content/news/en-GB/2023-03-17-eiks-30.mdx @@ -5,7 +5,6 @@ summary: >- Conference in Perth and of our anthologies, which are having very positive reviews and are well worth the money. --- -import Link from '$components/Link.astro'; import Schedule from '$components/Schedule.astro'; ## Annual Conference @@ -30,9 +29,9 @@ The Annual Conference of the Scots Language Society will be held on Saturday the /> The cost of attending the Collogue is £20. Contact George Watt on -lallans@hotmail.co.uk +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Elaine Morton on -failte@go-plus.net. +[failte@go-plus.net](mailto:failte@go-plus.net). ## Sangschaw 2023 Winners @@ -163,9 +162,9 @@ The Scots Language Society is a registered charity run by volunteers. By being a member of the Society, you are already giving the Scots language a boost. You can help us further by purchasing one or both of our first-rate 50th-anniversary anthologies: contact our membership Secretary, George T Watt -at lallans@hotmail.co.uk +at [lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Willie Hershaw at -w.hershaw678@btinternet.com. +[w.hershaw678@btinternet.com](mailto:w.hershaw678@btinternet.com). Every book costs £12.99 including postage. Overseas orders incur an additional £5 for postage. Included is a selection of the best Scots poetry and prose from across 50 years and hundred issues of Lallans. diff --git a/src/content/news/en-GB/2023-12-10-eiks-31.mdx b/src/content/news/en-GB/2023-12-10-eiks-31.mdx index aff0d2a..39075bf 100644 --- a/src/content/news/en-GB/2023-12-10-eiks-31.mdx +++ b/src/content/news/en-GB/2023-12-10-eiks-31.mdx @@ -5,7 +5,6 @@ summary: >- Scots-language audio guide at Linlithgow Palace and an upcoming album release from our very own Wullie Hershaw. --- -import Link from '$components/Link.astro'; ## Sangschaw open for submissions! @@ -47,7 +46,7 @@ following account. Remember, it’s £5 for one submission or £12 for three. Then, send your entries to -failte@go-plus.net along with +[failte@go-plus.net](mailto:failte@go-plus.net) along with proof of payment. For example, you could send a picture of you bank statement, or a copy of the transaction reference. @@ -74,9 +73,9 @@ Scots songs titled _Leid_. It will be coming early in the new year, so stay tuned in! To whet your appetite, you can -listen to the title track on YouTube. +[listen to the title track on YouTube](https://www.youtube.com/watch?v=23YYajAFNHQ). You can also have a listen to the musical work of his group, -the Bowhill Players on Bandcamp. +[the Bowhill Players on Bandcamp](https://thebowhillplayers.bandcamp.com). ## New audio guide at Linlithgow Palace @@ -87,7 +86,7 @@ opportunity to hear the voices of the court in something approaching their own language. You can read more -about the new audio guides on the Historic Environment Scotland website. +[about the new audio guides on the Historic Environment Scotland website](https://hes-newsroom.prgloo.com/news/new-scots-lug-in-guide-at-lithgae-palace). As far as we know, this is the first such venture, not only by Historic Environment Scotland, but at any major tourist attraction. Can anybody think of @@ -101,7 +100,7 @@ subscribers entitled to issue 103, failed to receive their copies. If you haven’t yet received your copy of _Lallans_ 103, which he posted out on Wednesday the 7th of November, please email George at -georgetwatt@hotmail.com +[georgetwatt@hotmail.com](mailto:georgetwatt@hotmail.com) and make us aware of it. A copy of _Lallans_ 103 will be posted out to you straight away! diff --git a/src/content/news/sco/2023-03-17-eiks-30.mdx b/src/content/news/sco/2023-03-17-eiks-30.mdx index 201642c..caee203 100644 --- a/src/content/news/sco/2023-03-17-eiks-30.mdx +++ b/src/content/news/sco/2023-03-17-eiks-30.mdx @@ -4,7 +4,6 @@ summary: >- Includit i this issue o Eiks an Ens is details o oor neist Collogue in Perth an o oor anthologies, that is haein fell positive reviews an weel wurth the siller. --- -import Link from '$components/Link.astro'; import Schedule from '$components/Schedule.astro'; ## Annual Collogue @@ -30,9 +29,9 @@ This year’s theme will be _The Art o Flyting in Scottish Leiterature_. /> The cost o attendin the Collogue is £20. Contact George Watt on -lallans@hotmail.co.uk +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Elaine Morton on -failte@go-plus.net. +[failte@go-plus.net](mailto:failte@go-plus.net). ## Sangschaw 2023 Winners @@ -164,9 +163,9 @@ The Scots Leid Associe is a registered charity rin bi volunteers. Bi bein a memmer o the Associe ye are aaready giein the Scots leid a heize. Ye can help us faurther gin ye coff ane or baith o our braw 50th anniversairy anthologies: contack our memmership secretar George T Watt at -lallans@hotmail.co.uk +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Willie Hershaw at -w.hershaw678@btinternet.com. +[w.hershaw678@btinternet.com](mailto:w.hershaw678@btinternet.com). Ilka buik costs £12.99 includin postage. Owerseas orders £5 postage. Includit is a walin o the best Scots poesie and prose fae 50 year and a hunner nummers o Lallans. diff --git a/src/content/news/sco/2023-12-10-eiks-31.mdx b/src/content/news/sco/2023-12-10-eiks-31.mdx index 3569788..d9402cb 100644 --- a/src/content/news/sco/2023-12-10-eiks-31.mdx +++ b/src/content/news/sco/2023-12-10-eiks-31.mdx @@ -5,7 +5,6 @@ summary: >- guide at Lithgae Pailace and an upcomin album release bi our ain Wullie Hershaw. --- -import Link from '$components/Link.astro'; ## Sangschaw open for submeissions! @@ -46,7 +45,7 @@ account. Mind it’s £5 per submeission or £12 for three. Syne, send your entries til -failte@go-plus.net alang wi pruif +[failte@go-plus.net](mailto:failte@go-plus.net) alang wi pruif o peyment. For ensaumple, you could send a photae o your bank statement, or a copy o the transaction reference. @@ -71,10 +70,10 @@ Our ain Wullie Hershaw will shuin be releasin a new album o contemporar Scots sangs titled _Leid_. It will be comin early in the new year, sae haud tuned in! For tae whet your appetite, you can -lug in til the title track on YouTube. +[lug in til the title track on YouTube](https://www.youtube.com/watch?v=23YYajAFNHQ). Ye can forby pree the muisical wark o his group, -the Bowhill Players on -Bandcamp. +the Bowhill Players on +Bandcamp. ## New lug-in guide at Lithgae Pailace @@ -84,7 +83,7 @@ promuive the status o the Scots leid as weill as tae gie veisitors the opportunitie tae hear the vyces o the court in somethin like their ain leid. Ye can read mair -about the new lug-in guides on the Historic Environment Scotland wabsteid. +[about the new lug-in guides on the Historic Environment Scotland wabsteid](https://hes-newsroom.prgloo.com/news/new-scots-lug-in-guide-at-lithgae-palace). As faur as we ken, this is first sic ventur, no juist bi Historic Environment Scotland, but frae ony major tourist attraction. Can onybody mind o ocht @@ -98,7 +97,7 @@ awed _Lallans_ 103, didnae receive thair copies. Gin ye haenae yet received yer copy o _Lallans_ 103, that he postit out on Wadnesday 7th o November, pleise email George at - georgetwatt@hotmail.com an +[georgetwatt@hotmail.com](mailto:georgetwatt@hotmail.com) an mak us ken o it. A copy o _Lallans_ 103 will be postit out tae ye straucht awa! ## New format for Eiks an Ens diff --git a/src/data/committee.ts b/src/data/committee.ts index 606268a..9f40691 100644 --- a/src/data/committee.ts +++ b/src/data/committee.ts @@ -135,13 +135,11 @@ const committee: CommitteeMember[] = [ sco: ` William Hershaw is the praisent eiditor o Lallans. He is a weill-kent poet and singer @@ -149,20 +147,18 @@ const committee: CommitteeMember[] = [ mining community he trowes that ‘the Scots leid is for aabody’ and “gin ye tint your leid ye tint your sel’. Aa Scots leid has a feir in Lallans. William can be contacted at - + w.hershaw678@btinternet . `, 'en-GB': ` William Hershaw is the current editor of Lallans. He is a well-known poet and singer @@ -170,7 +166,7 @@ const committee: CommitteeMember[] = [ community, he believes that ‘the Scots language is for everyone’ and “if you lose your language you lose your self.’ All Scots language can give it a shot in Lallans. William can be contacted at - + w.hershaw678@btinternet . `, @@ -220,13 +216,13 @@ const committee: CommitteeMember[] = [ George T Watt is a writer in Scots poesie, cutty tales and airticles. This cheil haes been published in mony anthologies an magazines as weel as Lallans. He haes produced seiveral recordings fur - Scotsoun anaa. + Scotsoun anaa. `, 'en-GB': ` George T Watt is a writer in Scots poetry, short stories and articles. He has been published in many anthologies and magazines as well as Lallans. He has also produced several recordings for - Scotsoun. + Scotsoun. `, }, img: { diff --git a/src/i18n/translations/pages/404.ts b/src/i18n/translations/pages/404.ts index d28d297..c77b9b0 100644 --- a/src/i18n/translations/pages/404.ts +++ b/src/i18n/translations/pages/404.ts @@ -8,11 +8,11 @@ const tPage = { message: { sco: () => ` Yon page disna exeist. Try gaein til oor - hame page? + hame page? `, 'en-GB': () => ` That page doesn’t exist. Try going to our - home page? + home page? `, }, }; diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts index a112cc1..3a81710 100644 --- a/src/i18n/translations/pages/home.ts +++ b/src/i18n/translations/pages/home.ts @@ -6,23 +6,41 @@ const tPage = { 'en-GB': () => 'Home', }, submit: { - sco: () => 'Submit til Lallans', - 'en-GB': () => 'Submit to Lallans', + sco: () => 'Sangschaw apen for submeissions', + 'en-GB': () => 'Sangschaw open for submissions', }, 'submit-para-1': { - sco: () => 'We ar acceptin submeissions til Lallans 104!', - 'en-GB': () => 'We are accepting submissions to Lallans 104!', + sco: () => ` + We ar acceptin submeissions til our annual Scots scrievin competeition, + the Sangschaw, until the 31st o Januar 2024. + `, + 'en-GB': () => ` + We are accepting submissions to our annual Scots writing competition, the + Sangschaw, until the 31st of January 2024. + `, }, 'submit-para-2': { sco: () => ` - We accep poesie, cuttie tales, reviews, essays an drama, baith - oreiginal an owerset. Sen yer submeissions til - lallans@hotmail.co.uk. + Aince ye’ve read the submeission criteria in + Eiks an Ens 31, send + your submeissions til + lallans@hotmail.co.uk. + `, + 'en-GB': () => ` + Once you’ve read the submission criteria in + Eiks an Ens 31, send + your submissions to + lallans@hotmail.co.uk. + `, + }, + 'submit-para-3': { + sco: () => ` + We luik forrit tae haein your submeission, whither you’ve been submittin + for years or you’re a first-time writer! `, 'en-GB': () => ` - We accept poetry, short stories, reviews, essays and drama, both - original and translated. Send your submissions to - lallans@hotmail.co.uk. + We look forward to having your submission, whether you’ve been + submitting for years or you’re a first-time writer! `, }, news: { @@ -91,14 +109,14 @@ const tPage = { sco: () => ` We ar ane o the foremaist furthsetters o new Scots leitratur. Oor maist important furthsettins ar - Lallans an - Scotsoun. + Lallans an + Scotsoun. `, 'en-GB': () => ` We are one of the leading publishers of new Scots literature. Our most important publications are - Lallans and - Scotsoun. + Lallans and + Scotsoun. `, }, 'aw-furthsettins': { @@ -167,18 +185,18 @@ const tPage = { 'hou-jyne-para-2': { sco: ({ membershipEmail }: { membershipEmail: string }) => ` Fur tae become a memmer, simply get in titch wi us at - ${membershipEmail} + ${membershipEmail} an we’ll provide ye wi our bank details; or ye can jyne bi sendin us a cheque made peyable til The Scots Language Society. See - Contact us + Contact us fur our address. `, 'en-GB': ({ membershipEmail }: { membershipEmail: string }) => ` To become a member, simply get in touch with us at - ${membershipEmail} + ${membershipEmail} and we’ll provide you with our bank details; or you can join by sending us a cheque made payable to The Scots Language Society. See - Contact us for our address. + Contact us for our address. `, }, contact: { diff --git a/src/pages/[locale]/furthsettins/index.astro b/src/pages/[locale]/furthsettins/index.astro index 80698bd..a053621 100644 --- a/src/pages/[locale]/furthsettins/index.astro +++ b/src/pages/[locale]/furthsettins/index.astro @@ -24,13 +24,13 @@ const t = translate(locale);
          • - +

            {t(tSite, { key: 'lallans' })}
          • - +

            {t(tSite, { key: 'scotsoun' })}

             diff --git a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro index 2f0a9d4..f0b9512 100644 --- a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro +++ b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro @@ -23,7 +23,7 @@ const issueNumber = new Number(Astro.params.issueNumber).valueOf() as LallansIss

            {t(tPage, { key: 'title' })}

            {t(tPage, { key: 'payment-confirmation-message', issueNumber: `${issueNumber}` })}

            - + {t(tPage, { key: 'back-button-text', issueNumber: `${issueNumber}` })}
            diff --git a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro index 16bbdd8..9e152ee 100644 --- a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro +++ b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro @@ -23,7 +23,7 @@ const t = translate(locale);

            {t(tPage, { key: 'title' })}

            {t(tPage, { key: 'payment-confirmation-message', scotsounId })}

            - + {t(tPage, { key: 'back-button-text', scotsounId })}
            diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro index c67ded0..b08f412 100644 --- a/src/pages/[locale]/index.astro +++ b/src/pages/[locale]/index.astro @@ -24,6 +24,7 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);

            +

      @@ -75,7 +76,7 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);

      - + {contactDetails.generalEnquiries.emailAddress}
      -- cgit v1.2.3