From 35c242f6abb614e1d545fb8a2a1180a451c22a54 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Sun, 27 Aug 2023 18:26:45 +0100 Subject: Scotsoun release title includes ID --- src/components/Scotsoun.astro | 1 + src/i18n/translations/pages/scotsounRelease.ts | 14 ++++++++++++++ .../furthsettins/scotsoun/[scotsounId]/index.astro | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/i18n/translations/pages/scotsounRelease.ts (limited to 'src') diff --git a/src/components/Scotsoun.astro b/src/components/Scotsoun.astro index 1c2b1a0..3af652e 100644 --- a/src/components/Scotsoun.astro +++ b/src/components/Scotsoun.astro @@ -20,6 +20,7 @@ const t = translate(locale);

{scotsoun.title}

+

Scotsoun SSCD{scotsoun.scotsounId}

{scotsoun?.subtitle &&

{scotsoun.subtitle}

} { scotsoun?.author && ( diff --git a/src/i18n/translations/pages/scotsounRelease.ts b/src/i18n/translations/pages/scotsounRelease.ts new file mode 100644 index 0000000..d4036d8 --- /dev/null +++ b/src/i18n/translations/pages/scotsounRelease.ts @@ -0,0 +1,14 @@ +import type ScotsounId from '$types/ScotsounId'; +import type { TranslationsDictionary } from '$types/TranslationsDictionary'; + +const tPage = { + title: { + sco: ({ scotsounId, name }: { scotsounId: ScotsounId; name: string }) => + `${name} (Scotsoun SSCD${scotsounId})`, + 'en-GB': ({ scotsounId, name }: { scotsounId: ScotsounId; name: string }) => + `${name} (Scotsoun SSCD${scotsounId})`, + }, +}; + +type Raw = typeof tPage; +export default tPage as TranslationsDictionary; diff --git a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/index.astro b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/index.astro index a641561..90053fe 100644 --- a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/index.astro +++ b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/index.astro @@ -1,7 +1,7 @@ --- import Page from '$layouts/Page.astro'; import localeStaticPaths from '$lib/localeStaticPaths'; -import tPage from '$i18n/translations/pages/scotsounGallery'; +import tPage from '$i18n/translations/pages/scotsounRelease'; import translate from '$i18n/translate'; import type Locale from '$types/Locale'; import { getScotsoun } from '$data/scotsoun'; @@ -22,6 +22,6 @@ const t = translate(locale); const scotsoun = await getScotsoun[scotsounId](); --- - + -- cgit v1.2.3 From fb0a87fcd7479532df151a358d00a3e26a82039a Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Mon, 28 Aug 2023 16:52:21 +0100 Subject: Adds George T Watt commattee details --- src/data/committee.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src') diff --git a/src/data/committee.ts b/src/data/committee.ts index 038dd90..614a11d 100644 --- a/src/data/committee.ts +++ b/src/data/committee.ts @@ -73,6 +73,21 @@ const committee: CommitteeMember[] = [ { name: 'George T Watt', roles: [CommitteeRole.MemmershipSecretar], + bio: { + sco: ` + 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. + `, + '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. + `, + }, + imgSrc: '/images/commattee/george-t-watt.jpg', }, { name: 'Rab Wilson', -- cgit v1.2.3 From 3807c89c02716e945f3f499c87de7482242ee90a Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Mon, 28 Aug 2023 16:53:12 +0100 Subject: Marks Bleiman as an Ordinary Member --- src/data/committee.ts | 2 +- src/enums/CommitteeRole.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/data/committee.ts b/src/data/committee.ts index 614a11d..e8e41a2 100644 --- a/src/data/committee.ts +++ b/src/data/committee.ts @@ -25,7 +25,7 @@ const committee: CommitteeMember[] = [ }, { name: 'David Bleiman', - roles: [], + roles: [CommitteeRole.OrdinaryMember], bio: { sco: ` David bides i Cramond on the Embro Riviera. He is a makar, an is the winner diff --git a/src/enums/CommitteeRole.ts b/src/enums/CommitteeRole.ts index 8db8456..815dfe0 100644 --- a/src/enums/CommitteeRole.ts +++ b/src/enums/CommitteeRole.ts @@ -6,6 +6,7 @@ enum CommitteeRole { MemmershipSecretar, LallansEiditor, HonoraryPreses, + OrdinaryMember, } export default CommitteeRole; -- cgit v1.2.3 From 708fba09fbec806e2dd93f006b16553719d19253 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Mon, 28 Aug 2023 16:55:41 +0100 Subject: Adds Wullie Hershaw bio --- src/data/committee.ts | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/data/committee.ts b/src/data/committee.ts index e8e41a2..1009b40 100644 --- a/src/data/committee.ts +++ b/src/data/committee.ts @@ -51,8 +51,52 @@ const committee: CommitteeMember[] = [ roles: [], }, { - name: 'Wullie Hershaw', - roles: [], + name: 'William Hershaw', + roles: [CommitteeRole.LallansEiditor], + bio: { + sco: ` + William Hershaw is the praisent eiditor o Lallans. He is a weill-kent + + poet + and + + singer + . Brocht up as a native Scots speiker in a Fife + 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 + . Brought up as a native Scots speaker in a Fife mining + 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 + . + `, + }, }, { name: 'Derrick McClure', -- cgit v1.2.3 From e57d39ada5be5c020694fcadd5a3f19630393df6 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Mon, 28 Aug 2023 19:04:35 +0100 Subject: Adds william hershaw's photo --- src/data/committee.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/data/committee.ts b/src/data/committee.ts index 1009b40..367794c 100644 --- a/src/data/committee.ts +++ b/src/data/committee.ts @@ -97,6 +97,7 @@ const committee: CommitteeMember[] = [ . `, }, + imgSrc: '/images/committee/william-hershaw.jpg', }, { name: 'Derrick McClure', -- cgit v1.2.3 From 87a53b7ce80dd115f6e90008642dccad3d92003d Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Mon, 28 Aug 2023 19:05:18 +0100 Subject: Adds translation for Ordinary Member --- src/i18n/translations/enums/committeeRole.ts | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/i18n/translations/enums/committeeRole.ts b/src/i18n/translations/enums/committeeRole.ts index 0d13b18..e2cc156 100644 --- a/src/i18n/translations/enums/committeeRole.ts +++ b/src/i18n/translations/enums/committeeRole.ts @@ -29,6 +29,10 @@ const tEnum = { sco: () => 'Honorary Preses', 'en-GB': () => 'Honorary President', }, + OrdinaryMember: { + sco: () => 'Ordinary Memmer', + 'en-GB': () => 'Ordinary Member', + }, }; type Raw = typeof tEnum; -- cgit v1.2.3 From eae2ca9c7aebf7d171be36555ffc9a63a84839c9 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 30 Aug 2023 18:06:16 +0100 Subject: Adds placeholder to Commattee section --- src/i18n/translations/pages/home.ts | 4 ++++ src/pages/[locale]/index.astro | 1 + 2 files changed, 5 insertions(+) (limited to 'src') diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts index 33b5c5c..2b9a2c3 100644 --- a/src/i18n/translations/pages/home.ts +++ b/src/i18n/translations/pages/home.ts @@ -59,6 +59,10 @@ const tPage = { sco: () => 'Meet the Commattee', 'en-GB': () => 'Meet the Committee', }, + 'mair-commattee-details-soon': { + sco: () => 'Mair details comin shuin!', + 'en-GB': () => 'More details coming soon!', + }, furthsettins: { sco: () => 'Furthsettins', 'en-GB': () => 'Publications', diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro index 4a093b7..b06f39d 100644 --- a/src/pages/[locale]/index.astro +++ b/src/pages/[locale]/index.astro @@ -40,6 +40,7 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);

+

{t(tPage, { key: 'mair-commattee-details-soon' })}

    { committee.map((member) => ( -- cgit v1.2.3 From 4c2bf1bdcf16e8b7df609bd72c60529f00e52d8f Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 30 Aug 2023 18:07:28 +0100 Subject: Better display for no committee roles --- src/pages/[locale]/index.astro | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro index b06f39d..39db161 100644 --- a/src/pages/[locale]/index.astro +++ b/src/pages/[locale]/index.astro @@ -55,9 +55,12 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);

    {member.name} - - |{member.roles.map((role) => t(tRole, { key: CommitteeRole[role] })).join(', ')} - + {member.roles.length > 0 && ( + + |{' '} + {member.roles.map((role) => t(tRole, { key: CommitteeRole[role] })).join(', ')} + + )}

    {member.bio &&

    }

    -- cgit v1.2.3 From 85140152e0adcac6cf5d096a4a0f7cc28d81a490 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 30 Aug 2023 18:10:32 +0100 Subject: Fixes Hershaw image src --- src/data/committee.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/data/committee.ts b/src/data/committee.ts index 367794c..1defd45 100644 --- a/src/data/committee.ts +++ b/src/data/committee.ts @@ -97,7 +97,7 @@ const committee: CommitteeMember[] = [ . `, }, - imgSrc: '/images/committee/william-hershaw.jpg', + imgSrc: '/images/commattee/william-hershaw.jpg', }, { name: 'Derrick McClure', -- cgit v1.2.3