From 36c33c69b785befc28b56ec9e7cf0793dfd37f5c Mon Sep 17 00:00:00 2001 From: Lisa Hillebrand Date: Fri, 30 Sep 2022 11:39:00 +0200 Subject: [PATCH 1/2] 615 Use translation library for bottom menu --- components/menu/index.js | 9 ++++++--- components/pages.js | 6 +++--- i18n/en.json | 5 +++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/components/menu/index.js b/components/menu/index.js index ae885ec..795c5b6 100644 --- a/components/menu/index.js +++ b/components/menu/index.js @@ -6,20 +6,23 @@ import MenuItem from './menu-item' import { Containers } from '../../styles' import { pages } from '../pages' +import { useTranslation } from 'react-i18next' const Menu = ({ currentPage, navigate }) => { const menuItems = pages.filter((page) => page.isInMenu) + const { t } = useTranslation(null, { keyPrefix: 'bottomMenu' }) + return ( - {menuItems.map(({ icon, label, component }) => { + {menuItems.map(({ icon, labelKey, component }) => { return ( navigate(component)} icon={icon} - key={label} - label={label} + key={labelKey} + label={t(labelKey)} /> ) })} diff --git a/components/pages.js b/components/pages.js index e9f9b6c..0639929 100644 --- a/components/pages.js +++ b/components/pages.js @@ -13,21 +13,21 @@ export const pages = [ component: 'Calendar', icon: 'calendar', isInMenu: true, - label: 'Calendar', + labelKey: 'calendar', parent: 'Home', }, { component: 'Chart', icon: 'chart', isInMenu: true, - label: 'Chart', + labelKey: 'chart', parent: 'Home', }, { component: 'Stats', icon: 'statistics', isInMenu: true, - label: 'Stats', + labelKey: 'stats', parent: 'Home', }, { diff --git a/i18n/en.json b/i18n/en.json index 7102896..b67c06d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,4 +1,9 @@ { + "bottomMenu": { + "calendar": "Calendar", + "chart": "Chart", + "stats": "Stats" + }, "cycleDay": { "symptomBox": { "bleeding": "Bleeding", From 51e1c95e713f61a69b9dd1a3d16235a696b425b0 Mon Sep 17 00:00:00 2001 From: Lisa Hillebrand Date: Fri, 16 Sep 2022 20:40:24 +0200 Subject: [PATCH 2/2] 615 Remove unused page labels --- components/pages.js | 12 ------------ i18n/en/settings.js | 18 ------------------ 2 files changed, 30 deletions(-) diff --git a/components/pages.js b/components/pages.js index 0639929..deb7707 100644 --- a/components/pages.js +++ b/components/pages.js @@ -1,13 +1,9 @@ import settingsViews from './settings' -import settingsLabels from '../i18n/en/settings' -const labels = settingsLabels.menuItems - export const pages = [ { component: 'Home', icon: 'home', - label: 'Home', }, { component: 'Calendar', @@ -34,42 +30,34 @@ export const pages = [ children: Object.keys(settingsViews), component: 'SettingsMenu', icon: 'settings', - label: 'Settings', parent: 'Home', }, { component: 'Reminders', - label: labels.reminders.name, parent: 'SettingsMenu', }, { component: 'NfpSettings', - label: labels.nfpSettings.name, parent: 'SettingsMenu', }, { component: 'DataManagement', - label: labels.dataManagement.name, parent: 'SettingsMenu', }, { component: 'Password', - label: labels.password.name, parent: 'SettingsMenu', }, { component: 'About', - label: 'About', parent: 'SettingsMenu', }, { component: 'License', - label: 'License', parent: 'SettingsMenu', }, { component: 'PrivacyPolicy', - label: 'PrivacyPolicy', parent: 'SettingsMenu', }, { diff --git a/i18n/en/settings.js b/i18n/en/settings.js index bb5117c..6a07de6 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -1,24 +1,6 @@ import links from './links' export default { - menuItems: { - reminders: { - name: 'Reminders', - text: 'turn on/off reminders', - }, - nfpSettings: { - name: 'NFP settings', - text: 'define how you want to use NFP', - }, - dataManagement: { - name: 'Data', - text: 'import, export or delete your data', - }, - password: { - name: 'Password', - text: '', - }, - }, export: { errors: { noData: 'There is no data to export',