Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Translation fix for Left Drawer #2018

Merged
merged 2 commits into from
Jun 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,19 @@
"startDate": "Start Date",
"endDate": "End Date",
"startTime": "Start Time",
"endTime": "End Time"
"endTime": "End Time",
"My Organizations": "My Organizations",
"Dashboard": "Dashboard",
"People": "People",
"Events": "Events",
"Venues": "Venues",
"Action Items": "Action Items",
"Posts": "Posts",
"Block/Unblock": "Block/Unblock",
"Advertisement": "Advertisement",
"Funds": "Funds",
"Membership Requests": "Membership Requests",
"Plugins": "Plugins",
"Plugin Store": "Plugin Store",
"Settings": "Settings"
}
16 changes: 15 additions & 1 deletion public/locales/fr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,19 @@
"startDate": "Date de début",
"endDate": "Date de fin",
"startTime": "Heure de début",
"endTime": "Heure de fin"
"endTime": "Heure de fin",
"My Organizations": "Mes Organisations",
"Dashboard": "Tableau de Bord",
"People": "Personnes",
"Events": "Événements",
"Venues": "Lieux",
"Action Items": "Éléments d'Action",
"Posts": "Publications",
"Block/Unblock": "Bloquer/Débloquer",
"Advertisement": "Publicité",
"Funds": "Fonds",
"Membership Requests": "Demandes d'Adhésion",
"Plugins": "Plugins",
"Plugin Store": "Magasin de Plugins",
"Settings": "Paramètres"
}
16 changes: 15 additions & 1 deletion public/locales/hi/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,19 @@
"startDate": "आरंभ करने की तिथि",
"endDate": "अंतिम तिथि",
"startTime": "समय शुरू",
"endTime": "अंत समय"
"endTime": "अंत समय",
"My Organizations": "मेरे संगठन",
"Dashboard": "डैशबोर्ड",
"People": "लोग",
"Events": "कार्यक्रम",
"Venues": "स्थल",
"Action Items": "कार्य आइटम",
"Posts": "पोस्ट",
"Block/Unblock": "ब्लॉक/अनब्लॉक",
"Advertisement": "विज्ञापन",
"Funds": "निधि",
"Membership Requests": "सदस्यता अनुरोध",
"Plugins": "प्लगइन्स",
"Plugin Store": "प्लगइन स्टोर",
"Settings": "सेटिंग्स"
}
16 changes: 15 additions & 1 deletion public/locales/sp/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,19 @@
"startDate": "Start Date",
"endDate": "End Date",
"startTime": "Start Time",
"endTime": "End Time"
"endTime": "End Time",
"My Organizations": "Mis Organizaciones",
"Dashboard": "Tablero",
"People": "Gente",
"Events": "Eventos",
"Venues": "Lugares",
"Action Items": "Elementos de Acción",
"Posts": "Publicaciones",
"Block/Unblock": "Bloquear/Desbloquear",
"Advertisement": "Publicidad",
"Funds": "Fondos",
"Membership Requests": "Solicitudes de Membresía",
"Plugins": "Complementos",
"Plugin Store": "Tienda de Complementos",
"Settings": "Configuraciones"
}
16 changes: 15 additions & 1 deletion public/locales/zh/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,19 @@
"startDate": "开始日期",
"endDate": "结束日期",
"startTime": "开始时间",
"endTime": "时间结束"
"endTime": "时间结束",
"My Organizations": "我的组织",
"Dashboard": "仪表板",
"People": "人们",
"Events": "事件",
"Venues": "场地",
"Action Items": "行动项目",
"Posts": "帖子",
"Block/Unblock": "封锁/解除封锁",
"Advertisement": "广告",
"Funds": "资金",
"Membership Requests": "会员请求",
"Plugins": "插件",
"Plugin Store": "插件商店",
"Settings": "设置"
}
16 changes: 14 additions & 2 deletions src/components/CollapsibleDropdown/CollapsibleDropdown.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import { BrowserRouter } from 'react-router-dom';

import CollapsibleDropdown from './CollapsibleDropdown';
import type { InterfaceCollapsibleDropdown } from './CollapsibleDropdown';
import { store } from 'state/store';
import { Provider } from 'react-redux';
import { I18nextProvider } from 'react-i18next';
import i18nForTest from 'utils/i18nForTest';

jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
Expand Down Expand Up @@ -41,7 +45,11 @@ describe('Testing CollapsibleDropdown component', () => {
test('Component should be rendered properly', () => {
render(
<BrowserRouter>
<CollapsibleDropdown {...props} />
<Provider store={store}>
<I18nextProvider i18n={i18nForTest}>
<CollapsibleDropdown {...props} />
</I18nextProvider>
</Provider>
</BrowserRouter>,
);
expect(screen.getByText('DropDown Category')).toBeInTheDocument();
Expand All @@ -52,7 +60,11 @@ describe('Testing CollapsibleDropdown component', () => {
test('Dropdown should be rendered and functioning correctly', () => {
render(
<BrowserRouter>
<CollapsibleDropdown {...props} />
<Provider store={store}>
<I18nextProvider i18n={i18nForTest}>
<CollapsibleDropdown {...props} />
</I18nextProvider>
</Provider>
</BrowserRouter>,
);
const parentDropdownBtn = screen.getByTestId('collapsible-dropdown');
Expand Down
6 changes: 4 additions & 2 deletions src/components/CollapsibleDropdown/CollapsibleDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { TargetsType } from 'state/reducers/routesReducer';
import styles from './CollapsibleDropdown.module.css';
import IconComponent from 'components/IconComponent/IconComponent';
import { NavLink, useLocation, useNavigate } from 'react-router-dom';
import { useTranslation } from 'react-i18next';

export interface InterfaceCollapsibleDropdown {
showDropdown: boolean;
Expand All @@ -16,6 +17,7 @@ const collapsibleDropdown = ({
showDropdown,
setShowDropdown,
}: InterfaceCollapsibleDropdown): JSX.Element => {
const { t: tCommon } = useTranslation('common');
const { name, subTargets } = target;
const navigate = useNavigate();
const location = useLocation();
Expand All @@ -42,7 +44,7 @@ const collapsibleDropdown = ({
fill={showDropdown ? 'var(--bs-white)' : 'var(--bs-secondary)'}
/>
</div>
{name}
{tCommon(name)}
<i
className={`ms-auto fa
${showDropdown ? 'var(--bs-white)' : 'var(--bs-secondary)'}
Expand Down Expand Up @@ -72,7 +74,7 @@ const collapsibleDropdown = ({
<div className={styles.iconWrapperSm}>
<i className={`fa ${stringIcon}`} />
</div>
{name}
{tCommon(name || '')}
<div className="ms-auto">
<i
className={`fa me-2 fa-chevron-right ${
Expand Down
2 changes: 1 addition & 1 deletion src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ const leftDrawerOrg = ({
}
/>
</div>
{name}
{tCommon(name)}
</Button>
)}
</NavLink>
Expand Down
Loading