v2: initial commit #22

Merged
b12f merged 17 commits from v2 into main 2024-04-12 19:11:46 +00:00
3 changed files with 6 additions and 6 deletions
Showing only changes of commit 4e80a7e6de - Show all commits

View file

@ -43,13 +43,13 @@ const getStartAndEnd = (date) => {
}
};
export default ({ data, lang, className = '', }) => {
export default ({ data, language, className = '', }) => {
const strings = data.strings;
const dates = data.dates;
const t = (o) => o?.[lang] || '';
const t = (o) => o?.[language.slug] || '';
return <section
id={`dates-list-${lang}`}
id={`dates-list-${language.slug}`}
className={`ps-hakken-dates ${className}`}
>
<h3>{t(strings.comingDates)}</h3>

View file

@ -1,4 +1,4 @@
export default ({ otherLang, baseURL }) => <a
href={otherLang.urlPrefix ? `/${otherLang.urlPrefix }${baseURL}` : baseURL}
class="ps-homelink ps-homelink_lang"
className="ps-homelink ps-homelink_lang"
>{otherLang.slug}</a>

View file

@ -45,8 +45,8 @@ export default ({
<main className="ps-main--page ps-page">
<div className="ps-page--contents">
<section dangerouslySetInnerHTML={{ __html: md(content) }}></section>
{showServices ? <Services lang="en" language={language} data={services} /> : null}
{showHakkenDates ? <HakkenDates lang="en" data={hakken} /> : null}
{showServices ? <Services language={language} data={services} /> : null}
{showHakkenDates ? <HakkenDates language={language} data={hakken} /> : null}
</div>
</main>