From 7de920548e3ec7dc4b5aeededb25eda239644546 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Mon, 16 Jan 2023 10:43:20 +0000 Subject: [PATCH] chore: use getTrad so react-intl works --- .../components/Notifications/Notification/index.js | 1 + .../admin/src/components/MediaLibraryInput/index.js | 11 ++++++----- packages/core/upload/admin/src/translations/en.json | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/core/admin/admin/src/components/Notifications/Notification/index.js b/packages/core/admin/admin/src/components/Notifications/Notification/index.js index 38b8138830..a57a57a489 100644 --- a/packages/core/admin/admin/src/components/Notifications/Notification/index.js +++ b/packages/core/admin/admin/src/components/Notifications/Notification/index.js @@ -77,6 +77,7 @@ const Notification = ({ dispatch, notification }) => { {formattedMessage({ id: message?.id || message, defaultMessage: message?.defaultMessage || message?.id || message, + values: message?.values, })} ); diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/index.js b/packages/core/upload/admin/src/components/MediaLibraryInput/index.js index 89b38040ed..eeea6eb933 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/index.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/index.js @@ -9,6 +9,7 @@ import { CarouselAssets } from './Carousel/CarouselAssets'; import { EditFolderDialog } from '../EditFolderDialog'; import { UploadAssetDialog } from '../UploadAssetDialog/UploadAssetDialog'; import getAllowedFiles from '../../utils/getAllowedFiles'; +import getTrad from '../../utils/getTrad'; const STEPS = { AssetSelect: 'SelectAsset', @@ -112,11 +113,11 @@ export const MediaLibraryInput = ({ type: 'warning', timeout: 4000, message: { - id: 'input.notification.not-supported', - defaultMessage: `You can't upload this type of file, only the following types are accepted – ${fieldAllowedTypes.join( - ',' - )}`, - assetTypes: fieldAllowedTypes.join(','), + id: getTrad('input.notification.not-supported'), + defaultMessage: `You can't upload this type of file.`, + values: { + fileTypes: fieldAllowedTypes.join(','), + }, }, }); } diff --git a/packages/core/upload/admin/src/translations/en.json b/packages/core/upload/admin/src/translations/en.json index 516af2e734..85edf41d75 100644 --- a/packages/core/upload/admin/src/translations/en.json +++ b/packages/core/upload/admin/src/translations/en.json @@ -38,7 +38,7 @@ "input.placeholder.icon": "Drop the asset in this zone", "input.url.description": "Separate your URL links by a carriage return.", "input.url.label": "URL", - "input.notification.not-supported": "You can't upload this type of file.", + "input.notification.not-supported": "You can't upload this type of file, only the following types are accepted – {fileTypes}", "list.assets.title": "Assets ({count})", "list.asset.at.finished": "The assets have finished loading.", "list.assets-empty.search": "No result found",