From 3b8a7780aca5a69f32f641c075208bfb55bea698 Mon Sep 17 00:00:00 2001 From: Ben Warzeski Date: Thu, 17 Mar 2022 14:08:46 -0400 Subject: [PATCH] I18n example (#33) * feat: i18n pt 1 * fix: prevent float calculations when updating dimensions --- package-lock.json | 75 +++++++++++-------- package.json | 2 +- .../__snapshots__/index.test.jsx.snap | 18 ++++- src/editors/components/EditorFooter/index.jsx | 16 ++-- .../components/EditorFooter/index.test.jsx | 5 +- .../components/EditorFooter/messages.js | 29 +++++++ .../components/EditorHeader/HeaderTitle.jsx | 14 ++-- .../EditorHeader/HeaderTitle.test.jsx | 4 +- .../__snapshots__/HeaderTitle.test.jsx.snap | 11 +-- .../__snapshots__/index.test.jsx.snap | 3 +- src/editors/components/EditorHeader/index.jsx | 12 ++- .../components/EditorHeader/index.test.jsx | 5 +- .../components/EditorHeader/messages.js | 19 +++++ src/editors/components/messages.js | 19 ----- .../components/ImageSettingsModal/hooks.js | 4 +- www/package-lock.json | 14 ++-- www/package.json | 2 +- www/src/index.jsx | 2 +- 18 files changed, 160 insertions(+), 94 deletions(-) create mode 100644 src/editors/components/EditorFooter/messages.js create mode 100644 src/editors/components/EditorHeader/messages.js delete mode 100644 src/editors/components/messages.js diff --git a/package-lock.json b/package-lock.json index 63f45da52..675f52eec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24961,6 +24961,34 @@ "once": "^1.3.0", "path-is-absolute": "^1.0.0" } + }, + "intl-messageformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz", + "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=", + "dev": true, + "requires": { + "intl-messageformat-parser": "1.4.0" + } + }, + "intl-messageformat-parser": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz", + "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=", + "dev": true + }, + "react-intl": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz", + "integrity": "sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==", + "dev": true, + "requires": { + "hoist-non-react-statics": "^3.3.0", + "intl-format-cache": "^2.0.5", + "intl-messageformat": "^2.1.0", + "intl-relativeformat": "^2.1.0", + "invariant": "^2.1.1" + } } } }, @@ -32562,23 +32590,6 @@ "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==", "dev": true }, - "intl-messageformat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz", - "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=", - "dev": true, - "requires": { - "intl-messageformat-parser": "1.4.0" - }, - "dependencies": { - "intl-messageformat-parser": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz", - "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=", - "dev": true - } - } - }, "intl-messageformat-parser": { "version": "5.5.1", "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-5.5.1.tgz", @@ -32595,6 +32606,23 @@ "dev": true, "requires": { "intl-messageformat": "^2.0.0" + }, + "dependencies": { + "intl-messageformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz", + "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=", + "dev": true, + "requires": { + "intl-messageformat-parser": "1.4.0" + } + }, + "intl-messageformat-parser": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz", + "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=", + "dev": true + } } }, "into-stream": { @@ -37492,19 +37520,6 @@ "use-sidecar": "^1.0.5" } }, - "react-intl": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz", - "integrity": "sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==", - "dev": true, - "requires": { - "hoist-non-react-statics": "^3.3.0", - "intl-format-cache": "^2.0.5", - "intl-messageformat": "^2.1.0", - "intl-relativeformat": "^2.1.0", - "invariant": "^2.1.1" - } - }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", diff --git a/package.json b/package.json index 9378855e0..1393dde92 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "tinymce": "^5.10.2" }, "peerDependencies": { - "@edx/frontend-platform": "^1.8.0", "@edx/paragon": ">= 7.0.0 < 20.0.0", + "@edx/frontend-platform": "1.14.0", "prop-types": "^15.5.10", "react": "^16.14.0", "react-dom": "^16.14.0" diff --git a/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap b/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap index 283003ba2..fdd8b38f1 100644 --- a/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap +++ b/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap @@ -28,7 +28,11 @@ exports[`EditorFooter snapshots Save Failed, error message raised 1`] = ` } variant="tertiary" > - Cancel +