diff --git a/webapp/boards/i18n/en.json b/webapp/boards/i18n/en.json index 2fe9b2c5fa..26f1fd701f 100644 --- a/webapp/boards/i18n/en.json +++ b/webapp/boards/i18n/en.json @@ -259,7 +259,6 @@ "Sidebar.no-boards-in-category": "No boards inside", "Sidebar.product-tour": "Product tour", "Sidebar.random-icons": "Random icons", - "Sidebar.set-language": "Set language", "Sidebar.set-theme": "Set theme", "Sidebar.settings": "Settings", "Sidebar.template-from-board": "New template from board", diff --git a/webapp/boards/src/app.tsx b/webapp/boards/src/app.tsx index 245c046703..28d40e4fa4 100644 --- a/webapp/boards/src/app.tsx +++ b/webapp/boards/src/app.tsx @@ -1,7 +1,6 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. import React, {useEffect} from 'react' -import {IntlProvider} from 'react-intl' import {DndProvider} from 'react-dnd' import {HTML5Backend} from 'react-dnd-html5-backend' import {TouchBackend} from 'react-dnd-touch-backend' @@ -9,12 +8,10 @@ import {History} from 'history' import TelemetryClient from './telemetry/telemetryClient' -import {getMessages} from './i18n' import FlashMessages from './components/flashMessages' import NewVersionBanner from './components/newVersionBanner' import {Utils} from './utils' import {fetchMe, getMe} from './store/users' -import {fetchLanguage, getLanguage} from './store/language' import {useAppDispatch, useAppSelector} from './store/hooks' import {fetchClientConfig} from './store/clientConfig' import FocalboardRouter from './router' @@ -26,12 +23,10 @@ type Props = { } const App = (props: Props): JSX.Element => { - const language = useAppSelector(getLanguage) const me = useAppSelector(getMe) const dispatch = useAppDispatch() useEffect(() => { - dispatch(fetchLanguage()) dispatch(fetchMe()) dispatch(fetchClientConfig()) }, []) @@ -43,20 +38,15 @@ const App = (props: Props): JSX.Element => { }, [me]) return ( - - - -
-
- - -
+ + +
+
+ +
- - +
+ ) } diff --git a/webapp/boards/src/components/boardSelector.tsx b/webapp/boards/src/components/boardSelector.tsx index 7c4be33d73..5f199a79f9 100644 --- a/webapp/boards/src/components/boardSelector.tsx +++ b/webapp/boards/src/components/boardSelector.tsx @@ -1,14 +1,11 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. import React, {useCallback, useMemo, useState} from 'react' -import {FormattedMessage, IntlProvider, useIntl} from 'react-intl' +import {FormattedMessage, useIntl} from 'react-intl' import debounce from 'lodash/debounce' import {SuiteWindow} from 'src/types/index' -import {getMessages} from 'src/i18n' -import {getLanguage} from 'src/store/language' - import {useWebsockets} from 'src/hooks/websockets' import octoClient from 'src/octoClient' @@ -220,17 +217,4 @@ const BoardSelector = () => { ) } -const IntlBoardSelector = () => { - const language = useAppSelector(getLanguage) - - return ( - - - - ) -} - -export default IntlBoardSelector +export default BoardSelector diff --git a/webapp/boards/src/components/boardsUnfurl/boardsUnfurl.tsx b/webapp/boards/src/components/boardsUnfurl/boardsUnfurl.tsx index b0704693fe..63eb161713 100644 --- a/webapp/boards/src/components/boardsUnfurl/boardsUnfurl.tsx +++ b/webapp/boards/src/components/boardsUnfurl/boardsUnfurl.tsx @@ -1,19 +1,17 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. import React, {useEffect, useState} from 'react' -import {FormattedMessage, IntlProvider, useIntl} from 'react-intl' +import {FormattedMessage, useIntl} from 'react-intl' import WithWebSockets from 'src/components/withWebSockets' import {useWebsockets} from 'src/hooks/websockets' -import {getLanguage} from 'src/store/language' import {useAppSelector} from 'src/store/hooks' import {getCurrentTeamId} from 'src/store/teams' import {MMWebSocketClient, WSClient} from 'src/wsclient' import manifest from 'src/manifest' -import {getMessages} from 'src/i18n' import {Utils} from 'src/utils' import {Block} from 'src/blocks/block' import {Card} from 'src/blocks/card' @@ -278,17 +276,4 @@ export const BoardsUnfurl = (props: Props): JSX.Element => { ) } -const IntlBoardsUnfurl = (props: Props) => { - const language = useAppSelector(getLanguage) - - return ( - - - - ) -} - -export default IntlBoardsUnfurl +export default BoardsUnfurl diff --git a/webapp/boards/src/components/createBoardFromTemplate.tsx b/webapp/boards/src/components/createBoardFromTemplate.tsx index aa5da3fc55..ef30ec2f7f 100644 --- a/webapp/boards/src/components/createBoardFromTemplate.tsx +++ b/webapp/boards/src/components/createBoardFromTemplate.tsx @@ -7,8 +7,6 @@ import React, { useState, } from 'react' -import {IntlProvider, createIntl, createIntlCache} from 'react-intl' - import Select from 'react-select/async' import { FormatOptionLabelMeta, @@ -20,10 +18,9 @@ import { import {CSSObject} from '@emotion/serialize' -import {getCurrentLanguage, getMessages} from 'src/i18n' -import {getLanguage} from 'src/store/language' +import {useIntl} from 'react-intl' + import CompassIcon from 'src/widgets/icons/compassIcon' -import {useAppSelector} from 'src/store/hooks' import {mutator} from 'src/mutator' import {useGetAllTemplates} from 'src/hooks/useGetAllTemplates' @@ -46,12 +43,6 @@ type ReactSelectItem = { const EMPTY_BOARD = 'empty_board' const TEMPLATE_DESCRIPTION_LENGTH = 70 -const cache = createIntlCache() -const intl = createIntl({ - locale: getCurrentLanguage(), - messages: getMessages(getCurrentLanguage()), -}, cache) - const {ValueContainer, Placeholder} = components const CustomValueContainer = ({children, ...props}: any) => { return ( @@ -67,6 +58,7 @@ const CustomValueContainer = ({children, ...props}: any) => { } const CreateBoardFromTemplate = (props: Props) => { + const intl = useIntl() const {formatMessage} = intl const [addBoard, setAddBoard] = useState(false) @@ -259,17 +251,4 @@ const CreateBoardFromTemplate = (props: Props) => { ) } -const IntlCreateBoardFromTemplate = (props: Props) => { - const language = useAppSelector(getLanguage) - - return ( - - - - ) -} - -export default IntlCreateBoardFromTemplate +export default CreateBoardFromTemplate diff --git a/webapp/boards/src/components/globalHeader/__snapshots__/globalHeaderSettingsMenu.test.tsx.snap b/webapp/boards/src/components/globalHeader/__snapshots__/globalHeaderSettingsMenu.test.tsx.snap index df54aa3a5d..d2da28671e 100644 --- a/webapp/boards/src/components/globalHeader/__snapshots__/globalHeaderSettingsMenu.test.tsx.snap +++ b/webapp/boards/src/components/globalHeader/__snapshots__/globalHeaderSettingsMenu.test.tsx.snap @@ -238,24 +238,6 @@ exports[`components/sidebar/GlobalHeaderSettingsMenu imports menu open should ma
-
-
-
-