diff --git a/src/components/Loader.js b/src/components/Loader.js index 55bf6d5f3..a612b42f4 100644 --- a/src/components/Loader.js +++ b/src/components/Loader.js @@ -1,20 +1,29 @@ import PropTypes from 'prop-types'; import React from 'react'; +import {FormattedMessage} from 'react-intl'; import {getBEMClassName} from 'utils'; export const MODIFIERS = ['centered', 'only-child', 'small', 'gray']; -const Loader = ({modifiers = []}) => { +const Loader = ({modifiers = [], withoutTranslation}) => { const className = getBEMClassName('loading', modifiers); return (
+ + {withoutTranslation ? ( + 'Loading...' + ) : ( + + )} +
); }; Loader.propTypes = { + withoutTranslation: PropTypes.bool, modifiers: PropTypes.arrayOf(PropTypes.oneOf(MODIFIERS)), }; diff --git a/src/components/Loader.stories.js b/src/components/Loader.stories.js index 278672f96..bdcb75434 100644 --- a/src/components/Loader.stories.js +++ b/src/components/Loader.stories.js @@ -5,6 +5,7 @@ export default { component: _Loader, args: { modifiers: [], + withoutTranslation: true, }, argTypes: { modifiers: { diff --git a/src/i18n.js b/src/i18n.js index 9e333b8ee..b0a8b1ce7 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -66,7 +66,7 @@ const I18NManager = ({languageSelectorTarget, onLanguageChangeDone, children}) = }; }, [baseUrl, languageCode]); - if (loading) return ; + if (loading) return ; if (error) { throw error; diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json index 496954ad6..b00da1d58 100644 --- a/src/i18n/messages/en.json +++ b/src/i18n/messages/en.json @@ -684,6 +684,11 @@ "description": "return to form start link after 403", "originalDefault": "Back to form start" }, + "eAmrdi": { + "defaultMessage": "Loading...", + "description": "Loading content text", + "originalDefault": "Loading..." + }, "eO6Ysb": { "defaultMessage": "Your payment is currently processing.", "description": "payment processing status", diff --git a/src/i18n/messages/nl.json b/src/i18n/messages/nl.json index 606636f45..aa08c8087 100644 --- a/src/i18n/messages/nl.json +++ b/src/i18n/messages/nl.json @@ -693,6 +693,11 @@ "description": "return to form start link after 403", "originalDefault": "Back to form start" }, + "eAmrdi": { + "defaultMessage": "Loading...", + "description": "Loading content text", + "originalDefault": "Loading..." + }, "eO6Ysb": { "defaultMessage": "De betaling wordt momenteel verwerkt.", "description": "payment processing status",