diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 0f78840..bc9d856 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -31,7 +31,7 @@ const { locale, dict: t } = Astro.props;

{VENUE.name}

-

{locale === 'en' ? '12 Vifleemska St, Kyiv' : 'вул. Вифлеємська, 12, Київ'}

+

{t.about.venueAddress}

{VENUE.email}

diff --git a/src/lib/dictionaries/en.ts b/src/lib/dictionaries/en.ts index 6ef13b7..56b8d3d 100644 --- a/src/lib/dictionaries/en.ts +++ b/src/lib/dictionaries/en.ts @@ -102,6 +102,8 @@ export const en: Dict = { storyTitle: 'Our story', story: 'Devodytyji began as an ordinary yard where neighbors gathered. Over time it became an open cultural venue: music, movies under the stars, talks, fairs and workshops. We believe culture lives best in the open air — among people, under the open sky.', + venueAddress: 'Vodotyi, Zhytomyr Oblast', + venueAddressLong: 'Vodotyi, Zhytomyr Oblast, 12624', venueReviewsTitle: 'Venue reviews', venueReviewCount: 'reviews', writeVenueReview: 'Leave a review about the venue', diff --git a/src/lib/dictionaries/ua.ts b/src/lib/dictionaries/ua.ts index 3d18b8f..3f3da7c 100644 --- a/src/lib/dictionaries/ua.ts +++ b/src/lib/dictionaries/ua.ts @@ -100,11 +100,13 @@ export const ua = { storyTitle: 'Наша історія', story: 'Devodytyji починався як звичайний двір, де збиралися сусіди. З часом він перетворився на відкритий культурний майданчик: тут грають музику, показують кіно під зорями, проводять лекції, ярмарки та майстер-класи. Ми віримо, що культура найкраще живе просто неба — під відкритим небом, у колі людей.', + venueAddress: 'Водотиї, Житомирська область', + venueAddressLong: 'село Водотиї, Житомирська область, 12624', venueReviewsTitle: 'Відгуки про майданчик', venueReviewCount: 'відгуків', writeVenueReview: 'Залишити відгук про майданчик', noVenueReviews: 'Відгуків поки немає. Будьте першим!', - contactsTitle: 'Контакти', + contactsTitle: 'Контакти' }, contacts: { pageTitle: 'Контакти', diff --git a/src/lib/venue.ts b/src/lib/venue.ts index d27df79..ab429a6 100644 --- a/src/lib/venue.ts +++ b/src/lib/venue.ts @@ -1,5 +1,3 @@ -import type { Locale } from './i18n'; - export interface VenueInfo { name: string; lat: number; @@ -11,13 +9,9 @@ export interface VenueInfo { export const VENUE: VenueInfo = { name: 'Devodytyji', - lat: 50.4584, - lng: 30.5199, - phone: '+380 44 000 00 00', + lat: 50.2384827, + lng: 29.439712, + phone: '+380 95 392 82 36', email: 'hello@devodytyji.example', hours: '10:00 – 23:00', }; - -export function venueAddress(locale: Locale): string { - return locale === 'en' ? '12 Vifleemska St, Kyiv, Ukraine' : 'вул. Вифлеємська, 12, Київ, Україна'; -} diff --git a/src/pages/[lang]/about.astro b/src/pages/[lang]/about.astro index c3ebde3..597c4b4 100644 --- a/src/pages/[lang]/about.astro +++ b/src/pages/[lang]/about.astro @@ -40,7 +40,7 @@ const canDelete = (reviewUserId: string) => user !== null && (user.isAdmin || re
{dict.contacts.addressLabel}
- {locale === 'en' ? '12 Vifleemska St, Kyiv, Ukraine' : 'вул. Вифлеємська, 12, Київ, Україна'} + {dict.about.venueAddress}
diff --git a/src/pages/[lang]/contacts.astro b/src/pages/[lang]/contacts.astro index 3017462..05c81d8 100644 --- a/src/pages/[lang]/contacts.astro +++ b/src/pages/[lang]/contacts.astro @@ -5,7 +5,7 @@ import MapView from '../../components/islands/MapView'; import Icon from '../../components/ui/Icon.astro'; import { getDict } from '../../lib/i18n'; import type { Locale } from '../../lib/i18n'; -import { VENUE, venueAddress } from '../../lib/venue'; +import { VENUE } from '../../lib/venue'; const { lang } = Astro.params; const locale = (lang ?? 'ua') as Locale; @@ -45,7 +45,7 @@ const user = Astro.locals.user;
{dict.contacts.addressLabel}
- {venueAddress(locale)} + {dict.about.venueAddressLong}
@@ -77,7 +77,7 @@ const user = Astro.locals.user; lat={VENUE.lat} lng={VENUE.lng} name={VENUE.name} - address={venueAddress(locale)} + address={dict.about.venueAddressLong} hint={dict.map.hint} />
diff --git a/src/pages/[lang]/map.astro b/src/pages/[lang]/map.astro index 836639d..6181154 100644 --- a/src/pages/[lang]/map.astro +++ b/src/pages/[lang]/map.astro @@ -4,7 +4,7 @@ import MapView from '../../components/islands/MapView'; import Icon from '../../components/ui/Icon.astro'; import { getDict } from '../../lib/i18n'; import type { Locale } from '../../lib/i18n'; -import { VENUE, venueAddress } from '../../lib/venue'; +import { VENUE } from '../../lib/venue'; const { lang } = Astro.params; const locale = (lang ?? 'ua') as Locale; @@ -37,7 +37,7 @@ const user = Astro.locals.user;
{dict.contacts.addressLabel}
- {venueAddress(locale)} + {dict.about.venueAddressLong}
@@ -70,7 +70,7 @@ const user = Astro.locals.user; lat={VENUE.lat} lng={VENUE.lng} name={VENUE.name} - address={venueAddress(locale)} + address={dict.about.venueAddressLong} hint={dict.map.hint} />