diff --git a/src/pages/Course/Landing/ProgramBlocs/Description/Description.tsx b/src/pages/Course/Landing/ProgramBlocs/Description/Description.tsx
index 1b4919f5..d6b29953 100644
--- a/src/pages/Course/Landing/ProgramBlocs/Description/Description.tsx
+++ b/src/pages/Course/Landing/ProgramBlocs/Description/Description.tsx
@@ -22,7 +22,7 @@ function Description(props: IProps) {
{(id, className) => (
- {t(`title:${props.data.type}`)}
+ {t(`title.${props.data.type}`)}
)}
diff --git a/src/pages/Course/Landing/ProgramBlocs/Modules/Modules.tsx b/src/pages/Course/Landing/ProgramBlocs/Modules/Modules.tsx
index 90184f8e..376614b6 100644
--- a/src/pages/Course/Landing/ProgramBlocs/Modules/Modules.tsx
+++ b/src/pages/Course/Landing/ProgramBlocs/Modules/Modules.tsx
@@ -27,9 +27,9 @@ function Modules(props: IProps) {
{t('title')}
{}
-
{t('videosNumber', { count: videosNumber })}
-
{t('homeworksNumber', { count: homeworksNumber })}
-
{t(`duration:${duration.unit}`, { count: duration.value })}
+
{t('videosNumber.p', { count: videosNumber })}
+
{t('homeworksNumber.p', { count: homeworksNumber })}
+
{t(`duration.${duration.unit}.p`, { count: duration.value })}
{t('feedback')}
{t('chat')}
diff --git a/src/pages/Course/Landing/ProgramIntro/ProgramIntro.tsx b/src/pages/Course/Landing/ProgramIntro/ProgramIntro.tsx
index 0f356778..ddd8d7b6 100644
--- a/src/pages/Course/Landing/ProgramIntro/ProgramIntro.tsx
+++ b/src/pages/Course/Landing/ProgramIntro/ProgramIntro.tsx
@@ -22,7 +22,7 @@ function ProgramIntro(props: IProps) {
t('datesInfoLabel', {
startDate: formatDate(startDate, { timeZone: 'Europe/Moscow' }),
durationInUnits: duration.value,
- unitPlural: i18n.t(duration.unit, { count: duration.value }),
+ unit: duration.unit,
}),
!creditPrice && !discontDeadline && t('free'),
].filter(Boolean);
diff --git a/src/shared/translations.ts b/src/shared/translations.ts
index 8ce03515..ee480152 100644
--- a/src/shared/translations.ts
+++ b/src/shared/translations.ts
@@ -1,36 +1,56 @@
-import { I18n, TranslateOptions } from 'i18n-js';
+import i18next, { TFunction } from 'i18next';
import ru from 'assets/translations/ru.json';
-const i18n = new I18n({ ru });
-i18n.defaultLocale = 'ru';
-i18n.locale = 'ru';
-
-i18n.pluralization.register('ru', (_i18n, count) => {
- const mod10 = count % 10;
- const mod100 = count % 100;
- let key;
-
- const one = mod10 === 1 && mod100 !== 11;
- const few = [2, 3, 4].includes(mod10) && ![12, 13, 14].includes(mod100);
- const many =
- mod10 === 0 ||
- [5, 6, 7, 8, 9].includes(mod10) ||
- [11, 12, 13, 14].includes(mod100);
-
- if (one) {
- key = 'one';
- } else if (few) {
- key = 'few';
- } else if (many) {
- key = 'many';
- } else {
- key = 'other';
+i18next.init({
+ lng: 'ru',
+ fallbackLng: 'ru',
+ debug: true,
+ resources: {
+ ru: {
+ translation: ru,
+ }
}
-
- return [key];
});
-const formatI18nT = (keyStart: string) => (keyEnd: string, options?: TranslateOptions ) => i18n.t(`${keyStart}.${keyEnd}`, options);
+// const i18n = new I18n({ ru });
+// i18n.defaultLocale = 'ru';
+// i18n.locale = 'ru';
+
+// i18n.pluralization.register('ru', (_i18n, count) => {
+// const mod10 = count % 10;
+// const mod100 = count % 100;
+// let key;
+
+// const one = mod10 === 1 && mod100 !== 11;
+// const few = [2, 3, 4].includes(mod10) && ![12, 13, 14].includes(mod100);
+// const many =
+// mod10 === 0 ||
+// [5, 6, 7, 8, 9].includes(mod10) ||
+// [11, 12, 13, 14].includes(mod100);
+
+// if (one) {
+// key = 'one';
+// } else if (few) {
+// key = 'few';
+// } else if (many) {
+// key = 'many';
+// } else {
+// key = 'other';
+// }
+
+// return [key];
+// });
+
+const s = i18next.t;
+type Ttargs = Parameters
;
+const formatI18nT = (keyStart: string) => (...args: Ttargs) => {
+ const keyEnd = args[0] as string | string[];
+ const [, ...restArgs] = args;
+ const key = [keyStart, ...(typeof keyEnd === 'string' ? [keyEnd] : keyEnd)].join('.');
+ return i18next.t(key, ...restArgs);
+}
+
+const i18n = i18next;
export { i18n, formatI18nT };