Fixing issue with locale switching.

ReCodEx · May 17, 2019 · 5bff6fa · 5bff6fa
1 parent dea6ae3
commit 5bff6fa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/components/widgets/Header/Header.js b/src/components/widgets/Header/Header.js
@@ -78,7 +78,7 @@ class Header extends Component {
           </ClientOnly>
           <div className="navbar-custom-menu">
             <ul className="nav navbar-nav">
-              {isLoggedIn && <HeaderSystemMessagesContainer />}
+              {isLoggedIn && <HeaderSystemMessagesContainer locale={currentLang} />}
               <HeaderNotificationsContainer />
               {availableLangs.map(lang => (
                 <HeaderLanguageSwitching lang={lang} active={currentLang === lang} key={lang} currentUrl={currentUrl} />

diff --git a/src/components/widgets/HeaderSystemMessagesDropdown/HeaderSystemMessagesDropdown.js b/src/components/widgets/HeaderSystemMessagesDropdown/HeaderSystemMessagesDropdown.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, intlShape, injectIntl } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import classnames from 'classnames';
 import { Label, Table } from 'react-bootstrap';
 
@@ -14,7 +14,7 @@ import DateTime from '../DateTime';
 
 const preventClickPropagation = ev => ev.stopPropagation();
 
-const HeaderSystemMessagesDropdown = ({ isOpen, toggleOpen, systemMessages, intl: { locale } }) => (
+const HeaderSystemMessagesDropdown = ({ isOpen, toggleOpen, systemMessages, locale }) => (
   <li
     className={classnames({
       'notifications-menu': true,
@@ -76,7 +76,7 @@ HeaderSystemMessagesDropdown.propTypes = {
   showAll: PropTypes.bool,
   toggleOpen: PropTypes.func.isRequired,
   systemMessages: PropTypes.array.isRequired,
-  intl: intlShape.isRequired,
+  locale: PropTypes.string.isRequired,
 };
 
-export default injectIntl(HeaderSystemMessagesDropdown);
+export default HeaderSystemMessagesDropdown;
diff --git a/src/containers/HeaderSystemMessagesContainer/HeaderSystemMessagesContainer.js b/src/containers/HeaderSystemMessagesContainer/HeaderSystemMessagesContainer.js
@@ -35,13 +35,18 @@ class HeaderSystemMessagesContainer extends Component {
   open = () => this.setState({ isOpen: true });
 
   render() {
-    const { systemMessages, fetchStatus } = this.props;
+    const { systemMessages, fetchStatus, locale } = this.props;
     const { isOpen } = this.state;
 
     return (
       <FetchManyResourceRenderer fetchManyStatus={fetchStatus} loading={<span />}>
         {() => (
-          <HeaderSystemMessagesDropdown isOpen={isOpen} toggleOpen={this.toggleOpen} systemMessages={systemMessages} />
+          <HeaderSystemMessagesDropdown
+            isOpen={isOpen}
+            toggleOpen={this.toggleOpen}
+            systemMessages={systemMessages}
+            locale={locale}
+          />
         )}
       </FetchManyResourceRenderer>
     );
@@ -51,6 +56,7 @@ class HeaderSystemMessagesContainer extends Component {
 HeaderSystemMessagesContainer.propTypes = {
   systemMessages: PropTypes.array.isRequired,
   fetchStatus: PropTypes.string,
+  locale: PropTypes.string.isRequired,
 };
 
 export default connect(state => ({