Ryan/Reactive-Resume
1
0
Fork 0
mirror of https://github.com/AmruthPillai/Reactive-Resume.git synced 2025-11-17 18:21:28 +10:00
Code Issues Packages Projects Releases Wiki Activity

Remove useTranslation hook from util functions

Browse Source
This commit is contained in:
Rob Gries
2020-10-02 18:17:48 +00:00
parent 1c25ffe037
commit 370de9ec47
5 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/builder/lists/List.js
View File

@ -21,7 +21,7 @@ const List = ({
hasDate,
event,
}) => {
const { i18n } = useTranslation();
const { t, i18n } = useTranslation();
const items = useSelector(path, []);
const { emitter } = useContext(ModalContext);
@ -49,7 +49,7 @@ const List = ({
startDate: x.startDate,
endDate: x.endDate,
language: i18n.language,
}))
}, t))
}
text={text || get(x, textPath, '')}
onEdit={() => handleEdit(x)}

2
src/modals/DataModal.js
View File

@ -85,7 +85,7 @@ const DataModal = ({
};
const getTitle = isEmpty(title)
? getModalText(isEditMode, name)
? getModalText(isEditMode, name, t)
: isEditMode
? title.edit
: title.create;

10
src/templates/blocks/Education/EducationA.js
View File

@ -1,9 +1,12 @@
import React, { memo, useContext } from 'react';
import { useTranslation } from 'react-i18next';
import ReactMarkdown from 'react-markdown';
import PageContext from '../../../contexts/PageContext';
import { formatDateRange, safetyCheck } from '../../../utils';
const EducationItem = ({ item, language }) => (
const EducationItem = ({ item, language }) => {
const { t } = useTranslation();
return (
<div>
<div className="flex justify-between items-center">
<div className="flex flex-col text-left mr-2">
@ -20,7 +23,7 @@ const EducationItem = ({ item, language }) => (
startDate: item.startDate,
endDate: item.endDate,
language,
})}
}, t)}
)
</h6>
)}
@ -31,7 +34,8 @@ const EducationItem = ({ item, language }) => (
<ReactMarkdown className="markdown mt-2 text-sm" source={item.summary} />
)}
</div>
);
);
};
const EducationA = () => {
const { data, heading: Heading } = useContext(PageContext);

10
src/templates/blocks/Work/WorkA.js
View File

@ -1,9 +1,12 @@
import React, { memo, useContext } from 'react';
import { useTranslation } from 'react-i18next';
import ReactMarkdown from 'react-markdown';
import PageContext from '../../../contexts/PageContext';
import { formatDateRange, safetyCheck } from '../../../utils';
const WorkItem = ({ item, language }) => (
const WorkItem = ({ item, language }) => {
const { t } = useTranslation();
return (
<div>
<div className="flex justify-between items-center">
<div className="flex flex-col text-left mr-2">
@ -17,7 +20,7 @@ const WorkItem = ({ item, language }) => (
startDate: item.startDate,
endDate: item.endDate,
language,
})}
}, t)}
)
</h6>
)}
@ -26,7 +29,8 @@ const WorkItem = ({ item, language }) => (
<ReactMarkdown className="markdown mt-2 text-sm" source={item.summary} />
)}
</div>
);
);
};
const WorkA = () => {
const { data, heading: Heading } = useContext(PageContext);

7
src/utils/index.js
View File

@ -1,9 +1,7 @@
import dayjs from 'dayjs';
import { get, isEmpty } from 'lodash';
import { useTranslation } from 'react-i18next';
export const getModalText = (isEditMode, type) => {
const { t } = useTranslation();
export const getModalText = (isEditMode, type, t) => {
return isEditMode
? `${t('shared.buttons.edit')} ${type}`
: `${t('shared.buttons.add')} ${type}`;
@ -26,8 +24,7 @@ export const formatDate = ({ date, language = 'en' }) => {
return dayjs(date).locale(language.substr(0, 2)).format('MMMM YYYY');
};
export const formatDateRange = ({ startDate, endDate, language = 'en' }) => {
const { t } = useTranslation();
export const formatDateRange = ({ startDate, endDate, language = 'en' }, t) => {
const start = `${dayjs(startDate)
.locale(language.substr(0, 2))
.format('MMMM YYYY')}`;