diff --git a/src/components/common/Audio.tsx b/src/components/common/Audio.tsx index 60a38ef6c..454cbce7c 100644 --- a/src/components/common/Audio.tsx +++ b/src/components/common/Audio.tsx @@ -27,7 +27,7 @@ import useMediaWithDownloadProgress from '../../hooks/useMediaWithDownloadProgre import useShowTransition from '../../hooks/useShowTransition'; import useBuffering from '../../hooks/useBuffering'; import useAudioPlayer from '../../hooks/useAudioPlayer'; -import useLang from '../../hooks/useLang'; +import useLang, { LangFn } from '../../hooks/useLang'; import Button from '../ui/Button'; import ProgressSpinner from '../ui/ProgressSpinner'; @@ -177,7 +177,7 @@ const Audio: FC = ({ onDateClick!(message.id, message.chatId); }, [onDateClick, message.id, message.chatId]); - useLang(); + const lang = useLang(); function getFirstLine() { if (isVoice) { @@ -245,7 +245,7 @@ const Audio: FC = ({ className="date" onClick={handleDateClick} > - {formatPastTimeShort(date * 1000)} + {formatPastTimeShort(lang, date * 1000)} )} @@ -293,7 +293,7 @@ const Audio: FC = ({ )} {renderingFor === 'searchResult' && renderSearchResult()} {renderingFor !== 'searchResult' && audio && renderAudio( - audio, isPlaying, playProgress, bufferedProgress, seekHandlers, date, + lang, audio, isPlaying, playProgress, bufferedProgress, seekHandlers, date, onDateClick ? handleDateClick : undefined, )} {renderingFor !== 'searchResult' && voice && renderVoice(voice, renderedWaveform, isMediaUnread)} @@ -302,6 +302,7 @@ const Audio: FC = ({ }; function renderAudio( + lang: LangFn, audio: ApiAudio, isPlaying: boolean, playProgress: number, @@ -327,7 +328,7 @@ function renderAudio( {' '} • {' '} - {formatMediaDateTime(date * 1000)} + {formatMediaDateTime(lang, date * 1000)} )} diff --git a/src/components/common/Avatar.tsx b/src/components/common/Avatar.tsx index 4a79a82b3..aa68be26c 100644 --- a/src/components/common/Avatar.tsx +++ b/src/components/common/Avatar.tsx @@ -54,7 +54,7 @@ const Avatar: FC = ({ const dataUri = useMedia(imageHash, false, ApiMediaFormat.DataUri, lastSyncTime); const { shouldRenderFullMedia, transitionClassNames } = useTransitionForMedia(dataUri, 'slow'); - useLang(); + const lang = useLang(); let content: string | undefined = ''; @@ -68,7 +68,7 @@ const Avatar: FC = ({ const userFullName = getUserFullName(user); content = userFullName ? getFirstLetters(userFullName, 2) : undefined; } else if (chat) { - const title = getChatTitle(chat); + const title = getChatTitle(lang, chat); content = title && getFirstLetters(title, isChatPrivate(chat.id) ? 2 : 1); } else if (text) { content = getFirstLetters(text, 2); diff --git a/src/components/common/CalendarModal.tsx b/src/components/common/CalendarModal.tsx index 7c6c28258..e70057b16 100644 --- a/src/components/common/CalendarModal.tsx +++ b/src/components/common/CalendarModal.tsx @@ -7,6 +7,7 @@ import { formatMonthAndYear, formatHumanDate, formatTime, } from '../../util/dateFormat'; import { IS_MOBILE_SCREEN } from '../../util/environment'; +import useLang, { LangFn } from '../../hooks/useLang'; import Modal from '../ui/Modal'; import Button from '../ui/Button'; @@ -42,6 +43,7 @@ const CalendarModal: FC = ({ onSubmit, onSecondButtonClick, }) => { + const lang = useLang(); const now = new Date(); const defaultSelectedDate = useMemo(() => (selectedAt ? new Date(selectedAt) : new Date()), [selectedAt]); const maxDate = maxAt ? new Date(maxAt) : undefined; @@ -181,7 +183,7 @@ const CalendarModal: FC = ({

- {formatMonthAndYear(selectedDate, IS_MOBILE_SCREEN)} + {formatMonthAndYear(lang, selectedDate, IS_MOBILE_SCREEN)}

{secondButtonLabel && (