diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-01-05 17:45:26 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-01-09 13:54:29 +0100 |
| commit | bf079e50919cb006ac4d5361cbeaf516b8ee5f89 (patch) | |
| tree | 55fa206e119424b73af4e6ca00a8945bb52c3f84 /gui | |
| parent | 69b04ec7008b7f4f1d5c0df843e08a0991d0c335 (diff) | |
| download | mullvadvpn-bf079e50919cb006ac4d5361cbeaf516b8ee5f89.tar.xz mullvadvpn-bf079e50919cb006ac4d5361cbeaf516b8ee5f89.zip | |
Add lang attribute
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/src/renderer/app.tsx | 25 | ||||
| -rw-r--r-- | gui/src/renderer/components/Lang.tsx | 14 |
2 files changed, 28 insertions, 11 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index 87d1d1440d..87bf91123b 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -33,6 +33,7 @@ import AppRouter from './components/AppRouter'; import { Changelog } from './components/Changelog'; import ErrorBoundary from './components/ErrorBoundary'; import KeyboardNavigation from './components/KeyboardNavigation'; +import Lang from './components/Lang'; import MacOsScrollbarDetection from './components/MacOsScrollbarDetection'; import { ModalContainer } from './components/Modal'; import { AppContext } from './context'; @@ -264,17 +265,19 @@ export default class AppRenderer { return ( <AppContext.Provider value={{ app: this }}> <Provider store={this.reduxStore}> - <Router history={this.history.asHistory}> - <ErrorBoundary> - <ModalContainer> - <KeyboardNavigation> - <AppRouter /> - <Changelog /> - </KeyboardNavigation> - {window.env.platform === 'darwin' && <MacOsScrollbarDetection />} - </ModalContainer> - </ErrorBoundary> - </Router> + <Lang> + <Router history={this.history.asHistory}> + <ErrorBoundary> + <ModalContainer> + <KeyboardNavigation> + <AppRouter /> + <Changelog /> + </KeyboardNavigation> + {window.env.platform === 'darwin' && <MacOsScrollbarDetection />} + </ModalContainer> + </ErrorBoundary> + </Router> + </Lang> </Provider> </AppContext.Provider> ); diff --git a/gui/src/renderer/components/Lang.tsx b/gui/src/renderer/components/Lang.tsx new file mode 100644 index 0000000000..2145e12fbb --- /dev/null +++ b/gui/src/renderer/components/Lang.tsx @@ -0,0 +1,14 @@ +import { PropsWithChildren } from 'react'; +import styled from 'styled-components'; + +import { useSelector } from '../redux/store'; + +const StyledLang = styled.div({ + display: 'flex', + flex: '1', +}); + +export default function Lang(props: PropsWithChildren) { + const locale = useSelector((state) => state.userInterface.locale); + return <StyledLang lang={locale}>{props.children}</StyledLang>; +} |
