From ff43ab7e99b0a54154a5b35ba570753be76fce62 Mon Sep 17 00:00:00 2001 From: Rob Gietema Date: Tue, 5 Mar 2024 11:28:33 +0100 Subject: [PATCH 1/2] Fix translation error message. --- packages/volto/package.json | 2 +- .../volto/src/components/manage/Add/Add.jsx | 2 +- pnpm-lock.yaml | 20 ++++++++----------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/volto/package.json b/packages/volto/package.json index e53486f78f..f200db4353 100644 --- a/packages/volto/package.json +++ b/packages/volto/package.json @@ -310,7 +310,7 @@ "react-simple-code-editor": "0.7.1", "react-sortable-hoc": "2.0.0", "react-test-renderer": "18.2.0", - "react-toastify": "5.4.1", + "react-toastify": "5.5.0", "react-transition-group": "4.4.5", "react-virtualized": "9.22.3", "redraft": "0.10.2", diff --git a/packages/volto/src/components/manage/Add/Add.jsx b/packages/volto/src/components/manage/Add/Add.jsx index 7bc3f6138d..536981c360 100644 --- a/packages/volto/src/components/manage/Add/Add.jsx +++ b/packages/volto/src/components/manage/Add/Add.jsx @@ -193,7 +193,7 @@ class Add extends Component { erroMessage = this.props.intl.formatMessage(messages.someErrors); } } else { - erroMessage = error; + erroMessage = errorsList.error?.message || error; } this.setState({ error: error }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f92b43eb52..86a8337245 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1783,8 +1783,8 @@ importers: specifier: 18.2.0 version: 18.2.0(react@18.2.0) react-toastify: - specifier: 5.4.1 - version: 5.4.1(react-dom@18.2.0)(react@18.2.0) + specifier: 5.5.0 + version: 5.5.0(react-dom@18.2.0)(react@18.2.0) react-transition-group: specifier: 4.4.5 version: 4.4.5(react-dom@18.2.0)(react@18.2.0) @@ -21017,10 +21017,6 @@ packages: resolution: {integrity: sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==} dev: false - /classnames@2.3.2: - resolution: {integrity: sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==} - dev: false - /clean-css@4.2.4: resolution: {integrity: sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==} engines: {node: '>= 4.0'} @@ -35245,7 +35241,7 @@ packages: react-dom: '>=16.9.0' dependencies: babel-runtime: 6.26.0 - classnames: 2.3.2 + classnames: 2.2.6 css-animation: 1.6.1 prop-types: 15.7.2 raf: 3.4.1 @@ -35262,7 +35258,7 @@ packages: react-dom: '>=16.9.0' dependencies: babel-runtime: 6.26.0 - classnames: 2.3.2 + classnames: 2.2.6 css-animation: 1.6.1 prop-types: 15.7.2 raf: 3.4.1 @@ -35304,7 +35300,7 @@ packages: resolution: {integrity: sha512-m6Cts9hLeZWsTvWnuMm7oElhf+03GOjOLfTuU0QmdB9ZrW7jR2IpI5rpNM7i9MvAAlMAmTx5Zr7g3uu/aMvZAw==} dependencies: babel-runtime: 6.26.0 - classnames: 2.3.2 + classnames: 2.2.6 prop-types: 15.7.2 rc-align: 2.4.5 rc-animate: 2.11.1(react-dom@17.0.2)(react@17.0.2) @@ -35319,7 +35315,7 @@ packages: resolution: {integrity: sha512-m6Cts9hLeZWsTvWnuMm7oElhf+03GOjOLfTuU0QmdB9ZrW7jR2IpI5rpNM7i9MvAAlMAmTx5Zr7g3uu/aMvZAw==} dependencies: babel-runtime: 6.26.0 - classnames: 2.3.2 + classnames: 2.2.6 prop-types: 15.7.2 rc-align: 2.4.5 rc-animate: 2.11.1(react-dom@18.2.0)(react@18.2.0) @@ -36752,8 +36748,8 @@ packages: react-transition-group: 4.4.5(react-dom@17.0.2)(react@17.0.2) dev: false - /react-toastify@5.4.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-24EwkWrj47Id/HGjYfdcntaZpAQ3J5NX31SnGRD66hM/KvPKVJzPiDBPZ+/RZ3SvNkbNWfHpPKFWzenJjC26hg==} + /react-toastify@5.5.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-jsVme7jALIFGRyQsri/g4YTsRuaaGI70T6/ikjwZMB4mwTZaCWqj5NqxhGrRStKlJc5npXKKvKeqTiRGQl78LQ==} peerDependencies: react: '>=15.0.0' react-dom: '>=15.0.0' From 006f833bda6d3e971a7bf205ef930a41658cff3f Mon Sep 17 00:00:00 2001 From: Rob Gietema Date: Tue, 5 Mar 2024 11:30:16 +0100 Subject: [PATCH 2/2] Add changelog. --- packages/volto/news/5835.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/volto/news/5835.bugfix diff --git a/packages/volto/news/5835.bugfix b/packages/volto/news/5835.bugfix new file mode 100644 index 0000000000..ffef5cd4f7 --- /dev/null +++ b/packages/volto/news/5835.bugfix @@ -0,0 +1 @@ +Fix translation error message. @robgietema \ No newline at end of file