From 9679212864bee94500e4ad0b6f71ba860d71b4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Tue, 29 Jul 2025 06:12:57 +0000 Subject: [PATCH] Merged in feat/SW-1956-add-English-caption-fallback (pull request #2574) Feat/SW-1956 add English caption fallback * feat(SW-1956): add English fallback to gallery caption * feat(SW-1956): add English fallback to gallery caption Approved-by: Anton Gunnarsson --- .../BookingConfirmation/Rooms/Room/index.tsx | 2 +- apps/scandic-web/utils/facilityCards.ts | 2 +- apps/scandic-web/utils/imageGallery.ts | 10 ++++++---- apps/scandic-web/utils/jsonSchemas.ts | 7 +++---- packages/trpc/lib/routers/hotels/schemas/image.ts | 2 ++ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/index.tsx index 883667c2c..ebd7406a4 100644 --- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/index.tsx +++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/index.tsx @@ -108,7 +108,7 @@ export default function Room({ height={204} src={img?.imageSizes.medium ?? ""} style={{ borderRadius: "var(--Corner-radius-md)" }} - title={img?.metaData.title ?? ""} + title={img?.metaData.title || img?.metaData.title_En || ""} width={204} />
diff --git a/apps/scandic-web/utils/facilityCards.ts b/apps/scandic-web/utils/facilityCards.ts index 314bbac0d..9ecb23f89 100644 --- a/apps/scandic-web/utils/facilityCards.ts +++ b/apps/scandic-web/utils/facilityCards.ts @@ -125,7 +125,7 @@ export function setFacilityCardGrids( const img: FacilityImage = { backgroundImage: { url: image.imageSizes.large, - title: image.metaData.title, + title: image.metaData.title || image.metaData.title_En, meta: { alt: image.metaData.altText, caption: image.metaData.altText_En, diff --git a/apps/scandic-web/utils/imageGallery.ts b/apps/scandic-web/utils/imageGallery.ts index fc285c4fb..1228a701f 100644 --- a/apps/scandic-web/utils/imageGallery.ts +++ b/apps/scandic-web/utils/imageGallery.ts @@ -1,6 +1,7 @@ -import type { GalleryImage } from "@/types/components/imageGallery" -import type { ImageVaultAsset } from "@scandic-hotels/trpc/types/imageVault" import type { ApiImage } from "@scandic-hotels/trpc/types/hotel" +import type { ImageVaultAsset } from "@scandic-hotels/trpc/types/imageVault" + +import type { GalleryImage } from "@/types/components/imageGallery" function mapApiImageToGalleryImage(apiImage: ApiImage): GalleryImage { return { @@ -8,8 +9,9 @@ function mapApiImageToGalleryImage(apiImage: ApiImage): GalleryImage { alt: apiImage.metaData.altText || apiImage.metaData.altText_En || - apiImage.metaData.title, - caption: apiImage.metaData.title, + apiImage.metaData.title || + apiImage.metaData.title_En, + caption: apiImage.metaData.title || apiImage.metaData.title_En, smallSrc: apiImage.imageSizes.small, } } diff --git a/apps/scandic-web/utils/jsonSchemas.ts b/apps/scandic-web/utils/jsonSchemas.ts index 7aba62d18..ed617cea7 100644 --- a/apps/scandic-web/utils/jsonSchemas.ts +++ b/apps/scandic-web/utils/jsonSchemas.ts @@ -1,5 +1,7 @@ import { env } from "@/env/server" +import type { Breadcrumbs } from "@scandic-hotels/trpc/types/breadcrumbs" +import type { HotelData } from "@scandic-hotels/trpc/types/hotel" import type { BreadcrumbList, Hotel as HotelSchema, @@ -7,9 +9,6 @@ import type { WithContext, } from "schema-dts" -import type { HotelData } from "@scandic-hotels/trpc/types/hotel" -import type { Breadcrumbs } from "@scandic-hotels/trpc/types/breadcrumbs" - export function generateBreadcrumbsSchema(breadcrumbs: Breadcrumbs) { const itemListElement: ListItem[] = breadcrumbs.map((item, index) => ({ "@type": "ListItem", @@ -63,7 +62,7 @@ export function generateHotelSchema(hotelData: HotelData) { jsonLd.image = { "@type": "ImageObject", url: image.imageSizes.small, - caption: image.metaData.title, + caption: image.metaData.title || image.metaData.title_En, } } diff --git a/packages/trpc/lib/routers/hotels/schemas/image.ts b/packages/trpc/lib/routers/hotels/schemas/image.ts index 35ca86354..08f354b2c 100644 --- a/packages/trpc/lib/routers/hotels/schemas/image.ts +++ b/packages/trpc/lib/routers/hotels/schemas/image.ts @@ -14,6 +14,7 @@ export const imageMetaDataSchema = z.object({ altText_En: nullableStringValidator, copyRight: nullableStringValidator, title: nullableStringValidator, + title_En: nullableStringValidator, }) const DEFAULT_IMAGE_OBJ = { @@ -22,6 +23,7 @@ const DEFAULT_IMAGE_OBJ = { altText_En: "Default image", copyRight: "Default image", title: "Default image", + title_En: "Default image", }, imageSizes: { tiny: "https://placehold.co/1280x720",