From c1f50b87193791ec0bb1c7f40d7524debd900939 Mon Sep 17 00:00:00 2001 From: Camille Moussu <66134347+Eriikah@users.noreply.github.com> Date: Thu, 5 Feb 2026 11:05:02 +0100 Subject: [PATCH] [#499] changed russian translations and changed way standalone months are handled (#506) --- src/components/Menubar/Menubar.tsx | 16 +++++-------- src/locales/en.json | 16 +++++++++++++ src/locales/fr.json | 16 +++++++++++++ src/locales/ru.json | 36 +++++++++++++++++++++--------- src/locales/vi.json | 16 +++++++++++++ 5 files changed, 79 insertions(+), 21 deletions(-) diff --git a/src/components/Menubar/Menubar.tsx b/src/components/Menubar/Menubar.tsx index 5ecf280..f858024 100644 --- a/src/components/Menubar/Menubar.tsx +++ b/src/components/Menubar/Menubar.tsx @@ -25,19 +25,11 @@ import ChevronRightIcon from "@mui/icons-material/ChevronRight"; import LogoutIcon from "@mui/icons-material/Logout"; import RefreshIcon from "@mui/icons-material/Refresh"; import SettingsIcon from "@mui/icons-material/Settings"; -import { format } from "date-fns"; -import { - enGB, - fr as frLocale, - ru as ruLocale, - vi as viLocale, -} from "date-fns/locale"; import React, { useEffect, useState } from "react"; import { push } from "redux-first-history"; import { useI18n } from "twake-i18n"; import SearchBar from "./EventSearchBar"; import "./Menubar.styl"; -const dateLocales = { en: enGB, fr: frLocale, ru: ruLocale, vi: viLocale }; export type AppIconProps = { name: string; @@ -151,9 +143,11 @@ export function Menubar({ handleUserMenuClose(); }; - const dateLabel = format(currentDate, "MMMM yyyy", { - locale: dateLocales[lang as keyof typeof dateLocales] || enGB, - }); + // Use i18n for month names instead of date-fns + const monthIndex = currentDate.getMonth(); + const year = currentDate.getFullYear(); + const monthName = t(`months.standalone.${monthIndex}`); + const dateLabel = `${monthName} ${year}`; return ( <> diff --git a/src/locales/en.json b/src/locales/en.json index a303de1..b050570 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -291,5 +291,21 @@ "startTime": "Start Time", "endDate": "End Date", "endTime": "End Time" + }, + "months": { + "standalone": { + "0": "January", + "1": "February", + "2": "March", + "3": "April", + "4": "May", + "5": "June", + "6": "July", + "7": "August", + "8": "September", + "9": "October", + "10": "November", + "11": "December" + } } } diff --git a/src/locales/fr.json b/src/locales/fr.json index 2658037..ba412e9 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -292,5 +292,21 @@ "startTime": "Heure du début", "endDate": "Date de la fin", "endTime": "Heure de la fin" + }, + "months": { + "standalone": { + "0": "Janvier", + "1": "Février", + "2": "Mars", + "3": "Avril", + "4": "Mai", + "5": "Juin", + "6": "Juillet", + "7": "Août", + "8": "Septembre", + "9": "Octobre", + "10": "Novembre", + "11": "Décembre" + } } } diff --git a/src/locales/ru.json b/src/locales/ru.json index 04c2141..5540f4c 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -87,7 +87,7 @@ "hex": "Hex" }, "event": { - "createEvent": "Создать событие", + "createEvent": "Создать", "updateEvent": "Обновить событие", "organizer": "Организатор", "untitled": "Без названия", @@ -133,7 +133,7 @@ "videoMeeting": "Видеовстреча", "meetCopied": "Ссылка на встречу скопирована", "addVisioConference": "Добавить видеоконференцию", - "joinVisioConference": "Присоединиться к видеоконференции", + "joinVisioConference": "Подключиться сейчас", "copyMeetingLink": "Скопировать ссылку на встречу", "removeVideoConference": "Удалить видеоконференцию", "location": "Место", @@ -177,7 +177,7 @@ "peopleSearch": { "label": "Поиск по имени или email", "placeholder": "Введите имя или email", - "availabilityPlaceholder": "Проверить наличие мест", + "availabilityPlaceholder": "Поск людей", "invalidEmail": "%{email} — некорректный адрес", "searchError": "Не удалось загрузить контакты. Попробуйте ещё раз.", "noResults": "Нет результатов", @@ -269,13 +269,13 @@ "yearly": "ежегодно" }, "onDays": { - "MO": "понедельник", - "TU": "вторник", - "WE": "среда", - "TH": "четверг", - "FR": "пятница", - "SA": "суббота", - "SU": "воскресенье" + "MO": "ПН", + "TU": "ВТ", + "WE": "СР", + "TH": "ЧТ", + "FR": "ПТ", + "SA": "СБ", + "SU": "ВС" }, "recurrenceOnDays": "по %{days}", "everyInterval": "каждые %{interval} %{unit}", @@ -292,5 +292,21 @@ "startTime": "Время начала", "endDate": "Дата окончания", "endTime": "Время окончания" + }, + "months": { + "standalone": { + "0": "Январь", + "1": "Февраль", + "2": "Март", + "3": "Апрель", + "4": "Май", + "5": "Июнь", + "6": "Июль", + "7": "Август", + "8": "Сентябрь", + "9": "Октябрь", + "10": "Ноябрь", + "11": "Декабрь" + } } } diff --git a/src/locales/vi.json b/src/locales/vi.json index 2e33a4f..8ae8f63 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -290,5 +290,21 @@ "startTime": "Giờ bắt đầu", "endDate": "Ngày kết thúc", "endTime": "Giờ kết thúc" + }, + "months": { + "standalone": { + "0": "Tháng 1", + "1": "Tháng 2", + "2": "Tháng 3", + "3": "Tháng 4", + "4": "Tháng 5", + "5": "Tháng 6", + "6": "Tháng 7", + "7": "Tháng 8", + "8": "Tháng 9", + "9": "Tháng 10", + "10": "Tháng 11", + "11": "Tháng 12" + } } }