diff options
| -rw-r--r-- | public/images/commattee/george-t-watt.jpg | bin | 0 -> 178777 bytes | |||
| -rw-r--r-- | public/images/commattee/william-hershaw.jpg | bin | 0 -> 56667 bytes | |||
| -rw-r--r-- | src/components/Scotsoun.astro | 1 | ||||
| -rw-r--r-- | src/data/committee.ts | 66 | ||||
| -rw-r--r-- | src/enums/CommitteeRole.ts | 1 | ||||
| -rw-r--r-- | src/i18n/translations/enums/committeeRole.ts | 4 | ||||
| -rw-r--r-- | src/i18n/translations/pages/home.ts | 4 | ||||
| -rw-r--r-- | src/i18n/translations/pages/scotsounRelease.ts | 14 | ||||
| -rw-r--r-- | src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/index.astro | 4 | ||||
| -rw-r--r-- | src/pages/[locale]/index.astro | 10 |
10 files changed, 96 insertions, 8 deletions
diff --git a/public/images/commattee/george-t-watt.jpg b/public/images/commattee/george-t-watt.jpg Binary files differnew file mode 100644 index 0000000..c3c41c4 --- /dev/null +++ b/public/images/commattee/george-t-watt.jpg diff --git a/public/images/commattee/william-hershaw.jpg b/public/images/commattee/william-hershaw.jpg Binary files differnew file mode 100644 index 0000000..8b7c53a --- /dev/null +++ b/public/images/commattee/william-hershaw.jpg 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); <div class="product__header-block"> <header> <h1>{scotsoun.title}</h1> + <p class="italic">Scotsoun SSCD{scotsoun.scotsounId}</p> {scotsoun?.subtitle && <p class="italic">{scotsoun.subtitle}</p>} { scotsoun?.author && ( diff --git a/src/data/committee.ts b/src/data/committee.ts index 038dd90..1defd45 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 @@ -51,8 +51,53 @@ 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 + <a + class="link" + href="http://www.scottishpoetrylibrary.org.uk/poetry/poets/william-hershaw" + > + poet + </a> and + <a + class="link" + href="https://en-gb.facebook.com/bowhillplayers" + > + singer + </a>. 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 + <a class="link" href="mailto:w.hershaw678@btinternet"> + w.hershaw678@btinternet + </a>. + `, + 'en-GB': ` + William Hershaw is the current editor of Lallans. He is a well-known + <a + class="link" + href="http://www.scottishpoetrylibrary.org.uk/poetry/poets/william-hershaw" + > + poet + </a> and + <a + class="link" + href="https://en-gb.facebook.com/bowhillplayers" + > + singer + </a>. 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 + <a class="link" href="mailto:w.hershaw678@btinternet"> + w.hershaw678@btinternet + </a>. + `, + }, + imgSrc: '/images/commattee/william-hershaw.jpg', }, { name: 'Derrick McClure', @@ -73,6 +118,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 + <a class="link" href="/en-GB/furthsettins/scotsoun">Scotsoun</a> 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 + <a class="link" href="/en-GB/furthsettins/scotsoun">Scotsoun</a>. + `, + }, + imgSrc: '/images/commattee/george-t-watt.jpg', }, { name: 'Rab Wilson', 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; 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; 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/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<Raw>; 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](); --- -<Page title={t(tPage, { key: 'title' })}> +<Page title={t(tPage, { key: 'title', scotsounId, name: scotsoun.title })}> <Scotsoun scotsoun={scotsoun} /> </Page> diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro index 4a093b7..39db161 100644 --- a/src/pages/[locale]/index.astro +++ b/src/pages/[locale]/index.astro @@ -40,6 +40,7 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale); <p set:html={t(tPage, { key: 'about-us-para-2' })} /> <p set:html={t(tPage, { key: 'about-us-para-3' })} /> <h3 set:html={t(tPage, { key: 'meet-the-commattee' })} /> + <p class="italic">{t(tPage, { key: 'mair-commattee-details-soon' })}</p> <ul> { committee.map((member) => ( @@ -54,9 +55,12 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale); <div class="committee__member__text"> <h4> {member.name} - <span class="font-weight-lighter"> - |{member.roles.map((role) => t(tRole, { key: CommitteeRole[role] })).join(', ')} - </span> + {member.roles.length > 0 && ( + <span class="font-weight-lighter"> + |{' '} + {member.roles.map((role) => t(tRole, { key: CommitteeRole[role] })).join(', ')} + </span> + )} </h4> {member.bio && <p set:html={member.bio[locale]} />} </div> |
