treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] Internationalize unexpected error message 

Port e8a1d0b4d4 to glitch-soc,
fixing a crash in the process
lolsob-rspec
Thibaut Girka 2019-02-18 19:29:32 +01:00 committed by ThibG
parent e34c5db19e
commit 8ded9a0c02
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/javascript/flavours/glitch/features/ui/containers/notifications_container.js
View File

@ -1,11 +1,22 @@
import { injectIntl } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { NotificationStack } from 'react-notification'; import { NotificationStack } from 'react-notification';
import { dismissAlert } from 'flavours/glitch/actions/alerts'; import { dismissAlert } from 'flavours/glitch/actions/alerts';
import { getAlerts } from 'flavours/glitch/selectors'; import { getAlerts } from 'flavours/glitch/selectors';
const mapStateToProps = state => ({ const mapStateToProps = (state, { intl }) => {
notifications: getAlerts(state), 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) => { const mapDispatchToProps = (dispatch) => {
return { return {
@ -15,4 +26,4 @@ const mapDispatchToProps = (dispatch) => {
}; };
}; };
export default connect(mapStateToProps, mapDispatchToProps)(NotificationStack); export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NotificationStack));