about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-02-18 19:29:32 +0100
committerThibG <thib@sitedethib.com>2019-02-18 19:49:06 +0100
commit896beb16c5318b8ce59867a06545ae6a00ccc84c (patch)
tree270247e4e3ed86f0b5b7a7937f032273ffc56d2a
parentbe9352266c9ec7595c6354a8d98c990a2dc91bf8 (diff)
[Glitch] Internationalize unexpected error message
Port 4e71b104e6d5f02069120c7a56b26888c6f0fef5 to glitch-soc,
fixing a crash in the process
-rw-r--r--app/javascript/flavours/glitch/features/ui/containers/notifications_container.js19
1 files changed, 15 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/containers/notifications_container.js b/app/javascript/flavours/glitch/features/ui/containers/notifications_container.js
index 88d482bcf..283aa2373 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/notifications_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/notifications_container.js
@@ -1,11 +1,22 @@
+import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { NotificationStack } from 'react-notification';
 import { dismissAlert } from 'flavours/glitch/actions/alerts';
 import { getAlerts } from 'flavours/glitch/selectors';
 
-const mapStateToProps = state => ({
-  notifications: getAlerts(state),
-});
+const mapStateToProps = (state, { intl }) => {
+  const notifications = getAlerts(state);
+
+  notifications.forEach(notification => ['title', 'message'].forEach(key => {
+    const value = notification[key];
+
+    if (typeof value === 'object') {
+      notification[key] = intl.formatMessage(value);
+    }
+  }));
+
+  return { notifications };
+};
 
 const mapDispatchToProps = (dispatch) => {
   return {
@@ -15,4 +26,4 @@ const mapDispatchToProps = (dispatch) => {
   };
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(NotificationStack);
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NotificationStack));