From d2afb867bd215f7d477c58598cf952feedc0dd25 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Mon, 5 Jul 2021 15:31:31 +0800 Subject: [PATCH 1/3] The vertical navigation bar has been internationalized --- web/src/components/navbar/NavbarVerticalMenuItem.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/src/components/navbar/NavbarVerticalMenuItem.js b/web/src/components/navbar/NavbarVerticalMenuItem.js index a4f0cecc..3655e6c8 100644 --- a/web/src/components/navbar/NavbarVerticalMenuItem.js +++ b/web/src/components/navbar/NavbarVerticalMenuItem.js @@ -3,15 +3,16 @@ import PropTypes from 'prop-types'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Badge } from 'reactstrap'; import Flex from '../common/Flex'; +import { withTranslation } from 'react-i18next'; -const NavbarVerticalMenuItem = ({ route }) => ( +const NavbarVerticalMenuItem = ({ route, t }) => ( {route.icon && ( )} - {route.name} + {t(route.name)} {!!route.badge && ( {route.badge.text} @@ -27,4 +28,4 @@ NavbarVerticalMenuItem.propTypes = { }).isRequired }; -export default React.memo(NavbarVerticalMenuItem); +export default withTranslation()(React.memo(NavbarVerticalMenuItem)); From a375b5d9f6a428468eeb3690906d12be66e2c2c3 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Mon, 5 Jul 2021 15:51:02 +0800 Subject: [PATCH 2/3] The vertical navigation bar has been internationalized --- web/src/components/navbar/NavbarVertical.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/src/components/navbar/NavbarVertical.js b/web/src/components/navbar/NavbarVertical.js index 6c2dd7e4..9375c196 100644 --- a/web/src/components/navbar/NavbarVertical.js +++ b/web/src/components/navbar/NavbarVertical.js @@ -12,8 +12,9 @@ import Logo from './Logo'; import NavbarTopDropDownMenus from './NavbarTopDropDownMenus'; import NavbarVerticalMenu from './NavbarVerticalMenu'; import ToggleButton from './ToggleButton'; +import { withTranslation } from 'react-i18next'; -const NavbarVertical = ({ navbarStyle }) => { +const NavbarVertical = ({ navbarStyle, t }) => { const navBarRef = useRef(null); const { @@ -113,7 +114,7 @@ const NavbarVertical = ({ navbarStyle }) => { block className="my-3 btn-purchase" > - Purchase + {t('Purchase')} @@ -129,4 +130,4 @@ NavbarVertical.defaultProps = { navbarStyle: 'transparent' }; -export default NavbarVertical; +export default withTranslation()(NavbarVertical); From abb7c6ba7fc33aa1a8967e61b3e67ee2e6dbd3dd Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Mon, 5 Jul 2021 17:09:34 +0800 Subject: [PATCH 3/3] The vertical navigation bar has been internationalized --- web/src/components/navbar/ToggleButton.js | 7 ++++--- web/src/i18n.js | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/web/src/components/navbar/ToggleButton.js b/web/src/components/navbar/ToggleButton.js index 4ee9bf37..0cc69536 100644 --- a/web/src/components/navbar/ToggleButton.js +++ b/web/src/components/navbar/ToggleButton.js @@ -1,10 +1,11 @@ import React from 'react'; import { Button, UncontrolledTooltip } from 'reactstrap'; +import { withTranslation } from 'react-i18next'; -const ToggleButton = ({ isNavbarVerticalCollapsed, setIsNavbarVerticalCollapsed }) => ( +const ToggleButton = ({ isNavbarVerticalCollapsed, setIsNavbarVerticalCollapsed, t }) => ( <> - Toggle Navigation + {t('Toggle Navigation')}