diff options
| author | Joe Carstairs <65492573+Sycamost@users.noreply.github.com> | 2023-08-13 19:03:03 +0100 |
|---|---|---|
| committer | Joe Carstairs <65492573+Sycamost@users.noreply.github.com> | 2023-08-13 19:10:06 +0100 |
| commit | 8c1fff45fb5340a338416586162ac247b2b190c0 (patch) | |
| tree | 849ae072e8efc8652d3045ae4ab3db30798f1a9b /src | |
| parent | 1118c377e32940ada179bfcde1549b73d8948626 (diff) | |
Uses TSConfig paths
Diffstat (limited to 'src')
176 files changed, 790 insertions, 547 deletions
diff --git a/src/components/Breadcrumbs.astro b/src/components/Breadcrumbs.astro index 5ebe759..66f2a66 100644 --- a/src/components/Breadcrumbs.astro +++ b/src/components/Breadcrumbs.astro @@ -1,9 +1,9 @@ --- -import findAllIndicesOf from '../lib/findAllIndicesOf'; -import translate from '../i18n/translate'; -import tBreadcrumbs from '../i18n/translations/components/breadcrumbs'; -import type Locale from '../types/Locale'; -import locales from '../i18n/locales'; +import findAllIndicesOf from '$lib/findAllIndicesOf'; +import translate from '$i18n/translate'; +import tBreadcrumbs from '$i18n/translations/components/breadcrumbs'; +import type Locale from '$types/Locale'; +import locales from '$i18n/locales'; const path = Astro.url.pathname.replace(/(?<!\/)$/, '/'); const localeInPath = new RegExp(`/(?<=^/)(${locales.join('|')})`); diff --git a/src/components/LallansIssue.astro b/src/components/LallansIssue.astro index f45dc0a..c71755b 100644 --- a/src/components/LallansIssue.astro +++ b/src/components/LallansIssue.astro @@ -1,8 +1,8 @@ --- -import translate from '../i18n/translate'; -import tSite from '../i18n/translations/site'; -import type LallansIssue from '../types/LallansIssue'; -import type Locale from '../types/Locale'; +import translate from '$i18n/translate'; +import tSite from '$i18n/translations/site'; +import type LallansIssue from '$types/LallansIssue'; +import type Locale from '$types/Locale'; import LallansIssueContributions from './LallansIssueContributions.astro'; import LallansIssueContributors from './LallansIssueContributors.astro'; import PayPalButtons from './PayPalButtons.astro'; @@ -17,18 +17,20 @@ const t = translate(locale); --- <section class="section--full-width"> - <div class="lallans-issue__header-block"> + <div class="product__header-block"> <header> <h1>{t(tSite, { key: 'lallans' })} {issue.issueNumber}</h1> <p class="italic">{issue.description[locale]}</p> </header> - <div class="lallans-issue__header-block-end"> + <div class="product__action-block"> <img alt="" src={`/images/lallans/issue${issue.issueNumber}.jpg`} /> <PayPalButtons successPageUrl={`./${issue.issueNumber}/payment-success-confirmation`} /> </div> </div> +</section> +<section> { 'contributions' in issue ? ( <LallansIssueContributions contributions={issue.contributions} locale={locale} /> diff --git a/src/components/LallansIssueContributions.astro b/src/components/LallansIssueContributions.astro index cfd3392..425f66a 100644 --- a/src/components/LallansIssueContributions.astro +++ b/src/components/LallansIssueContributions.astro @@ -1,8 +1,8 @@ --- -import translate from '../i18n/translate'; -import tSite from '../i18n/translations/site'; -import type { Contribution } from '../types/LallansIssue'; -import type Locale from '../types/Locale'; +import translate from '$i18n/translate'; +import tSite from '$i18n/translations/site'; +import type { Contribution } from '$types/LallansIssue'; +import type Locale from '$types/Locale'; interface Props { contributions: Contribution[]; diff --git a/src/components/LallansIssueContributors.astro b/src/components/LallansIssueContributors.astro index 4149e11..5ac5d42 100644 --- a/src/components/LallansIssueContributors.astro +++ b/src/components/LallansIssueContributors.astro @@ -1,5 +1,5 @@ --- -import type { Contributor } from '../types/LallansIssue'; +import type { Contributor } from '$types/LallansIssue'; interface Props { contributors: Contributor[]; @@ -11,8 +11,6 @@ const { contributors } = Astro.props; <section class="lallans-contributors"> <h2>Contributors</h2> <ul> - { contributors.map(contributor => ( - <li>{ contributor }</li> - ))} + {contributors.map((contributor) => <li>{contributor}</li>)} </ul> -</section>
\ No newline at end of file +</section> diff --git a/src/components/LallansIssuesGallery.astro b/src/components/LallansIssuesGallery.astro index 420d83f..5e45a9e 100644 --- a/src/components/LallansIssuesGallery.astro +++ b/src/components/LallansIssuesGallery.astro @@ -1,5 +1,5 @@ --- -import { getAllLallansIssues } from '../data/lallans'; +import { getAllLallansIssues } from '$data/lallans'; const issues = await getAllLallansIssues(); --- diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro index d34bfc2..45cf96b 100644 --- a/src/components/Navbar.astro +++ b/src/components/Navbar.astro @@ -1,9 +1,9 @@ --- -import type Locale from '../types/Locale'; +import type Locale from '$types/Locale'; import Breadcrumbs from './Breadcrumbs.astro'; import SwitchLanguageLink from './SwitchLanguageLink.astro'; -import tSite from '../i18n/translations/site'; -import translate from '../i18n/translate'; +import tSite from '$i18n/translations/site'; +import translate from '$i18n/translate'; interface Props { locale: Locale; diff --git a/src/components/PayPalButtons.astro b/src/components/PayPalButtons.astro index 91050dc..80d52ff 100644 --- a/src/components/PayPalButtons.astro +++ b/src/components/PayPalButtons.astro @@ -1,5 +1,5 @@ --- -import env from '../lib/env'; +import env from '$lib/env'; interface Props { successPageUrl: string; diff --git a/src/components/SwitchLanguageLink.astro b/src/components/SwitchLanguageLink.astro index e8dace3..96dd538 100644 --- a/src/components/SwitchLanguageLink.astro +++ b/src/components/SwitchLanguageLink.astro @@ -1,8 +1,8 @@ --- -import tPage from '../i18n/translations/components/languageLinks'; -import tSite from '../i18n/translations/site'; -import translate from '../i18n/translate'; -import type Locale from '../types/Locale'; +import tPage from '$i18n/translations/components/languageLinks'; +import tSite from '$i18n/translations/site'; +import translate from '$i18n/translate'; +import type Locale from '$types/Locale'; interface Props { currentLocale: Locale; diff --git a/src/data/lallans/index.ts b/src/data/lallans/index.ts index 2f49e65..434ff1c 100644 --- a/src/data/lallans/index.ts +++ b/src/data/lallans/index.ts @@ -1,5 +1,5 @@ -import type LallansIssue from '../../types/LallansIssue'; -import type LallansIssueNumber from '../../types/LallansIssueNumber'; +import type LallansIssue from '$types/LallansIssue'; +import type LallansIssueNumber from '$types/LallansIssueNumber'; /** * This might seem like an odd syntax, but this is so diff --git a/src/data/lallans/issue100.ts b/src/data/lallans/issue100.ts index 5cfa15c..f1d838b 100644 --- a/src/data/lallans/issue100.ts +++ b/src/data/lallans/issue100.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 100, diff --git a/src/data/lallans/issue101.ts b/src/data/lallans/issue101.ts index 37dfbe9..3cc0eec 100644 --- a/src/data/lallans/issue101.ts +++ b/src/data/lallans/issue101.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 101, diff --git a/src/data/lallans/issue21.ts b/src/data/lallans/issue21.ts index d35d9bc..6bf971a 100644 --- a/src/data/lallans/issue21.ts +++ b/src/data/lallans/issue21.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 21, diff --git a/src/data/lallans/issue22.ts b/src/data/lallans/issue22.ts index 6001bd6..23327ce 100644 --- a/src/data/lallans/issue22.ts +++ b/src/data/lallans/issue22.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 22, diff --git a/src/data/lallans/issue23.ts b/src/data/lallans/issue23.ts index cf99ad9..68aff72 100644 --- a/src/data/lallans/issue23.ts +++ b/src/data/lallans/issue23.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 23, diff --git a/src/data/lallans/issue24.ts b/src/data/lallans/issue24.ts index 96892cd..fe3985b 100644 --- a/src/data/lallans/issue24.ts +++ b/src/data/lallans/issue24.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 24, diff --git a/src/data/lallans/issue25.ts b/src/data/lallans/issue25.ts index c060a36..6d4729b 100644 --- a/src/data/lallans/issue25.ts +++ b/src/data/lallans/issue25.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 25, diff --git a/src/data/lallans/issue27.ts b/src/data/lallans/issue27.ts index 484023d..f01cc22 100644 --- a/src/data/lallans/issue27.ts +++ b/src/data/lallans/issue27.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 27, diff --git a/src/data/lallans/issue29.ts b/src/data/lallans/issue29.ts index 39e42ae..800db6e 100644 --- a/src/data/lallans/issue29.ts +++ b/src/data/lallans/issue29.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 29, diff --git a/src/data/lallans/issue30.ts b/src/data/lallans/issue30.ts index bab84d3..747501c 100644 --- a/src/data/lallans/issue30.ts +++ b/src/data/lallans/issue30.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 30, diff --git a/src/data/lallans/issue33.ts b/src/data/lallans/issue33.ts index dc80db2..a1e4c1c 100644 --- a/src/data/lallans/issue33.ts +++ b/src/data/lallans/issue33.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 33, diff --git a/src/data/lallans/issue35.ts b/src/data/lallans/issue35.ts index 547a70e..b968dcf 100644 --- a/src/data/lallans/issue35.ts +++ b/src/data/lallans/issue35.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 35, diff --git a/src/data/lallans/issue36.ts b/src/data/lallans/issue36.ts index 67a515f..8e1dce2 100644 --- a/src/data/lallans/issue36.ts +++ b/src/data/lallans/issue36.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 36, diff --git a/src/data/lallans/issue38.ts b/src/data/lallans/issue38.ts index 699312c..ce1e141 100644 --- a/src/data/lallans/issue38.ts +++ b/src/data/lallans/issue38.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 38, diff --git a/src/data/lallans/issue39.ts b/src/data/lallans/issue39.ts index cb9a4e5..340355b 100644 --- a/src/data/lallans/issue39.ts +++ b/src/data/lallans/issue39.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 39, diff --git a/src/data/lallans/issue41.ts b/src/data/lallans/issue41.ts index 46a429e..1bdeddd 100644 --- a/src/data/lallans/issue41.ts +++ b/src/data/lallans/issue41.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 41, diff --git a/src/data/lallans/issue42.ts b/src/data/lallans/issue42.ts index 1d87929..8984ca6 100644 --- a/src/data/lallans/issue42.ts +++ b/src/data/lallans/issue42.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 42, diff --git a/src/data/lallans/issue43.ts b/src/data/lallans/issue43.ts index 2892661..5ab637c 100644 --- a/src/data/lallans/issue43.ts +++ b/src/data/lallans/issue43.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 43, diff --git a/src/data/lallans/issue45.ts b/src/data/lallans/issue45.ts index c7123be..bd23785 100644 --- a/src/data/lallans/issue45.ts +++ b/src/data/lallans/issue45.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 45, diff --git a/src/data/lallans/issue46.ts b/src/data/lallans/issue46.ts index 4457fdd..dd45b54 100644 --- a/src/data/lallans/issue46.ts +++ b/src/data/lallans/issue46.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 46, diff --git a/src/data/lallans/issue47.ts b/src/data/lallans/issue47.ts index 21c5d0f..ba17416 100644 --- a/src/data/lallans/issue47.ts +++ b/src/data/lallans/issue47.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 47, diff --git a/src/data/lallans/issue48.ts b/src/data/lallans/issue48.ts index 4688b70..1253b0d 100644 --- a/src/data/lallans/issue48.ts +++ b/src/data/lallans/issue48.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 48, diff --git a/src/data/lallans/issue49.ts b/src/data/lallans/issue49.ts index 95e7e31..f04c246 100644 --- a/src/data/lallans/issue49.ts +++ b/src/data/lallans/issue49.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 49, diff --git a/src/data/lallans/issue50.ts b/src/data/lallans/issue50.ts index d2ea053..3265c65 100644 --- a/src/data/lallans/issue50.ts +++ b/src/data/lallans/issue50.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 50, diff --git a/src/data/lallans/issue51.ts b/src/data/lallans/issue51.ts index 009a702..d675792 100644 --- a/src/data/lallans/issue51.ts +++ b/src/data/lallans/issue51.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 51, diff --git a/src/data/lallans/issue52.ts b/src/data/lallans/issue52.ts index 6f80f10..c657198 100644 --- a/src/data/lallans/issue52.ts +++ b/src/data/lallans/issue52.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 52, diff --git a/src/data/lallans/issue53.ts b/src/data/lallans/issue53.ts index d0ea162..753a04a 100644 --- a/src/data/lallans/issue53.ts +++ b/src/data/lallans/issue53.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 53, diff --git a/src/data/lallans/issue54.ts b/src/data/lallans/issue54.ts index 349d688..37aa097 100644 --- a/src/data/lallans/issue54.ts +++ b/src/data/lallans/issue54.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 54, diff --git a/src/data/lallans/issue55.ts b/src/data/lallans/issue55.ts index 808fed9..1be0ad7 100644 --- a/src/data/lallans/issue55.ts +++ b/src/data/lallans/issue55.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 55, diff --git a/src/data/lallans/issue56.ts b/src/data/lallans/issue56.ts index 57fec81..14802e6 100644 --- a/src/data/lallans/issue56.ts +++ b/src/data/lallans/issue56.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 56, diff --git a/src/data/lallans/issue57.ts b/src/data/lallans/issue57.ts index 2b8ac22..510a258 100644 --- a/src/data/lallans/issue57.ts +++ b/src/data/lallans/issue57.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 57, diff --git a/src/data/lallans/issue59.ts b/src/data/lallans/issue59.ts index 7368146..e835748 100644 --- a/src/data/lallans/issue59.ts +++ b/src/data/lallans/issue59.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 59, diff --git a/src/data/lallans/issue60.ts b/src/data/lallans/issue60.ts index 596d592..01bc97b 100644 --- a/src/data/lallans/issue60.ts +++ b/src/data/lallans/issue60.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 60, diff --git a/src/data/lallans/issue61.ts b/src/data/lallans/issue61.ts index 3007fc4..c63b173 100644 --- a/src/data/lallans/issue61.ts +++ b/src/data/lallans/issue61.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 61, diff --git a/src/data/lallans/issue62.ts b/src/data/lallans/issue62.ts index bac85ae..44182b0 100644 --- a/src/data/lallans/issue62.ts +++ b/src/data/lallans/issue62.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 62, diff --git a/src/data/lallans/issue63.ts b/src/data/lallans/issue63.ts index bcdf740..6689608 100644 --- a/src/data/lallans/issue63.ts +++ b/src/data/lallans/issue63.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 63, diff --git a/src/data/lallans/issue64.ts b/src/data/lallans/issue64.ts index af37d71..de57e8f 100644 --- a/src/data/lallans/issue64.ts +++ b/src/data/lallans/issue64.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 64, diff --git a/src/data/lallans/issue65.ts b/src/data/lallans/issue65.ts index fada0d4..f94bacc 100644 --- a/src/data/lallans/issue65.ts +++ b/src/data/lallans/issue65.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 65, diff --git a/src/data/lallans/issue66.ts b/src/data/lallans/issue66.ts index 15dcc2d..af5e1fd 100644 --- a/src/data/lallans/issue66.ts +++ b/src/data/lallans/issue66.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 66, diff --git a/src/data/lallans/issue67.ts b/src/data/lallans/issue67.ts index a77bcac..68e4db1 100644 --- a/src/data/lallans/issue67.ts +++ b/src/data/lallans/issue67.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 67, diff --git a/src/data/lallans/issue68.ts b/src/data/lallans/issue68.ts index bf0872e..17b4237 100644 --- a/src/data/lallans/issue68.ts +++ b/src/data/lallans/issue68.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 68, diff --git a/src/data/lallans/issue69.ts b/src/data/lallans/issue69.ts index 1da66c7..2d78b73 100644 --- a/src/data/lallans/issue69.ts +++ b/src/data/lallans/issue69.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 69, diff --git a/src/data/lallans/issue70.ts b/src/data/lallans/issue70.ts index 3093b35..bb85b62 100644 --- a/src/data/lallans/issue70.ts +++ b/src/data/lallans/issue70.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 70, diff --git a/src/data/lallans/issue71.ts b/src/data/lallans/issue71.ts index b2ec508..2e71d05 100644 --- a/src/data/lallans/issue71.ts +++ b/src/data/lallans/issue71.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 71, diff --git a/src/data/lallans/issue72.ts b/src/data/lallans/issue72.ts index d5abcc3..9f0a9c4 100644 --- a/src/data/lallans/issue72.ts +++ b/src/data/lallans/issue72.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 72, diff --git a/src/data/lallans/issue73.ts b/src/data/lallans/issue73.ts index 4f30ce0..051f628 100644 --- a/src/data/lallans/issue73.ts +++ b/src/data/lallans/issue73.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 73, diff --git a/src/data/lallans/issue74.ts b/src/data/lallans/issue74.ts index 57eaad5..ff797ad 100644 --- a/src/data/lallans/issue74.ts +++ b/src/data/lallans/issue74.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 74, diff --git a/src/data/lallans/issue75.ts b/src/data/lallans/issue75.ts index 16a1fc1..e61241a 100644 --- a/src/data/lallans/issue75.ts +++ b/src/data/lallans/issue75.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 75, diff --git a/src/data/lallans/issue76.ts b/src/data/lallans/issue76.ts index 973ff23..8be2755 100644 --- a/src/data/lallans/issue76.ts +++ b/src/data/lallans/issue76.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 76, diff --git a/src/data/lallans/issue77.ts b/src/data/lallans/issue77.ts index b171dc7..6918c3f 100644 --- a/src/data/lallans/issue77.ts +++ b/src/data/lallans/issue77.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 77, diff --git a/src/data/lallans/issue78.ts b/src/data/lallans/issue78.ts index d00e206..2aeb851 100644 --- a/src/data/lallans/issue78.ts +++ b/src/data/lallans/issue78.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 78, diff --git a/src/data/lallans/issue79.ts b/src/data/lallans/issue79.ts index 77396b3..b86d95c 100644 --- a/src/data/lallans/issue79.ts +++ b/src/data/lallans/issue79.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 79, diff --git a/src/data/lallans/issue80.ts b/src/data/lallans/issue80.ts index 71fcd97..59ca898 100644 --- a/src/data/lallans/issue80.ts +++ b/src/data/lallans/issue80.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 80, diff --git a/src/data/lallans/issue81.ts b/src/data/lallans/issue81.ts index 5fe0bb7..052f476 100644 --- a/src/data/lallans/issue81.ts +++ b/src/data/lallans/issue81.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 81, diff --git a/src/data/lallans/issue82.ts b/src/data/lallans/issue82.ts index 2ca2479..25ab984 100644 --- a/src/data/lallans/issue82.ts +++ b/src/data/lallans/issue82.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 82, diff --git a/src/data/lallans/issue83.ts b/src/data/lallans/issue83.ts index 0097ad2..a88e85f 100644 --- a/src/data/lallans/issue83.ts +++ b/src/data/lallans/issue83.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 83, diff --git a/src/data/lallans/issue84.ts b/src/data/lallans/issue84.ts index 76472c2..1138117 100644 --- a/src/data/lallans/issue84.ts +++ b/src/data/lallans/issue84.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 84, diff --git a/src/data/lallans/issue85.ts b/src/data/lallans/issue85.ts index 33f9b22..fd1de22 100644 --- a/src/data/lallans/issue85.ts +++ b/src/data/lallans/issue85.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 85, diff --git a/src/data/lallans/issue86.ts b/src/data/lallans/issue86.ts index 9f3a85d..2f3c3bf 100644 --- a/src/data/lallans/issue86.ts +++ b/src/data/lallans/issue86.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 86, diff --git a/src/data/lallans/issue87.ts b/src/data/lallans/issue87.ts index 668bda9..b6c6ac5 100644 --- a/src/data/lallans/issue87.ts +++ b/src/data/lallans/issue87.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 87, diff --git a/src/data/lallans/issue88.ts b/src/data/lallans/issue88.ts index de24ecb..f24811e 100644 --- a/src/data/lallans/issue88.ts +++ b/src/data/lallans/issue88.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 88, diff --git a/src/data/lallans/issue89.ts b/src/data/lallans/issue89.ts index 7b39431..8624787 100644 --- a/src/data/lallans/issue89.ts +++ b/src/data/lallans/issue89.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 89, diff --git a/src/data/lallans/issue90.ts b/src/data/lallans/issue90.ts index 88ffb38..46eb699 100644 --- a/src/data/lallans/issue90.ts +++ b/src/data/lallans/issue90.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 90, diff --git a/src/data/lallans/issue91.ts b/src/data/lallans/issue91.ts index 7514d34..5b098f3 100644 --- a/src/data/lallans/issue91.ts +++ b/src/data/lallans/issue91.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 91, diff --git a/src/data/lallans/issue92.ts b/src/data/lallans/issue92.ts index b1fa8a4..dd13ebe 100644 --- a/src/data/lallans/issue92.ts +++ b/src/data/lallans/issue92.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 92, diff --git a/src/data/lallans/issue93.ts b/src/data/lallans/issue93.ts index 145f6f9..cc930b6 100644 --- a/src/data/lallans/issue93.ts +++ b/src/data/lallans/issue93.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 93, diff --git a/src/data/lallans/issue96.ts b/src/data/lallans/issue96.ts index 81821cd..e0e5251 100644 --- a/src/data/lallans/issue96.ts +++ b/src/data/lallans/issue96.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 96, diff --git a/src/data/lallans/issue97.ts b/src/data/lallans/issue97.ts index a9f4084..5d71df2 100644 --- a/src/data/lallans/issue97.ts +++ b/src/data/lallans/issue97.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 97, diff --git a/src/data/lallans/issue98.ts b/src/data/lallans/issue98.ts index 3bc4b0f..a38c6d5 100644 --- a/src/data/lallans/issue98.ts +++ b/src/data/lallans/issue98.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 98, diff --git a/src/data/lallans/issue99.ts b/src/data/lallans/issue99.ts index ce730bd..87097a5 100644 --- a/src/data/lallans/issue99.ts +++ b/src/data/lallans/issue99.ts @@ -1,4 +1,4 @@ -import type LallansIssue from '../../types/LallansIssue'; +import type LallansIssue from '$types/LallansIssue'; const issue: LallansIssue = { issueNumber: 99, diff --git a/src/data/scotsoun/index.ts b/src/data/scotsoun/index.ts new file mode 100644 index 0000000..0140cf6 --- /dev/null +++ b/src/data/scotsoun/index.ts @@ -0,0 +1,94 @@ +import type Scotsoun from '$types/Scotsoun'; +import type ScotsounId from '$types/ScotsounId'; + +/** + * This might seem like an odd syntax, but this is so + * that we can use TypeScript to guarantee that every + * Lallans issue is accounted for. + */ +export const getScotsoun: ScotsounGetterTable = { + sscd001: async () => (await import('./sscd001')).default, + sscd003: async () => (await import('./sscd003')).default, + sscd008: async () => (await import('./sscd008')).default, + sscd012: async () => (await import('./sscd012')).default, + sscd014: async () => (await import('./sscd014')).default, + sscd015: async () => (await import('./sscd015')).default, + sscd017: async () => (await import('./sscd017')).default, + sscd018: async () => (await import('./sscd018')).default, + sscd020: async () => (await import('./sscd020')).default, + sscd021: async () => (await import('./sscd021')).default, + sscd022: async () => (await import('./sscd022')).default, + sscd024: async () => (await import('./sscd024')).default, + sscd028: async () => (await import('./sscd028')).default, + sscd034: async () => (await import('./sscd034')).default, + sscd035: async () => (await import('./sscd035')).default, + sscd039: async () => (await import('./sscd039')).default, + sscd042: async () => (await import('./sscd042')).default, + sscd043: async () => (await import('./sscd043')).default, + sscd046: async () => (await import('./sscd046')).default, + sscd047: async () => (await import('./sscd047')).default, + sscd048: async () => (await import('./sscd048')).default, + sscd050: async () => (await import('./sscd050')).default, + sscd051: async () => (await import('./sscd051')).default, + sscd056: async () => (await import('./sscd056')).default, + sscd057: async () => (await import('./sscd057')).default, + sscd061: async () => (await import('./sscd061')).default, + sscd063: async () => (await import('./sscd063')).default, + sscd065: async () => (await import('./sscd065')).default, + sscd067: async () => (await import('./sscd067')).default, + sscd069: async () => (await import('./sscd069')).default, + sscd070: async () => (await import('./sscd070')).default, + sscd071: async () => (await import('./sscd071')).default, + sscd072: async () => (await import('./sscd072')).default, + sscd079: async () => (await import('./sscd079')).default, + sscd080: async () => (await import('./sscd080')).default, + sscd081: async () => (await import('./sscd081')).default, + sscd083: async () => (await import('./sscd083')).default, + sscd084: async () => (await import('./sscd084')).default, + sscd087: async () => (await import('./sscd087')).default, + sscd089: async () => (await import('./sscd089')).default, + sscd092: async () => (await import('./sscd092')).default, + sscd094: async () => (await import('./sscd094')).default, + sscd095: async () => (await import('./sscd095')).default, + sscd099: async () => (await import('./sscd099')).default, + sscd105: async () => (await import('./sscd105')).default, + sscd110: async () => (await import('./sscd110')).default, + sscd111: async () => (await import('./sscd111')).default, + sscd112: async () => (await import('./sscd112')).default, + sscd115: async () => (await import('./sscd115')).default, + sscd117: async () => (await import('./sscd117')).default, + sscd118: async () => (await import('./sscd118')).default, + sscd120: async () => (await import('./sscd120')).default, + sscd121: async () => (await import('./sscd121')).default, + sscd122: async () => (await import('./sscd122')).default, + 'sscd137-8': async () => (await import('./sscd137-8')).default, + sscd146: async () => (await import('./sscd146')).default, + sscd147: async () => (await import('./sscd147')).default, + sscd504: async () => (await import('./sscd504')).default, + sscd518: async () => (await import('./sscd581')).default, + sscd800: async () => (await import('./sscd800')).default, + sscd801: async () => (await import('./sscd801')).default, + sscd802: async () => (await import('./sscd802')).default, + sscd803: async () => (await import('./sscd803')).default, + sscd804: async () => (await import('./sscd804')).default, + sscd805: async () => (await import('./sscd805')).default, + sscd806: async () => (await import('./sscd806')).default, + sscd807: async () => (await import('./sscd807')).default, + sscd808: async () => (await import('./sscd808')).default, + sscd809: async () => (await import('./sscd809')).default, + sscd810: async () => (await import('./sscd810')).default, + sscd811: async () => (await import('./sscd811')).default, + sscd812: async () => (await import('./sscd812')).default, + sscd813: async () => (await import('./sscd813')).default, + sscd814: async () => (await import('./sscd814')).default, + sscd815: async () => (await import('./sscd815')).default, + sscd816: async () => (await import('./sscd816')).default, + sscdM150: async () => (await import('./sscdM150')).default, + sscdU1: async () => (await import('./sscdU1')).default, +}; + +export type ScotsounGetterTable = { [key in ScotsounId]: () => Promise<Scotsoun> }; + +export async function getAllLallansIssues(): Promise<Scotsoun[]> { + return Promise.all(Object.values(getScotsoun).map((f) => f())); +} diff --git a/src/data/scotsoun/sscd001.ts b/src/data/scotsoun/sscd001.ts index b3a701a..3409862 100644 --- a/src/data/scotsoun/sscd001.ts +++ b/src/data/scotsoun/sscd001.ts @@ -1,18 +1,18 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'The Scottish Poems of Robert Fergusson', subtitle: 'Introduced by Douglas Gifford', - 'long-name': 'The Scottish Poems of Robert Fergusson', + longName: 'The Scottish Poems of Robert Fergusson', author: 'Robert Fergusson', - 'cd-count': 3, + cdCount: 3, price: '25.00', - 'scotsoun-id': '001', + scotsounId: '001', description: { sco: 'Read bi Alec MacMillan, Jean Faulds, Robert Garioch an Alexander Scott.', 'en-GB': 'Read by Alec MacMillan, Jean Faulds, Robert Garioch and Alexander Scott.', }, - 'track-list': ['The Daft Days', 'Appraisal'], + trackList: ['The Daft Days', 'Appraisal'], }; export default cd; diff --git a/src/data/scotsoun/sscd003.ts b/src/data/scotsoun/sscd003.ts index b712963..bc4f0dd 100644 --- a/src/data/scotsoun/sscd003.ts +++ b/src/data/scotsoun/sscd003.ts @@ -1,17 +1,17 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Currie Flavour', - 'long-name': 'Currie Flavour', + longName: 'Currie Flavour', author: 'Rev James Currie', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '003', + scotsounId: '003', description: { sco: 'Readins bi the Rev James Currie recordit at the Dunlop Manse durin 1974.', 'en-GB': 'Readings by the Rev James Currie recorded at the Dunlop Manse during 1974.', }, - 'track-list': [ + trackList: [ 'Rab Comes Hame', 'The Covenanter’s Tryst', 'Last Lauch Douglas Young', diff --git a/src/data/scotsoun/sscd008.ts b/src/data/scotsoun/sscd008.ts index 9cac49d..0a29f28 100644 --- a/src/data/scotsoun/sscd008.ts +++ b/src/data/scotsoun/sscd008.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Poems Chiefly in the Scottish Dialect', subtitle: 'Read by Members of the Irvine Burns Club', - 'long-name': 'Poems Chiefly in the Scottish Dialect', + longName: 'Poems Chiefly in the Scottish Dialect', author: 'Robert Burns', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '008', - 'track-list': ['To a Louse', 'Epistle to a Young Friend'], + scotsounId: '008', + trackList: ['To a Louse', 'Epistle to a Young Friend'], }; export default cd; diff --git a/src/data/scotsoun/sscd012.ts b/src/data/scotsoun/sscd012.ts index d45acc7..897e6c9 100644 --- a/src/data/scotsoun/sscd012.ts +++ b/src/data/scotsoun/sscd012.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Fiddle Favourites', - 'long-name': 'Fiddle Favourites', + longName: 'Fiddle Favourites', author: 'Glasgow Caledonian Strathspey and Reel Society', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '012', - 'track-list': [ + scotsounId: '012', + trackList: [ 'The Music of the Spey / The Gay Gordons / Glenlivit / The Laird o Drumblair / MacKenzie Hay / MacKenzie Fraser / Angus Campbell', 'Bonawe Highlanders / Angus McKinnon / The 10th HLI Crossing the Rhine', ], diff --git a/src/data/scotsoun/sscd014.ts b/src/data/scotsoun/sscd014.ts index 40297fb..c2b0db6 100644 --- a/src/data/scotsoun/sscd014.ts +++ b/src/data/scotsoun/sscd014.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Ceol na Gàidhlig', subtitle: 'Gaelic Music & Poetry', - 'long-name': 'Ceol na Gàidhlig – Gaelic Music & Poetry', + longName: 'Ceol na Gàidhlig – Gaelic Music & Poetry', author: 'Derick Thomson', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '014', - 'track-list': [ + scotsounId: '014', + trackList: [ 'Ar Blar Catha le Deòrsa Caimbeul Hay', 'Clann-nighean an Sgadain le Ruaraidh MacThómais', 'Do Shean-Bhoireannach le iain Mac a’ Ghobhainn', diff --git a/src/data/scotsoun/sscd015.ts b/src/data/scotsoun/sscd015.ts index 4985651..2089caf 100644 --- a/src/data/scotsoun/sscd015.ts +++ b/src/data/scotsoun/sscd015.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Psaums, Hymns, Sangs', - 'long-name': 'Psaums, Hymns, Sangs', + longName: 'Psaums, Hymns, Sangs', author: 'Clydebank Lyric Choir', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '015', - 'track-list': [ + scotsounId: '015', + trackList: [ 'Intro to O Ye who Taste', 'O Ye who Taste', 'Intro to Ye Gates', diff --git a/src/data/scotsoun/sscd017.ts b/src/data/scotsoun/sscd017.ts index 6c8dc0a..9985dcc 100644 --- a/src/data/scotsoun/sscd017.ts +++ b/src/data/scotsoun/sscd017.ts @@ -1,17 +1,17 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Tenement Tales', - 'long-name': 'Tenement Tales', + longName: 'Tenement Tales', author: 'Molly Weir', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '017', + scotsounId: '017', description: { sco: 'Thir stories wis else broadcast on Scottish Television unner the same title.', 'en-GB': 'These stories were previously broadcast on Scottish Television under the same title.', }, - 'track-list': ['A Mess of Potage', 'Entertaining Angels Unawares'], + trackList: ['A Mess of Potage', 'Entertaining Angels Unawares'], }; export default cd; diff --git a/src/data/scotsoun/sscd018.ts b/src/data/scotsoun/sscd018.ts index 4ba2ef9..06f30c8 100644 --- a/src/data/scotsoun/sscd018.ts +++ b/src/data/scotsoun/sscd018.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Robert Henryson', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Robert Henryson', + longName: 'Scotsoun Makars Series – Robert Henryson', author: 'Robert Henryson', - 'cd-count': 3, + cdCount: 3, price: '25.00', - 'scotsoun-id': '018', - 'track-list': [ + scotsounId: '018', + trackList: [ 'The Taill of the Uponlandis Mous and the Burges Mous', 'The Taill of the Paddok and the Mous', ], diff --git a/src/data/scotsoun/sscd020.ts b/src/data/scotsoun/sscd020.ts index 46b3454..21c9307 100644 --- a/src/data/scotsoun/sscd020.ts +++ b/src/data/scotsoun/sscd020.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'William Dunbar', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – William Dunbar', + longName: 'Scotsoun Makars Series – William Dunbar', author: 'William Dunbar', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '020', - 'track-list': ['The Tretis of the Tua Mariit Wemen and the Wedo', 'Remonstrance to the King'], + scotsounId: '020', + trackList: ['The Tretis of the Tua Mariit Wemen and the Wedo', 'Remonstrance to the King'], }; export default cd; diff --git a/src/data/scotsoun/sscd021.ts b/src/data/scotsoun/sscd021.ts index 5d5ba81..201432f 100644 --- a/src/data/scotsoun/sscd021.ts +++ b/src/data/scotsoun/sscd021.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Ten Medieval Makars', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Ten Medieval Makars', + longName: 'Scotsoun Makars Series – Ten Medieval Makars', author: 'various', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '021', - 'track-list': ['Of the Day Estivall by Alexander Hume', 'Boyd Sonet by Mark Alexander'], + scotsounId: '021', + trackList: ['Of the Day Estivall by Alexander Hume', 'Boyd Sonet by Mark Alexander'], }; export default cd; diff --git a/src/data/scotsoun/sscd022.ts b/src/data/scotsoun/sscd022.ts index 4e39699..82dffb6 100644 --- a/src/data/scotsoun/sscd022.ts +++ b/src/data/scotsoun/sscd022.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'A Forgotten Heritage', subtitle: 'Original folk tales of Lowland Scotland', - 'long-name': 'A Forgotten Heritage – Original folk tales of Lowland Scotland', + longName: 'A Forgotten Heritage – Original folk tales of Lowland Scotland', author: 'Hannah Aitken (ed)', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '022', - 'track-list': ['The Miller’s Tale', 'The Marriage of Robin Redbreast'], + scotsounId: '022', + trackList: ['The Miller’s Tale', 'The Marriage of Robin Redbreast'], }; export default cd; diff --git a/src/data/scotsoun/sscd024.ts b/src/data/scotsoun/sscd024.ts index 9aa4a45..1e33aee 100644 --- a/src/data/scotsoun/sscd024.ts +++ b/src/data/scotsoun/sscd024.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Under the Eildon Tree', - 'long-name': 'Under the Eildon Tree', + longName: 'Under the Eildon Tree', author: 'Sydney Goodsir Smith', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '024', - 'track-list': [ + scotsounId: '024', + trackList: [ 'Nicht lowers fast', 'Tristram', 'I heard a lassie', diff --git a/src/data/scotsoun/sscd028.ts b/src/data/scotsoun/sscd028.ts index c42bad5..b404ac3 100644 --- a/src/data/scotsoun/sscd028.ts +++ b/src/data/scotsoun/sscd028.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Hugh MacDiarmaid', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Hugh MacDiarmaid', + longName: 'Scotsoun Makars Series – Hugh MacDiarmaid', author: 'Hugh MacDiarmaid', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '028', - 'track-list': [ + scotsounId: '028', + trackList: [ 'Water of Life', 'Excelsior', 'Prayer for a Second Flood', diff --git a/src/data/scotsoun/sscd034.ts b/src/data/scotsoun/sscd034.ts index ea735df..cdbc210 100644 --- a/src/data/scotsoun/sscd034.ts +++ b/src/data/scotsoun/sscd034.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Piper in the Nave', subtitle: 'of Dunfermline Abbey, vol 1', - 'long-name': 'Piper in the Nave of Dunfermline Abbey, vol 1', + longName: 'Piper in the Nave of Dunfermline Abbey, vol 1', author: 'Pipe Major Donald MacLeod', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '034', - 'track-list': [ + scotsounId: '034', + trackList: [ 'Introduction to track 21', 'Stumpie Three Dance Tunes / Devil in the Kitchen / The Reel of Bogie', 'Introduction to track 23', diff --git a/src/data/scotsoun/sscd035.ts b/src/data/scotsoun/sscd035.ts index 9998ce0..142f183 100644 --- a/src/data/scotsoun/sscd035.ts +++ b/src/data/scotsoun/sscd035.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Poems of Robert Burns volumes 1 & 2', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Robert Burns', + longName: 'Scotsoun Makars Series – Robert Burns', author: 'Robert Burns', - 'cd-count': 3, + cdCount: 3, price: '25.00', - 'scotsoun-id': '035', - 'track-list': [ + scotsounId: '035', + trackList: [ 'The Holy Fair', 'Death and Doctor Hornbook', 'Group 5 intro', diff --git a/src/data/scotsoun/sscd039.ts b/src/data/scotsoun/sscd039.ts index 7d76cc7..2917af1 100644 --- a/src/data/scotsoun/sscd039.ts +++ b/src/data/scotsoun/sscd039.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: '18 Burns Sangs', subtitle: 'and thair stories', - 'long-name': '18 Burns Sangs and Thair Stories', + longName: '18 Burns Sangs and Thair Stories', author: 'Robert Burns', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '039', - 'track-list': [ + scotsounId: '039', + trackList: [ 'Introduction to track 2', 'Last May a Braw Wooer', 'Introduction to track 23', diff --git a/src/data/scotsoun/sscd042.ts b/src/data/scotsoun/sscd042.ts index 8589273..a2a1337 100644 --- a/src/data/scotsoun/sscd042.ts +++ b/src/data/scotsoun/sscd042.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Gavin Douglas', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Gavin Douglas', + longName: 'Scotsoun Makars Series – Gavin Douglas', author: 'Gavin Douglas', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '042', - 'track-list': ['The Muses’ Fountain', 'Conscience'], + scotsounId: '042', + trackList: ['The Muses’ Fountain', 'Conscience'], }; export default cd; diff --git a/src/data/scotsoun/sscd043.ts b/src/data/scotsoun/sscd043.ts index 3262b69..64bd4c0 100644 --- a/src/data/scotsoun/sscd043.ts +++ b/src/data/scotsoun/sscd043.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Alexander Scott', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Alexander Scott', + longName: 'Scotsoun Makars Series – Alexander Scott', author: 'Alexander Scott', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '043', - 'track-list': [ + scotsounId: '043', + trackList: [ 'Ane New Yeir Gift to Quene Mary, quhen Scho come first Hame, 1562', 'How suld my Febill Body Fure', ], diff --git a/src/data/scotsoun/sscd046.ts b/src/data/scotsoun/sscd046.ts index 63a21eb..210146a 100644 --- a/src/data/scotsoun/sscd046.ts +++ b/src/data/scotsoun/sscd046.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Piper in the Nave', subtitle: 'of Dunfermline Abbey, vol 2', - 'long-name': 'Piper in the Nave of Dunfermline Abbey, vol 2', + longName: 'Piper in the Nave of Dunfermline Abbey, vol 2', author: 'Pipe Major Donald MacLeod MBE', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '046', - 'track-list': ['Introduction to A Glase', 'A Glase'], + scotsounId: '046', + trackList: ['Introduction to A Glase', 'A Glase'], }; export default cd; diff --git a/src/data/scotsoun/sscd047.ts b/src/data/scotsoun/sscd047.ts index aba339f..2fd987a 100644 --- a/src/data/scotsoun/sscd047.ts +++ b/src/data/scotsoun/sscd047.ts @@ -1,12 +1,12 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Ceòl Beag from the Castle', - 'long-name': 'Ceòl Beag from the Castle', + longName: 'Ceòl Beag from the Castle', author: 'Pipe Major Angus Macdonald', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '047', + scotsounId: '047', description: { sco: ` A programme o pipe muisic devised an played by Pipe Major Angus Macdonald @@ -17,7 +17,7 @@ const cd: Scotsoun = { of The Scots Guards and recorded in the King’s Dining Room in Edinburgh Castle.' `, }, - 'track-list': ['Tam Bain’s Lum / Jim Tweedie’s Sea Legs', 'Black Bear / Hieland Laddie'], + trackList: ['Tam Bain’s Lum / Jim Tweedie’s Sea Legs', 'Black Bear / Hieland Laddie'], }; export default cd; diff --git a/src/data/scotsoun/sscd048.ts b/src/data/scotsoun/sscd048.ts index ae3c9c7..2ae914e 100644 --- a/src/data/scotsoun/sscd048.ts +++ b/src/data/scotsoun/sscd048.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Poems in Scots', - 'long-name': 'Jean Taylor Smith reading from her own collection', + longName: 'Jean Taylor Smith reading from her own collection', author: 'Jean Taylor Smith', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '048', - 'track-list': [ + scotsounId: '048', + trackList: [ 'To SR Crockett', 'Alas, Poor Queen', 'Last May a Braw Wooer', diff --git a/src/data/scotsoun/sscd050.ts b/src/data/scotsoun/sscd050.ts index a2e4f85..87c56b1 100644 --- a/src/data/scotsoun/sscd050.ts +++ b/src/data/scotsoun/sscd050.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Four Linmill Stories', subtitle: 'Read by the author, Robert McLellan', - 'long-name': 'Four Linmill Stories', + longName: 'Four Linmill Stories', author: 'Robert McLellan', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '050', - 'track-list': ['The Donegals', 'The Saubbath'], + scotsounId: '050', + trackList: ['The Donegals', 'The Saubbath'], }; export default cd; diff --git a/src/data/scotsoun/sscd051.ts b/src/data/scotsoun/sscd051.ts index a38eab9..a8d26cc 100644 --- a/src/data/scotsoun/sscd051.ts +++ b/src/data/scotsoun/sscd051.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Allan Ramsay', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Allan Ramsay', + longName: 'Scotsoun Makars Series – Allan Ramsay', author: 'Allan Ramsay', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '051', - 'track-list': [ + scotsounId: '051', + trackList: [ 'Intro to The Marrow Ballad', 'The Marrow Ballad', 'Intro to My Peggy is a Young Thing', diff --git a/src/data/scotsoun/sscd056.ts b/src/data/scotsoun/sscd056.ts index 100e813..7650d52 100644 --- a/src/data/scotsoun/sscd056.ts +++ b/src/data/scotsoun/sscd056.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Hamewith', subtitle: 'and other poems', - 'long-name': 'Hamewith and other poems', + longName: 'Hamewith and other poems', author: 'Charles Murray', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '056', - 'track-list': [ + scotsounId: '056', + trackList: [ 'The Three Craws', 'It wasna his Wyte', 'A Cheery Guid-Nicht', diff --git a/src/data/scotsoun/sscd057.ts b/src/data/scotsoun/sscd057.ts index 71622e0..5e907a3 100644 --- a/src/data/scotsoun/sscd057.ts +++ b/src/data/scotsoun/sscd057.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Piper Abune Them Aa', subtitle: 'Piobaire os Cionn Chaich', - 'long-name': 'Piper Abune Them Aa – Piobaire os Cionn Chaich', + longName: 'Piper Abune Them Aa – Piobaire os Cionn Chaich', author: 'Andrew Wright', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '057', - 'track-list': ['Introduction to track 11', 'Lament for Captain MacDougall'], + scotsounId: '057', + trackList: ['Introduction to track 11', 'Lament for Captain MacDougall'], }; export default cd; diff --git a/src/data/scotsoun/sscd061.ts b/src/data/scotsoun/sscd061.ts index 3d9c342..32bdad3 100644 --- a/src/data/scotsoun/sscd061.ts +++ b/src/data/scotsoun/sscd061.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Robert Garioch 1909-1981', subtitle: 'In Mind o a Makar', - 'long-name': 'Robert Garioch 1909-1981 – In Mind o a Makar', + longName: 'Robert Garioch 1909-1981 – In Mind o a Makar', author: 'Robert Garioch', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '061', - 'track-list': [ + scotsounId: '061', + trackList: [ 'Heard in the Cougate', 'Fi’baw in the street', 'Edwin Morgan', diff --git a/src/data/scotsoun/sscd063.ts b/src/data/scotsoun/sscd063.ts index 3d1078c..e54714e 100644 --- a/src/data/scotsoun/sscd063.ts +++ b/src/data/scotsoun/sscd063.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Pipe Tunes', - 'long-name': 'Pipe Tunes', + longName: 'Pipe Tunes', author: 'Duncan Johnstone', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '063', - 'track-list': ['Guido Margiotta / Tony Lightfoot / Romany Jig', 'Farewell to Barra'], + scotsounId: '063', + trackList: ['Guido Margiotta / Tony Lightfoot / Romany Jig', 'Farewell to Barra'], }; export default cd; diff --git a/src/data/scotsoun/sscd065.ts b/src/data/scotsoun/sscd065.ts index eae56c6..e16fc1d 100644 --- a/src/data/scotsoun/sscd065.ts +++ b/src/data/scotsoun/sscd065.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Duncan in Dunfermline', - 'long-name': 'Duncan in Dunfermline', + longName: 'Duncan in Dunfermline', author: 'Duncan Johnstone', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '065', - 'track-list': ['MacIntosh’s Banner', 'Mr Alex MacLean of Lurebost / Delvinside / Dolina MacKay'], + scotsounId: '065', + trackList: ['MacIntosh’s Banner', 'Mr Alex MacLean of Lurebost / Delvinside / Dolina MacKay'], }; export default cd; diff --git a/src/data/scotsoun/sscd067.ts b/src/data/scotsoun/sscd067.ts index 99e7bc0..8fd94a0 100644 --- a/src/data/scotsoun/sscd067.ts +++ b/src/data/scotsoun/sscd067.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Burns Cottage Selection', subtitle: 'from the Works of Robert Burns', - 'long-name': 'Burns Cottage Selection – from the Works of Robert Burns', + longName: 'Burns Cottage Selection – from the Works of Robert Burns', author: 'Robert Burns', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '067', - 'track-list': ['Scots wha hae', 'Auld lang syne'], + scotsounId: '067', + trackList: ['Scots wha hae', 'Auld lang syne'], }; export default cd; diff --git a/src/data/scotsoun/sscd069.ts b/src/data/scotsoun/sscd069.ts index cf93ed4..15e6914 100644 --- a/src/data/scotsoun/sscd069.ts +++ b/src/data/scotsoun/sscd069.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Lang Syne in the East Neuk o Fife', subtitle: 'an Ither Pairts o the Kinrick', - 'long-name': 'Lang Syne in the East Neuk o Fife – an Ither Pairts o the Kinrick', + longName: 'Lang Syne in the East Neuk o Fife – an Ither Pairts o the Kinrick', author: 'Mary Kermack', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '069', - 'track-list': ['Generations of Change', 'End of Johnie Brand’s Prologue to Brand the Builder'], + scotsounId: '069', + trackList: ['Generations of Change', 'End of Johnie Brand’s Prologue to Brand the Builder'], }; export default cd; diff --git a/src/data/scotsoun/sscd070.ts b/src/data/scotsoun/sscd070.ts index d6e7953..b1a0d91 100644 --- a/src/data/scotsoun/sscd070.ts +++ b/src/data/scotsoun/sscd070.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Portions Waled frae the New Testament in Scots', - 'long-name': 'Portions Waled frae the New Testament in Scots', + longName: 'Portions Waled frae the New Testament in Scots', author: 'William Lorimer (tr.)', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '070', - 'track-list': [ + scotsounId: '070', + trackList: [ 'Revelation, 9:1-21, read by David Stephen', 'Revelation, 22:7-17, read by David Stephen', ], diff --git a/src/data/scotsoun/sscd071.ts b/src/data/scotsoun/sscd071.ts index 9e2c300..52a6bdc 100644 --- a/src/data/scotsoun/sscd071.ts +++ b/src/data/scotsoun/sscd071.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'A Sang’s a Sang for Aa That', - 'long-name': 'A Sang’s a Sang for Aa That', + longName: 'A Sang’s a Sang for Aa That', author: 'Andy Hunter', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '071', - 'track-list': ['Ye Heilan Chiels Andy Hunter', 'The Battle o Harlaw (Traditional)'], + scotsounId: '071', + trackList: ['Ye Heilan Chiels Andy Hunter', 'The Battle o Harlaw (Traditional)'], }; export default cd; diff --git a/src/data/scotsoun/sscd072.ts b/src/data/scotsoun/sscd072.ts index c1772e7..9f0246e 100644 --- a/src/data/scotsoun/sscd072.ts +++ b/src/data/scotsoun/sscd072.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: '"Poems in Scots & Gaelic"', subtitle: '"from ‘17 Poems for 6d’"', - 'long-name': '"Poems in Scots & Gaelic – from ‘17 Poems for 6d’"', + longName: '"Poems in Scots & Gaelic – from ‘17 Poems for 6d’"', author: 'Robert Garioch and Somhairle MacGill-Eain', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '072', - 'track-list': [ + scotsounId: '072', + trackList: [ 'Echo in Scots (from Dain do Eimhir iii: Turmoil)', 'A’Chorra-ghritheach', 'The Heron', diff --git a/src/data/scotsoun/sscd079.ts b/src/data/scotsoun/sscd079.ts index 0b463d8..caff6a8 100644 --- a/src/data/scotsoun/sscd079.ts +++ b/src/data/scotsoun/sscd079.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Langholm Memorial Sculpture', subtitle: '"& 21 local poems of Hugh MacDiarmaid"', - 'long-name': '"Langholm Memorial Sculpture & 21 local poems of Hugh MacDiarmaid"', + longName: '"Langholm Memorial Sculpture & 21 local poems of Hugh MacDiarmaid"', author: 'Hugh MacDiarmaid', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '079', - 'track-list': ['The Kernigal ', 'Kinsfolk '], + scotsounId: '079', + trackList: ['The Kernigal ', 'Kinsfolk '], }; export default cd; diff --git a/src/data/scotsoun/sscd080.ts b/src/data/scotsoun/sscd080.ts index d1bce8b..4d34f3a 100644 --- a/src/data/scotsoun/sscd080.ts +++ b/src/data/scotsoun/sscd080.ts @@ -1,12 +1,12 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Twa Leids – Dà Chànain', - 'long-name': 'Twa Leids – Dà Chànain', + longName: 'Twa Leids – Dà Chànain', author: 'various', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '080', + scotsounId: '080', }; export default cd; diff --git a/src/data/scotsoun/sscd081.ts b/src/data/scotsoun/sscd081.ts index ef99528..33fb451 100644 --- a/src/data/scotsoun/sscd081.ts +++ b/src/data/scotsoun/sscd081.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Eisd Ceòl', - 'long-name': 'Eisd Ceòl', + longName: 'Eisd Ceòl', author: 'Paul McCallum', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '081', - 'track-list': [ + scotsounId: '081', + trackList: [ 'Tuireadh nan Treun (Lament for the Heroes)', 'An Ataireachd Ard (The High Surge of the Sea)', ], diff --git a/src/data/scotsoun/sscd083.ts b/src/data/scotsoun/sscd083.ts index ebf5e06..d8d524f 100644 --- a/src/data/scotsoun/sscd083.ts +++ b/src/data/scotsoun/sscd083.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Merry Matanzie', subtitle: 'Alex McCrindle reads his own selection of 37 poems by William Soutar', - 'long-name': 'Merry Matanzie', + longName: 'Merry Matanzie', author: 'William Soutar', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '083', - 'track-list': [ + scotsounId: '083', + trackList: [ 'The Larky Lad', 'Pity', 'Ae Nicht at Amulree', diff --git a/src/data/scotsoun/sscd084.ts b/src/data/scotsoun/sscd084.ts index ee12d40..aa0d79b 100644 --- a/src/data/scotsoun/sscd084.ts +++ b/src/data/scotsoun/sscd084.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Gleg', subtitle: 'Learning Scots in song and story', - 'long-name': 'Gleg – Learning Scots in song and story', + longName: 'Gleg – Learning Scots in song and story', author: 'various', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '084', + scotsounId: '084', description: { sco: ` ‘Gleg’ wis wrocht ti gie bairns an innin til Scots in the wee schuils - the accompanyin @@ -20,7 +20,7 @@ const cd: Scotsoun = { If stock runs out, we’ll send it as a PDF file for free. `, }, - 'track-list': ['The Twins and the Muckle Moggie', 'The Six Travellers'], + trackList: ['The Twins and the Muckle Moggie', 'The Six Travellers'], }; export default cd; diff --git a/src/data/scotsoun/sscd087.ts b/src/data/scotsoun/sscd087.ts index 8f863e9..4980c64 100644 --- a/src/data/scotsoun/sscd087.ts +++ b/src/data/scotsoun/sscd087.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Virgil, Dante et al', subtitle: 'Scotsoun Euro-Makars Series', - 'long-name': 'Scotsoun Euro-Makars Series – Virgil, Dante et al', + longName: 'Scotsoun Euro-Makars Series – Virgil, Dante et al', author: 'various', - 'cd-count': 8, + cdCount: 8, price: '25.00', - 'scotsoun-id': '087', - 'track-list': [ + scotsounId: '087', + trackList: [ 'after Ode 9, Book 1', 'Ode 11, Book 1', 'Ode 11, Book 1', diff --git a/src/data/scotsoun/sscd089.ts b/src/data/scotsoun/sscd089.ts index 4fcbd45..5ca5a58 100644 --- a/src/data/scotsoun/sscd089.ts +++ b/src/data/scotsoun/sscd089.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'William Neil', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – William Neil', + longName: 'Scotsoun Makars Series – William Neil', author: 'William Neil', - 'cd-count': 8, + cdCount: 8, price: '18.00', - 'scotsoun-id': '089', - 'track-list': [ + scotsounId: '089', + trackList: [ 'Wild Hairst Making Tracks', 'Mr & Mrs Absentee Landlord Despatches Home', 'Fhir Tha ’D Sheasamh air mo Lic Despatches Home', diff --git a/src/data/scotsoun/sscd092.ts b/src/data/scotsoun/sscd092.ts index 012ac3b..c2924d5 100644 --- a/src/data/scotsoun/sscd092.ts +++ b/src/data/scotsoun/sscd092.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Into the White World', - 'long-name': 'Into the White World', + longName: 'Into the White World', author: 'Kenneth White', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '092', - 'track-list': [ + scotsounId: '092', + trackList: [ 'Report to Erigena', 'Morning walk', 'Chant', diff --git a/src/data/scotsoun/sscd094.ts b/src/data/scotsoun/sscd094.ts index 954d74d..3e3656e 100644 --- a/src/data/scotsoun/sscd094.ts +++ b/src/data/scotsoun/sscd094.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'The Richt Noise', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – The Richt Noise', + longName: 'Scotsoun Makars Series – The Richt Noise', author: 'Raymond Vettese', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '094', - 'track-list': [ + scotsounId: '094', + trackList: [ 'Gaudy Aumous', 'Scottish Names', 'Til Deid Een', diff --git a/src/data/scotsoun/sscd095.ts b/src/data/scotsoun/sscd095.ts index 48942ab..c6a6d9c 100644 --- a/src/data/scotsoun/sscd095.ts +++ b/src/data/scotsoun/sscd095.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Sangschaw and Penny Wheep', - 'long-name': 'Sangschaw and Penny Wheep', + longName: 'Sangschaw and Penny Wheep', author: 'Hugh MacDiarmaid', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '095', - 'track-list': [ + scotsounId: '095', + trackList: [ 'Wheelrig', 'Country Life', 'O Jesu Parvule', diff --git a/src/data/scotsoun/sscd099.ts b/src/data/scotsoun/sscd099.ts index 64aaac6..88468e3 100644 --- a/src/data/scotsoun/sscd099.ts +++ b/src/data/scotsoun/sscd099.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Douglas Young', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Douglas Young', + longName: 'Scotsoun Makars Series – Douglas Young', author: 'Douglas Young', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '099', - 'track-list': [ + scotsounId: '099', + trackList: [ 'Guestless Howff', 'Dain do Eimhir XLIII: Were ’t no for Ye', 'Dain do Eimhir LI: I the Connachan Time', diff --git a/src/data/scotsoun/sscd105.ts b/src/data/scotsoun/sscd105.ts index a80f81a..bc45e4d 100644 --- a/src/data/scotsoun/sscd105.ts +++ b/src/data/scotsoun/sscd105.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Sheena Blackhall', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Sheena Blackhall', + longName: 'Scotsoun Makars Series – Sheena Blackhall', author: 'Sheena Blackhall', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '105', - 'track-list': [ + scotsounId: '105', + trackList: [ 'Au Clair de la Lune', 'Hairst Heirskip', 'Autumn', diff --git a/src/data/scotsoun/sscd110.ts b/src/data/scotsoun/sscd110.ts index bdf6577..7f01ddb 100644 --- a/src/data/scotsoun/sscd110.ts +++ b/src/data/scotsoun/sscd110.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: '21 Poems in Scots', - 'long-name': '21 Poems in Scots', + longName: '21 Poems in Scots', author: 'Robert Louis Stevenson', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '110', - 'track-list': ['To Charles Baxter', 'To the Same', 'Athole Brose'], + scotsounId: '110', + trackList: ['To Charles Baxter', 'To the Same', 'Athole Brose'], }; export default cd; diff --git a/src/data/scotsoun/sscd111.ts b/src/data/scotsoun/sscd111.ts index 78c98da..6081fb5 100644 --- a/src/data/scotsoun/sscd111.ts +++ b/src/data/scotsoun/sscd111.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Brockit, the fermtoon cat', - 'long-name': 'Brockit, the fermtoon cat', + longName: 'Brockit, the fermtoon cat', author: 'Les Wheeler', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '111', - 'track-list': ['Brockit an The Berries', 'Brockit The Hero'], + scotsounId: '111', + trackList: ['Brockit an The Berries', 'Brockit The Hero'], description: { sco: ` Eleiven aventurs o Brockit, the fermtoon cat. Read bi George Philp, @@ -18,7 +18,7 @@ const cd: Scotsoun = { Sheena Blackhall, Alastair Taylor and Leslie Wheeler. `, }, - 'cover-artist': 'Rosemary Taylor', + coverArtist: 'Rosemary Taylor', }; export default cd; diff --git a/src/data/scotsoun/sscd112.ts b/src/data/scotsoun/sscd112.ts index a9507f4..3a116ad 100644 --- a/src/data/scotsoun/sscd112.ts +++ b/src/data/scotsoun/sscd112.ts @@ -1,12 +1,12 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'As a’ Bhìoball', subtitle: 'Readings from the Gaelic Bible with Psalm Singing', - 'long-name': 'As a’ Bhìoball – Readings from the Gaelic Bible with Psalm Singing', - 'cd-count': 2, + longName: 'As a’ Bhìoball – Readings from the Gaelic Bible with Psalm Singing', + cdCount: 2, price: '18.00', - 'scotsoun-id': '112', + scotsounId: '112', }; export default cd; diff --git a/src/data/scotsoun/sscd115.ts b/src/data/scotsoun/sscd115.ts index 5dd26f4..9853b75 100644 --- a/src/data/scotsoun/sscd115.ts +++ b/src/data/scotsoun/sscd115.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'The Preiching of the Swallow', subtitle: 'Searmonachadh a’ Ghòbhlain-Ghaoithe', - 'long-name': 'The Preiching of the Swallow – Searmonachadh a’ Ghòbhlain-Ghaoithe', + longName: 'The Preiching of the Swallow – Searmonachadh a’ Ghòbhlain-Ghaoithe', author: 'Robert Henryson', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '115', + scotsounId: '115', }; export default cd; diff --git a/src/data/scotsoun/sscd117.ts b/src/data/scotsoun/sscd117.ts index 70be6bd..4ccbe3f 100644 --- a/src/data/scotsoun/sscd117.ts +++ b/src/data/scotsoun/sscd117.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'A Child’s Garden of Verses', subtitle: 'read by children', - 'long-name': 'A Child’s Garden of Verses – read by children', + longName: 'A Child’s Garden of Verses – read by children', author: 'Robert Louis Stevenson', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '117', + scotsounId: '117', description: { sco: ` Recordit at Linlithgow Primary Schuil i Novemmer @@ -18,7 +18,7 @@ const cd: Scotsoun = { 1994 and released in Edinburgh on 3rd December 1994. `, }, - 'track-list': [ + trackList: [ 'My Shadow', 'System', 'A Good Boy', diff --git a/src/data/scotsoun/sscd118.ts b/src/data/scotsoun/sscd118.ts index 6107403..e6582c8 100644 --- a/src/data/scotsoun/sscd118.ts +++ b/src/data/scotsoun/sscd118.ts @@ -1,12 +1,12 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Lowland Souch', - 'long-name': 'Lowland Souch', + longName: 'Lowland Souch', author: 'Davie Robertson', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '118', + scotsounId: '118', description: { sco: ` This recordin haes been inspired bi the recent revival o the Scottish cauldwind or bellows pipes. @@ -26,7 +26,7 @@ const cd: Scotsoun = { Ward (small pipes and harmonium). `, }, - 'track-list': ['The Piper’s Cave and Aiken Drum', 'A Drinkin Man Robertson'], + trackList: ['The Piper’s Cave and Aiken Drum', 'A Drinkin Man Robertson'], }; export default cd; diff --git a/src/data/scotsoun/sscd120.ts b/src/data/scotsoun/sscd120.ts index ebc2136..ea49215 100644 --- a/src/data/scotsoun/sscd120.ts +++ b/src/data/scotsoun/sscd120.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Thrawn Janet', - 'long-name': 'Thrawn Janet', + longName: 'Thrawn Janet', author: 'Robert Louis Stevenson', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '120', - 'track-list': ['Scots Language Features', 'Literary Features'], + scotsounId: '120', + trackList: ['Scots Language Features', 'Literary Features'], }; export default cd; diff --git a/src/data/scotsoun/sscd121.ts b/src/data/scotsoun/sscd121.ts index 76d2a4c..10996a0 100644 --- a/src/data/scotsoun/sscd121.ts +++ b/src/data/scotsoun/sscd121.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Neil Munro', subtitle: '1863-1930', - 'long-name': 'Scotsoun Makars Series – George Campell Hay', + longName: 'Scotsoun Makars Series – George Campell Hay', author: 'Neil Munro', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '121', + scotsounId: '121', description: { sco: ` In Mey 1977, Renni McOwan arranged fur the Stirlin an Glesga memmers o the National Trust @@ -22,7 +22,7 @@ const cd: Scotsoun = { here captured as a poignant minding – but the talent of Neil Munro lives on. `, }, - 'track-list': ['Crodh Chailein sung', 'Extract from Fancy Farm'], + trackList: ['Crodh Chailein sung', 'Extract from Fancy Farm'], }; export default cd; diff --git a/src/data/scotsoun/sscd122.ts b/src/data/scotsoun/sscd122.ts index 2f38032..0a26a40 100644 --- a/src/data/scotsoun/sscd122.ts +++ b/src/data/scotsoun/sscd122.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'How to Pronounce Older Scots', - 'long-name': 'How to Pronounce Older Scots', + longName: 'How to Pronounce Older Scots', author: 'Prof AJ Aitken', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '122', - 'track-list': [ + scotsounId: '122', + trackList: [ 'From The Fable of the Fox, the Wolf and the Husbandman by Robert Henryson (in Poems edited by Denton Fox, OUP, 1981, pp. 89/90)', 'The Need for Preparation and Rehearsal', 'The Modern Standard English Model', diff --git a/src/data/scotsoun/sscd137-8.ts b/src/data/scotsoun/sscd137-8.ts index fc3da50..f6329f8 100644 --- a/src/data/scotsoun/sscd137-8.ts +++ b/src/data/scotsoun/sscd137-8.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'TS Law', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – TS Law', + longName: 'Scotsoun Makars Series – TS Law', author: 'TS Law', - 'cd-count': 4, + cdCount: 4, price: '28.00', - 'scotsoun-id': '137-8', - 'track-list': [ + scotsounId: '137-8', + trackList: [ 'Skinheads at Auschwitz, Easter 1996', 'Ban Polaris, Halleluia', 'Seam', diff --git a/src/data/scotsoun/sscd146.ts b/src/data/scotsoun/sscd146.ts index 900acb1..7083ea7 100644 --- a/src/data/scotsoun/sscd146.ts +++ b/src/data/scotsoun/sscd146.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'The Lost Pibroch', - 'long-name': 'The Lost Pibroch', + longName: 'The Lost Pibroch', author: 'William McCallum and P/M Donald MacLeod', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '146', - 'track-list': [ + scotsounId: '146', + trackList: [ 'Beloved Scotland (The Lost Pibroch)', 'Structure of the Pibroch: illustrated on the chanter by W McCallum', 'Introduction to Strathspeys', diff --git a/src/data/scotsoun/sscd147.ts b/src/data/scotsoun/sscd147.ts index 7e04c85..79421fb 100644 --- a/src/data/scotsoun/sscd147.ts +++ b/src/data/scotsoun/sscd147.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'George Campbell Hay', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – George Campell Hay', + longName: 'Scotsoun Makars Series – George Campell Hay', author: 'George Campbell Hay', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '147', - 'track-list': [ + scotsounId: '147', + trackList: [ 'Bisearta', 'Bizerta', 'An t-Oigear', diff --git a/src/data/scotsoun/sscd504.ts b/src/data/scotsoun/sscd504.ts index 89bad5a..9b35d1f 100644 --- a/src/data/scotsoun/sscd504.ts +++ b/src/data/scotsoun/sscd504.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'James Scott Skinner', subtitle: 'His Life and Achievement', - 'long-name': 'James Scott Skinner – His Life and Achievement', + longName: 'James Scott Skinner – His Life and Achievement', author: 'Hebbie Gray', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '504', + scotsounId: '504', description: { sco: ` A walin frae the fiddle compositions o James Scott Skinner, @@ -18,7 +18,7 @@ const cd: Scotsoun = { Skinner, played by Hebbie Gray with accompanying commentary. `, }, - 'track-list': [ + trackList: [ 'Mrs Scott Skinner – Bonny Banchory', 'Narrative continued', 'John MacFadyen o Melfort', diff --git a/src/data/scotsoun/sscd581.ts b/src/data/scotsoun/sscd581.ts index 9fc0c63..58a6e4c 100644 --- a/src/data/scotsoun/sscd581.ts +++ b/src/data/scotsoun/sscd581.ts @@ -1,12 +1,12 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Fiddle Heichlichts', - 'long-name': 'Fiddle Heichlichts', + longName: 'Fiddle Heichlichts', author: 'Karen Hannah, Yla Steven, Hugh MacGilp and Ian Powrie', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '518', + scotsounId: '518', description: { sco: ` Scotsoun haes on mony occasions uised fiddle muisic waein its recordins. Noo, fur the first diff --git a/src/data/scotsoun/sscd800.ts b/src/data/scotsoun/sscd800.ts index a017c3e..4a92eff 100644 --- a/src/data/scotsoun/sscd800.ts +++ b/src/data/scotsoun/sscd800.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Nan Chnochan Uain’ Ile', - 'long-name': 'Nan Chnochan Uain’ Ile', + longName: 'Nan Chnochan Uain’ Ile', author: 'Ian Carmichael', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '800', - 'track-list': ['Mo Run Geal Dileas', 'Nan Chnochan Uain Ile'], + scotsounId: '800', + trackList: ['Mo Run Geal Dileas', 'Nan Chnochan Uain Ile'], }; export default cd; diff --git a/src/data/scotsoun/sscd801.ts b/src/data/scotsoun/sscd801.ts index ffc68f6..97b5109 100644 --- a/src/data/scotsoun/sscd801.ts +++ b/src/data/scotsoun/sscd801.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Violet Jacob', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Violet Jacob', + longName: 'Scotsoun Makars Series – Violet Jacob', author: 'Violet Jacob', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '801', - 'track-list': [ + scotsounId: '801', + trackList: [ 'The Rowan', 'The Tramp to the Tattie-doolie', 'The Lost Licht – A Perthshire Legend', diff --git a/src/data/scotsoun/sscd802.ts b/src/data/scotsoun/sscd802.ts index 4c53305..f5f011a 100644 --- a/src/data/scotsoun/sscd802.ts +++ b/src/data/scotsoun/sscd802.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Three Doric Tales', - 'long-name': 'Three Doric Tales', + longName: 'Three Doric Tales', author: 'Stephen Pacitti', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '802', - 'track-list': ['Glaikit Andra', 'The Tattiebogle'], + scotsounId: '802', + trackList: ['Glaikit Andra', 'The Tattiebogle'], }; export default cd; diff --git a/src/data/scotsoun/sscd803.ts b/src/data/scotsoun/sscd803.ts index 0d18ea2..257b554 100644 --- a/src/data/scotsoun/sscd803.ts +++ b/src/data/scotsoun/sscd803.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Marion Angus', subtitle: 'Scotsoun Makars Series', - 'long-name': 'Scotsoun Makars Series – Marion Angus', + longName: 'Scotsoun Makars Series – Marion Angus', author: 'Marion Angus', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '803', - 'track-list': [ + scotsounId: '803', + trackList: [ 'The Wee Sma Glen', 'Hogmany', 'Barbara', diff --git a/src/data/scotsoun/sscd804.ts b/src/data/scotsoun/sscd804.ts index 4dfb4d8..708b624 100644 --- a/src/data/scotsoun/sscd804.ts +++ b/src/data/scotsoun/sscd804.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Whaleback City', subtitle: 'The Poetry of Dundee and Its Hinterland', - 'long-name': 'Whaleback City – The Poetry of Dundee and Its Hinterland', + longName: 'Whaleback City – The Poetry of Dundee and Its Hinterland', author: 'various', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '804', - 'track-list': [ + scotsounId: '804', + trackList: [ 'Dundee Day Tripper', 'Excerpt from ‘The Wallace’', 'Textile Toun', diff --git a/src/data/scotsoun/sscd805.ts b/src/data/scotsoun/sscd805.ts index 7494766..3b1a999 100644 --- a/src/data/scotsoun/sscd805.ts +++ b/src/data/scotsoun/sscd805.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Oot o the Kist', - 'long-name': 'Oot o the Kist', + longName: 'Oot o the Kist', author: 'Sheena Blackhall', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '805', - 'track-list': [ + scotsounId: '805', + trackList: [ 'Corn Dolly: Stagwyse', 'Corachree', 'A Gweed New Year: Cyard’s Kist', diff --git a/src/data/scotsoun/sscd806.ts b/src/data/scotsoun/sscd806.ts index 106803d..a8d7065 100644 --- a/src/data/scotsoun/sscd806.ts +++ b/src/data/scotsoun/sscd806.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'The Heichts o Macchu Picchu', subtitle: 'frae an owersettin by John Law', - 'long-name': 'The Heichts o Macchu Picchu – frae an owersettin by John Law', + longName: 'The Heichts o Macchu Picchu – frae an owersettin by John Law', author: 'John Law', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '806', - 'track-list': ['Hallaig', '‘The Corrie’ Sailin'], + scotsounId: '806', + trackList: ['Hallaig', '‘The Corrie’ Sailin'], description: { sco: ` Wi an innin by Dr Angela Howkins an featuring readins diff --git a/src/data/scotsoun/sscd807.ts b/src/data/scotsoun/sscd807.ts index 1859b24..8ae14db 100644 --- a/src/data/scotsoun/sscd807.ts +++ b/src/data/scotsoun/sscd807.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'The Lass o Gowrie', - 'long-name': 'The Lass o Gowrie', + longName: 'The Lass o Gowrie', author: 'Margaret Gillies Brown', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '807', - 'track-list': [ + scotsounId: '807', + trackList: [ 'Northern Midsummer', 'Stray Hen', 'Loss', diff --git a/src/data/scotsoun/sscd808.ts b/src/data/scotsoun/sscd808.ts index 179713c..3998786 100644 --- a/src/data/scotsoun/sscd808.ts +++ b/src/data/scotsoun/sscd808.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Scots Leid in Europe', - 'long-name': 'Scots Leid in Europe', + longName: 'Scots Leid in Europe', author: 'Tam Hubbard, Kate Armstrong, Frances Robson, Lisa Simmons and George T Watt', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '808', - 'track-list': [ + scotsounId: '808', + trackList: [ 'Glaomin', 'Charles I', 'The Wabster o Silesia', diff --git a/src/data/scotsoun/sscd809.ts b/src/data/scotsoun/sscd809.ts index d0708ca..b0ae3bc 100644 --- a/src/data/scotsoun/sscd809.ts +++ b/src/data/scotsoun/sscd809.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Ravines', subtitle: 'a richer tocher', - 'long-name': 'Ravines – A Richer Tocher', + longName: 'Ravines – A Richer Tocher', author: 'Sheila Templeton', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '809', - 'track-list': [ + scotsounId: '809', + trackList: [ 'Mixin Mustard', 'Grunnie', 'Screivin a Great Grunnie', diff --git a/src/data/scotsoun/sscd810.ts b/src/data/scotsoun/sscd810.ts index 9d31e57..c91eba3 100644 --- a/src/data/scotsoun/sscd810.ts +++ b/src/data/scotsoun/sscd810.ts @@ -1,12 +1,12 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Doric and Doric – German ti Doric', - 'long-name': 'Doric and Doric – German ti Doric', + longName: 'Doric and Doric – German ti Doric', author: 'Mary Johnston', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '810', + scotsounId: '810', description: { sco: ` Scotsoun wad fain say their thanks til Doug Ring that made the oreiginal recordins, an til @@ -17,7 +17,7 @@ const cd: Scotsoun = { Malcolm Macgregor of MacTrak Duplicating who pressed the original CDs. `, }, - 'track-list': [ + trackList: [ 'First Grandchild', 'Lullaby', 'Born ti dance', diff --git a/src/data/scotsoun/sscd811.ts b/src/data/scotsoun/sscd811.ts index 51817d1..8a69810 100644 --- a/src/data/scotsoun/sscd811.ts +++ b/src/data/scotsoun/sscd811.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Stuart A Paterson', subtitle: 'mind noo has some swearie wurds!', - 'long-name': 'Stuart A Paterson', + longName: 'Stuart A Paterson', author: 'Stuart A Paterson', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '811', - 'track-list': [ + scotsounId: '811', + trackList: [ 'Craw', 'Blate', 'Aye', diff --git a/src/data/scotsoun/sscd812.ts b/src/data/scotsoun/sscd812.ts index 39d8a1b..67e65ac 100644 --- a/src/data/scotsoun/sscd812.ts +++ b/src/data/scotsoun/sscd812.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Ravines', subtitle: 'Poems and Songs', - 'long-name': 'Ravines – Poems and Songs', + longName: 'Ravines – Poems and Songs', author: 'David Purdie', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '812', - 'track-list': [ + scotsounId: '812', + trackList: [ 'Leddy Stair’s Closse', 'Ode til Lord Monboddo', 'Lowdie’s Sang', diff --git a/src/data/scotsoun/sscd813.ts b/src/data/scotsoun/sscd813.ts index d878546..bd465f2 100644 --- a/src/data/scotsoun/sscd813.ts +++ b/src/data/scotsoun/sscd813.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Mither Ape', - 'long-name': 'Mither Ape', + longName: 'Mither Ape', author: 'Tam Hubbard', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '813', - 'track-list': ['Pepper-Rammy', 'The Labster Quadrille'], + scotsounId: '813', + trackList: ['Pepper-Rammy', 'The Labster Quadrille'], }; export default cd; diff --git a/src/data/scotsoun/sscd814.ts b/src/data/scotsoun/sscd814.ts index 8ac2b44..895ae12 100644 --- a/src/data/scotsoun/sscd814.ts +++ b/src/data/scotsoun/sscd814.ts @@ -1,14 +1,14 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Auld Leids, New Vyces', - 'long-name': 'Auld Leids, New Vyces', + longName: 'Auld Leids, New Vyces', author: 'Fran Baillie, Karen Hannah, Dorothy Lawrenson, John Quinn, Marcas Mac an Tuairneir and George T Watt', - 'cd-count': 1, + cdCount: 1, price: '11.00', - 'scotsoun-id': '814', - 'track-list': [ + scotsounId: '814', + trackList: [ 'Uisge', 'Teine', 'Àile', diff --git a/src/data/scotsoun/sscd815.ts b/src/data/scotsoun/sscd815.ts index 0605fa6..0dd5fd0 100644 --- a/src/data/scotsoun/sscd815.ts +++ b/src/data/scotsoun/sscd815.ts @@ -1,15 +1,15 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Peewits', - 'long-name': 'Peewits', + longName: 'Peewits', author: 'The Bowhill Players', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '815', - 'cover-artist': 'Mary an David Hershaw', - 'release-date': '2020-06-24', - 'track-list': ['Daft Laddie in the Wuids', 'Daftboy Suite (Instrumental)'], + scotsounId: '815', + coverArtist: 'Mary an David Hershaw', + releaseDate: '2020-06-24', + trackList: ['Daft Laddie in the Wuids', 'Daftboy Suite (Instrumental)'], description: { 'en-GB': ` Music inspired by the Scots poem _The Daft Boy – for John Hershaw: 11th Februar, 1941_ by Willie Hershaw, published by Neepheid Publications, 2019. diff --git a/src/data/scotsoun/sscd816.ts b/src/data/scotsoun/sscd816.ts index c0eb3e7..c29d189 100644 --- a/src/data/scotsoun/sscd816.ts +++ b/src/data/scotsoun/sscd816.ts @@ -1,13 +1,13 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Michael', subtitle: 'A Ballad Play in Scots', - 'long-name': '"Michael: A Ballad Play in Scots"', + longName: '"Michael: A Ballad Play in Scots"', author: 'William Hershaw', - 'cd-count': 2, + cdCount: 2, price: '18.00', - 'scotsoun-id': '816', + scotsounId: '816', description: { 'en-GB': ` _Michael: A Ballad Play in Scots_ by William Hershaw is based on the character of Michael Scot of Balwearie, the 12th-century philosopher, translator, polymath, alchemist and reputed wizard. Hershaw has combined the historical and folk myth aspects of the Michael Scot legend to create a gripping portrayal of a troubled soul who attempts to destroy the universe in order to prove the existence of God.<br> diff --git a/src/data/scotsoun/sscdM150.ts b/src/data/scotsoun/sscdM150.ts index a6a194c..b7faf4c 100644 --- a/src/data/scotsoun/sscdM150.ts +++ b/src/data/scotsoun/sscdM150.ts @@ -1,12 +1,12 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'Minnie', - 'long-name': 'Minnie', + longName: 'Minnie', author: 'Sheena Blackhall', - 'cd-count': 3, + cdCount: 3, price: '25.00', - 'scotsoun-id': 'M150', + scotsounId: 'M150', }; export default cd; diff --git a/src/data/scotsoun/sscdU1.ts b/src/data/scotsoun/sscdU1.ts index f930fa4..d1b6dcd 100644 --- a/src/data/scotsoun/sscdU1.ts +++ b/src/data/scotsoun/sscdU1.ts @@ -1,17 +1,17 @@ -import type Scotsoun from '../../types/Scotsoun'; +import type Scotsoun from '$types/Scotsoun'; const cd: Scotsoun = { title: 'An Ulster Triptych', - 'long-name': 'An Ulster Triptych', + longName: 'An Ulster Triptych', author: 'George T Watt', - 'cd-count': 1, + cdCount: 1, price: '6.00', - 'scotsoun-id': 'U1', + scotsounId: 'U1', description: { sco: 'As featured on BBC Radio Ulster’s ‘A Kist o Words’.', 'en-GB': 'As featured on BBC Radio Ulster’s ‘A Kist o Words’.', }, - 'track-list': ['Winter 1778-79', 'Post script'], + trackList: ['Winter 1778-79', 'Post script'], }; export default cd; diff --git a/src/i18n/locales.ts b/src/i18n/locales.ts index 306810c..e2c2582 100644 --- a/src/i18n/locales.ts +++ b/src/i18n/locales.ts @@ -1,4 +1,4 @@ -import type Locale from '../types/Locale'; +import type Locale from '$types/Locale'; // Use the magic of TypeScript to guarantee completeness const localesHash: { [key in Locale]: 1 } = { diff --git a/src/i18n/translate.ts b/src/i18n/translate.ts index b911547..a9415b2 100644 --- a/src/i18n/translate.ts +++ b/src/i18n/translate.ts @@ -1,5 +1,5 @@ -import type Locale from '../types/Locale'; -import type { TranslationsDictionary, Translation } from '../types/TranslationsDictionary'; +import type Locale from '$types/Locale'; +import type { TranslationsDictionary, Translation } from '$types/TranslationsDictionary'; import { defaultLocale } from './locales'; type TranslationsDictionaryWith<Key extends string, Params> = TranslationsDictionary<{ diff --git a/src/i18n/translations/components/breadcrumbs.ts b/src/i18n/translations/components/breadcrumbs.ts index a0af6f9..3db3f2f 100644 --- a/src/i18n/translations/components/breadcrumbs.ts +++ b/src/i18n/translations/components/breadcrumbs.ts @@ -1,4 +1,6 @@ -import type { TranslationsDictionary } from '../../../types/TranslationsDictionary'; +import { getLallansIssue } from '$data/lallans'; +import { getScotsoun } from '$data/scotsoun'; +import type { TranslationsDictionary } from '$types/TranslationsDictionary'; // This maun be kept up til date bi haund. There is // nae compile-time check that aw routes hae been @@ -16,6 +18,24 @@ const breadcrumbsTranslations = { sco: () => 'Lallans', 'en-GB': () => 'Lallans', }, + ...Object.fromEntries( + Object.keys(getLallansIssue).map((lallansIssueNumber) => [ + `/furthsettins/lallans/${lallansIssueNumber}/`, + { + sco: () => `Lallans ${lallansIssueNumber}`, + 'en-GB': () => `Lallans ${lallansIssueNumber}`, + }, + ]) + ), + ...Object.fromEntries( + Object.keys(getScotsoun).map((scotsounId) => [ + `/furthsettins/scotsoun/${scotsounId}/`, + { + sco: () => `Scotsoun ${scotsounId}`, + 'en-GB': () => `Scotsoun ${scotsounId}`, + }, + ]) + ), }; type Raw = typeof breadcrumbsTranslations; diff --git a/src/i18n/translations/components/languageLinks.ts b/src/i18n/translations/components/languageLinks.ts index d3db24a..2a18448 100644 --- a/src/i18n/translations/components/languageLinks.ts +++ b/src/i18n/translations/components/languageLinks.ts @@ -1,4 +1,4 @@ -import type { TranslationsDictionary } from '../../../types/TranslationsDictionary'; +import type { TranslationsDictionary } from '$types/TranslationsDictionary'; const languageLinksTranslations = { 'language-link-text': { diff --git a/src/i18n/translations/pages/furthsettins.ts b/src/i18n/translations/pages/furthsettins.ts index 4b87311..4e5fc81 100644 --- a/src/i18n/translations/pages/furthsettins.ts +++ b/src/i18n/translations/pages/furthsettins.ts @@ -1,4 +1,4 @@ -import type { TranslationsDictionary } from '../../../types/TranslationsDictionary'; +import type { TranslationsDictionary } from '$types/TranslationsDictionary'; const furthsettinsTranslations = { title: { diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts index dda30b8..70765d2 100644 --- a/src/i18n/translations/pages/home.ts +++ b/src/i18n/translations/pages/home.ts @@ -1,4 +1,4 @@ -import type { TranslationsDictionary } from '../../../types/TranslationsDictionary'; +import type { TranslationsDictionary } from '$types/TranslationsDictionary'; const homeTranslations = { title: { diff --git a/src/i18n/translations/pages/lallansIssuePaymentSuccessConfirmation.ts b/src/i18n/translations/pages/lallansIssuePaymentSuccessConfirmation.ts index c47ce0f..9520366 100644 --- a/src/i18n/translations/pages/lallansIssuePaymentSuccessConfirmation.ts +++ b/src/i18n/translations/pages/lallansIssuePaymentSuccessConfirmation.ts @@ -1,4 +1,4 @@ -import type { TranslationsDictionary } from '../../../types/TranslationsDictionary'; +import type { TranslationsDictionary } from '$types/TranslationsDictionary'; const lallansIssuePaymentSuccessConfirmation = { title: { diff --git a/src/i18n/translations/site.ts b/src/i18n/translations/site.ts index 25598f1..6c16f8f 100644 --- a/src/i18n/translations/site.ts +++ b/src/i18n/translations/site.ts @@ -1,5 +1,8 @@ -import type Locale from '../../types/Locale'; -import type { TranslationsDictionary } from '../../types/TranslationsDictionary'; +import type Date from '$types/Date'; +import type Month from '$types/Month'; +import type Locale from '$types/Locale'; +import type { TranslationsDictionary } from '$types/TranslationsDictionary'; +import locales from '../locales'; const siteTranslations = { title: { @@ -14,6 +17,10 @@ const siteTranslations = { sco: () => 'Lallans', 'en-GB': () => 'Lallans', }, + scotsoun: { + sco: () => 'Scotsoun', + 'en-GB': () => 'Scotsoun', + }, 'scots-leid-associe': { sco: () => 'Scots Leid Associe', 'en-GB': () => 'Scots Language Society', @@ -40,6 +47,128 @@ const siteTranslations = { } }, }, + 'long-date': Object.fromEntries( + locales.map((locale) => { + return [ + locale, + ({ date }: { date: Date }) => ` + ${siteTranslations['ordinal'][locale]({ n: date.slice(8) })} + ${siteTranslations['month'][locale]({ month: date.slice(5, 7) as Month })} + ${date.slice(0, 4)} + `, + ]; + }) + ), + ordinal: { + sco: ({ n }: { n: string }) => { + const m = n.replace(/^0+/, ''); + switch (m.at(-1)) { + case '1': + // Exception for numbers ending in eleven + if (m.length > 1 && m.at(-2) === '1') { + return `${m}t`; + } + return `${m}st`; + case '2': + // Exception for numbers ending in twelve + if (m.length > 1 && m.at(-2) === '1') { + return `${m}t`; + } + return `${m}nt`; + case '3': + // Exception for numbers ending in thirteen + if (m.length > 1 && m.at(-2) === '1') { + return `${m}t`; + } + return `${m}rd`; + default: + return `${m}t`; + } + }, + 'en-GB': ({ n }: { n: string }) => { + const m = n.replace(/^0+/, ''); + switch (m.at(-1)) { + case '1': + // Exception for numbers ending in eleven + if (m.length > 1 && m.at(-2) === '1') { + return `${m}th`; + } + return `${m}st`; + case '2': + // Exception for numbers ending in twelve + if (m.length > 1 && m.at(-2) === '1') { + return `${m}th`; + } + return `${m}nd`; + case '3': + // Exception for numbers ending in thirteen + if (m.length > 1 && m.at(-2) === '1') { + return `${m}th`; + } + return `${m}rd`; + default: + return `${m}th`; + } + }, + }, + month: { + sco: ({ month }: { month: Month }) => { + switch (month) { + case '01': + return 'Januar'; + case '02': + return 'Februar'; + case '03': + return 'Mairch'; + case '04': + return 'April'; + case '05': + return 'Mey'; + case '06': + return 'June'; + case '07': + return 'July'; + case '08': + return 'August'; + case '09': + return 'Septemmer'; + case '10': + return 'October'; + case '11': + return 'Novemmer'; + case '12': + return 'Decemmer'; + } + }, + 'en-GB': ({ month }: { month: Month }) => { + switch (month) { + case '01': + return 'January'; + case '02': + return 'February'; + case '03': + return 'March'; + case '04': + return 'April'; + case '05': + return 'May'; + case '06': + return 'June'; + case '07': + return 'July'; + case '08': + return 'August'; + case '09': + return 'September'; + case '10': + return 'October'; + case '11': + return 'November'; + case '12': + return 'December'; + } + }, + }, }; type Raw = typeof siteTranslations; diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index f63b0ad..9bca7e1 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,9 +1,9 @@ --- -import Footer from '../components/Footer.astro'; -import Navbar from '../components/Navbar.astro'; -import translate from '../i18n/translate'; -import site from '../i18n/translations/site'; -import type Locale from '../types/Locale'; +import Footer from '$components/Footer.astro'; +import Navbar from '$components/Navbar.astro'; +import translate from '$i18n/translate'; +import site from '$i18n/translations/site'; +import type Locale from '$types/Locale'; interface Props { locale: Locale; diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro index 3ef0a58..8e8b5a9 100644 --- a/src/layouts/Page.astro +++ b/src/layouts/Page.astro @@ -1,5 +1,5 @@ --- -import type Locale from '../types/Locale'; +import type Locale from '$types/Locale'; import Layout from './Layout.astro'; interface Props { @@ -10,7 +10,7 @@ interface Props { const { locale, title } = Astro.props; --- -<Layout locale={locale} title={title} > +<Layout locale={locale} title={title}> <main id="main"> <slot /> </main> diff --git a/src/lib/localeStaticPaths.ts b/src/lib/localeStaticPaths.ts index b75065d..433f5dd 100644 --- a/src/lib/localeStaticPaths.ts +++ b/src/lib/localeStaticPaths.ts @@ -1,4 +1,4 @@ -import type Locale from '../types/Locale'; +import type Locale from '$types/Locale'; // Defines what values to insert into the [locale] URL path parameter // when generating a static site diff --git a/src/pages/[locale]/furthsettins/index.astro b/src/pages/[locale]/furthsettins/index.astro index 256111f..11e39f1 100644 --- a/src/pages/[locale]/furthsettins/index.astro +++ b/src/pages/[locale]/furthsettins/index.astro @@ -1,10 +1,10 @@ --- -import Page from '../../../layouts/Page.astro'; -import localeStaticPaths from '../../../lib/localeStaticPaths'; -import translate from '../../../i18n/translate'; -import tFurthsettins from '../../../i18n/translations/pages/furthsettins'; -import tSite from '../../../i18n/translations/site'; -import type Locale from '../../../types/Locale'; +import Page from '$layouts/Page.astro'; +import localeStaticPaths from '$lib/localeStaticPaths'; +import translate from '$i18n/translate'; +import tFurthsettins from '$i18n/translations/pages/furthsettins'; +import tSite from '$i18n/translations/site'; +import type Locale from '$types/Locale'; export async function getStaticPaths() { return localeStaticPaths; diff --git a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/index.astro b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/index.astro index 876eab1..25da7e6 100644 --- a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/index.astro +++ b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/index.astro @@ -1,12 +1,12 @@ --- -import Page from '../../../../../layouts/Page.astro'; -import localeStaticPaths from '../../../../../lib/localeStaticPaths'; -import translate from '../../../../../i18n/translate'; -import tFurthsettins from '../../../../../i18n/translations/pages/furthsettins'; -import type Locale from '../../../../../types/Locale'; -import { getLallansIssue } from '../../../../../data/lallans'; -import type LallansIssueNumber from '../../../../../types/LallansIssueNumber'; -import LallansIssue from '../../../../../components/LallansIssue.astro'; +import Page from '$layouts/Page.astro'; +import localeStaticPaths from '$lib/localeStaticPaths'; +import translate from '$i18n/translate'; +import tFurthsettins from '$i18n/translations/pages/furthsettins'; +import type Locale from '$types/Locale'; +import { getLallansIssue } from '$data/lallans'; +import type LallansIssueNumber from '$types/LallansIssueNumber'; +import LallansIssue from '$components/LallansIssue.astro'; export async function getStaticPaths() { const lallansIssueNumbers = Object.keys(getLallansIssue) as `${LallansIssueNumber}`[]; 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 bd3ad87..72f07fc 100644 --- a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro +++ b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro @@ -1,11 +1,11 @@ --- -import Page from '../../../../../layouts/Page.astro'; -import localeStaticPaths from '../../../../../lib/localeStaticPaths'; -import translate from '../../../../../i18n/translate'; -import tPage from '../../../../../i18n/translations/pages/lallansIssuePaymentSuccessConfirmation'; -import type Locale from '../../../../../types/Locale'; -import { getLallansIssue } from '../../../../../data/lallans'; -import type LallansIssueNumber from '../../../../../types/LallansIssueNumber'; +import Page from '$layouts/Page.astro'; +import localeStaticPaths from '$lib/localeStaticPaths'; +import translate from '$i18n/translate'; +import tPage from '$i18n/translations/pages/lallansIssuePaymentSuccessConfirmation'; +import type Locale from '$types/Locale'; +import { getLallansIssue } from '$data/lallans'; +import type LallansIssueNumber from '$types/LallansIssueNumber'; export async function getStaticPaths() { const lallansIssueNumbers = Object.keys(getLallansIssue) as `${LallansIssueNumber}`[]; diff --git a/src/pages/[locale]/furthsettins/lallans/index.astro b/src/pages/[locale]/furthsettins/lallans/index.astro index f4cd94b..dffe141 100644 --- a/src/pages/[locale]/furthsettins/lallans/index.astro +++ b/src/pages/[locale]/furthsettins/lallans/index.astro @@ -1,10 +1,10 @@ --- -import Page from '../../../../layouts/Page.astro'; -import localeStaticPaths from '../..//../../lib/localeStaticPaths'; -import translate from '../../../../i18n/translate'; -import tFurthsettins from '../../../../i18n/translations/pages/furthsettins'; -import type Locale from '../../../../types/Locale'; -import LallansIssuesGallery from '../../../../components/LallansIssuesGallery.astro'; +import Page from '$layouts/Page.astro'; +import localeStaticPaths from '$lib/localeStaticPaths'; +import translate from '$i18n/translate'; +import tFurthsettins from '$i18n/translations/pages/furthsettins'; +import type Locale from '$types/Locale'; +import LallansIssuesGallery from '$components/LallansIssuesGallery.astro'; export async function getStaticPaths() { return localeStaticPaths; diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro index 8ae3a7b..b065e50 100644 --- a/src/pages/[locale]/index.astro +++ b/src/pages/[locale]/index.astro @@ -1,10 +1,10 @@ --- -import Page from '../../layouts/Page.astro'; -import localeStaticPaths from '../../lib/localeStaticPaths'; -import translate from '../../i18n/translate'; -import site from '../../i18n/translations/site'; -import home from '../../i18n/translations/pages/home'; -import type Locale from '../../types/Locale'; +import Page from '$layouts/Page.astro'; +import localeStaticPaths from '$lib/localeStaticPaths'; +import translate from '$i18n/translate'; +import site from '$i18n/translations/site'; +import home from '$i18n/translations/pages/home'; +import type Locale from '$types/Locale'; export async function getStaticPaths() { return localeStaticPaths; diff --git a/src/types/Scotsoun.d.ts b/src/types/Scotsoun.d.ts index 7ef2f50..64b0ab1 100644 --- a/src/types/Scotsoun.d.ts +++ b/src/types/Scotsoun.d.ts @@ -1,4 +1,4 @@ -import type { defaultLocale } from '../i18n/locales'; +import type { defaultLocale } from '$i18n/locales'; import type Date from './Date'; import type Locale from './Locale'; import type Price from './Price'; @@ -6,15 +6,15 @@ import type Price from './Price'; type Scotsoun = { title: string; subtitle?: string; - 'long-name': string; + longName: string; author?: string; - 'cd-count': number; + cdCount: number; price: Price; - 'scotsoun-id': string; + scotsounId: string; description?: { [key in Locale]?: string } & { [key in typeof defaultLocale]: string }; - 'cover-artist'?: string; - 'track-list'?: string[]; - 'release-date'?: Date; + coverArtist?: string; + trackList?: string[]; + releaseDate?: Date; }; export default Scotsoun; diff --git a/src/types/TranslationsDictionary.d.ts b/src/types/TranslationsDictionary.d.ts index d62947c..d9d7e44 100644 --- a/src/types/TranslationsDictionary.d.ts +++ b/src/types/TranslationsDictionary.d.ts @@ -1,4 +1,4 @@ -import type { defaultLocale } from '../i18n/locales'; +import type { defaultLocale } from '$i18n/locales'; import type Locale from './Locale'; export type Translation<Params> = (params: { [key in keyof Params]: string }) => string; |