diff --git a/server/src/services/asset.service.spec.ts b/server/src/services/asset.service.spec.ts index 1516ef8961..49753923a2 100755 --- a/server/src/services/asset.service.spec.ts +++ b/server/src/services/asset.service.spec.ts @@ -323,9 +323,9 @@ describe(AssetService.name, () => { assetMock.getByDayOfYear.mockResolvedValue([image1, image2, image3, image4]); await expect(sut.getMemoryLane(authStub.admin, { day: 15, month: 1 })).resolves.toEqual([ - { yearsAgo: 1, title: '1 year since...', assets: [mapAsset(image1), mapAsset(image2)] }, - { yearsAgo: 9, title: '9 years since...', assets: [mapAsset(image3)] }, - { yearsAgo: 15, title: '15 years since...', assets: [mapAsset(image4)] }, + { yearsAgo: 1, title: '1 year ago', assets: [mapAsset(image1), mapAsset(image2)] }, + { yearsAgo: 9, title: '9 years ago', assets: [mapAsset(image3)] }, + { yearsAgo: 15, title: '15 years ago', assets: [mapAsset(image4)] }, ]); expect(assetMock.getByDayOfYear.mock.calls).toEqual([[[authStub.admin.user.id], { day: 15, month: 1 }]]); diff --git a/server/src/services/asset.service.ts b/server/src/services/asset.service.ts index a26b7f5a73..d9113f0787 100644 --- a/server/src/services/asset.service.ts +++ b/server/src/services/asset.service.ts @@ -190,7 +190,7 @@ export class AssetService { .map((yearsAgo) => ({ yearsAgo, // TODO move this to clients - title: `${yearsAgo} year${yearsAgo > 1 ? 's' : ''} since...`, + title: `${yearsAgo} year${yearsAgo > 1 ? 's' : ''} ago`, assets: groups[yearsAgo].map((asset) => mapAsset(asset, { auth })), })); } diff --git a/web/src/lib/utils.ts b/web/src/lib/utils.ts index e6c21b70a3..6d98131b7e 100644 --- a/web/src/lib/utils.ts +++ b/web/src/lib/utils.ts @@ -277,4 +277,4 @@ export const handlePromiseError = (promise: Promise): void => { promise.catch((error) => console.error(`[utils.ts]:handlePromiseError ${error}`, error)); }; -export const memoryLaneTitle = (yearsAgo: number) => `${yearsAgo} ${yearsAgo ? 'years' : 'year'} since...`; +export const memoryLaneTitle = (yearsAgo: number) => `${yearsAgo} ${yearsAgo ? 'years' : 'year'} ago`;