diff --git a/src/features/LexicsStore/helpers/index.tsx b/src/features/LexicsStore/helpers/index.tsx index 76d939f2..449408b4 100644 --- a/src/features/LexicsStore/helpers/index.tsx +++ b/src/features/LexicsStore/helpers/index.tsx @@ -24,7 +24,7 @@ export const readLang = () => { } export const getSuffix = (lang: string) => ( - lang === 'rus' ? 'rus' : 'eng' + lang === 'ru' ? 'rus' : 'eng' ) export const getLexicIds = (ids: Array | LexicsConfig) => ( diff --git a/src/features/LexicsStore/hooks/index.tsx b/src/features/LexicsStore/hooks/index.tsx index 7cdbd463..93199015 100644 --- a/src/features/LexicsStore/hooks/index.tsx +++ b/src/features/LexicsStore/hooks/index.tsx @@ -7,6 +7,7 @@ import { getLexics } from 'requests' import { getLexicIds, mapTranslationsToLocalKeys, + getSuffix, } from 'features/LexicsStore/helpers' import { useLang } from './useLang' @@ -45,6 +46,7 @@ export const useLexics = () => { addLexicsConfig, changeLang, lang, + suffix: getSuffix(lang), translate, } } diff --git a/src/features/Register/components/RegistrationStep/hooks/useCountries.tsx b/src/features/Register/components/RegistrationStep/hooks/useCountries.tsx index aba3a00a..4e919131 100644 --- a/src/features/Register/components/RegistrationStep/hooks/useCountries.tsx +++ b/src/features/Register/components/RegistrationStep/hooks/useCountries.tsx @@ -9,13 +9,15 @@ import map from 'lodash/map' import type { Countries } from 'requests' import { getCountries } from 'requests' -import { useCurrentLang } from 'hooks' +import { useLexicsStore } from 'features/LexicsStore' type Country = { id: number, name: string, } +type Names = 'name_eng' | 'name_rus' + const useCountriesList = () => { const [countries, setCountries] = useState([]) @@ -28,10 +30,10 @@ const useCountriesList = () => { export const useCountries = () => { const countries = useCountriesList() - const lang = useCurrentLang() + const { suffix } = useLexicsStore() const [selectedCountry, setSelectedCountry] = useState(null) - const nameField = `name_${lang}` as 'name_eng' + const nameField = `name_${suffix}` as Names const transformedCountries = useMemo( () => orderBy( diff --git a/src/hooks/index.tsx b/src/hooks/index.tsx index c0595961..44597d75 100644 --- a/src/hooks/index.tsx +++ b/src/hooks/index.tsx @@ -1,3 +1,2 @@ export * from './usePageId' -export * from './useCurrentLang' export * from './useToggle' diff --git a/src/hooks/useCurrentLang.tsx b/src/hooks/useCurrentLang.tsx deleted file mode 100644 index 379b7d19..00000000 --- a/src/hooks/useCurrentLang.tsx +++ /dev/null @@ -1,2 +0,0 @@ -// временно, будем считывать из стора(контекста) лексики -export const useCurrentLang = () => 'eng' diff --git a/src/hooks/usePageId.tsx b/src/hooks/usePageId.tsx index 7d6a8899..3576b38d 100644 --- a/src/hooks/usePageId.tsx +++ b/src/hooks/usePageId.tsx @@ -1 +1,13 @@ -export const usePageId = () => {} +import { useParams } from 'react-router-dom' + +type Params = { + pageId: string, +} + +/** + * Хук возвращает id страницы + */ +export const usePageId = () => { + const { pageId } = useParams() + return Number(pageId) +}