Add typograph to modal content

ekaterinburgdev · Jul 29, 2023 · 66cb7bd · 66cb7bd
1 parent dfd814c
commit 66cb7bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/client/components/Map/Stops/Sidebar/MapStopsSidebar.tsx b/client/components/Map/Stops/Sidebar/MapStopsSidebar.tsx
@@ -13,6 +13,7 @@ import { IconFont } from 'components/UI/Typography/IconFont/IconFont';
 import { StopType } from 'transport-common/types/masstrans';
 
 import styles from './MapStopsSidebar.module.css';
+import t from 'utils/typograph';
 
 export type MapStopsSidebarProps = {
     type: StopType;
@@ -53,7 +54,7 @@ export function MapStopsSidebar({ type, name }: MapStopsSidebarProps) {
                                     <IconFont key={t} name={IconFontCharsNames[t]} />
                                 ))}
                         </Typography>
-                        <Typography variant="h3">{name}</Typography>
+                        <Typography variant="h3">{t(name)}</Typography>
                     </div>
                 </div>
                 <Divider />
@@ -73,11 +74,11 @@ export function MapStopsSidebar({ type, name }: MapStopsSidebarProps) {
                                             backgroundColor: VEHICLE_TYPE_COLORS[vehicle.type],
                                         }}
                                     >
-                                        {vehicle.route}
+                                        {t(vehicle.route)}
                                     </div>
                                     <div>
                                         <span className={cn(styles.MapStopsSidebarVehicleEndpoint)}>
-                                            {vehicle.to}
+                                            {t(vehicle.to)}
                                         </span>
                                         {Boolean(vehicle.through.length) && (
                                             <>

diff --git a/client/components/Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx b/client/components/Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx
@@ -4,6 +4,7 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import L from 'leaflet';
 import classNames from 'classnames/bind';
+import t from 'utils/typograph';
 
 import {
     ClientUnit,
@@ -395,7 +396,7 @@ export function MapVehiclesSidebar({
                                         <PageText
                                             className={cn(styles.MapVehiclesSidebarStationName)}
                                         >
-                                            {stop.title}
+                                            {t(stop.title)}
                                         </PageText>
                                         {'arriveTime' in stop && (
                                             <PageText>{stop.arriveTime}</PageText>
@@ -459,10 +460,10 @@ export function MapVehiclesSidebar({
                                                             styles.MapVehiclesSidebarStationName,
                                                         )}
                                                     >
-                                                        {stop.title}
+                                                        {t(stop.title)}
                                                     </PageText>
                                                     {'arriveTime' in stop && (
-                                                        <PageText>{stop.arriveTime}</PageText>
+                                                        <PageText>{t(stop.arriveTime)}</PageText>
                                                     )}
                                                 </li>
                                             ))}
@@ -480,7 +481,7 @@ export function MapVehiclesSidebar({
                                         <PageText
                                             className={cn(styles.MapVehiclesSidebarStationName)}
                                         >
-                                            {endStop.title}
+                                            {t(endStop.title)}
                                         </PageText>
 
                                         {'arriveTime' in endStop && (
@@ -587,7 +588,7 @@ export function MapVehiclesSidebar({
                                                         styles.MapVehiclesSidebarAdditionalTitle,
                                                     )}
                                                 >
-                                                    {unitInfo.model}
+                                                    {t(unitInfo.model)}
                                                 </span>
                                             )}
                                             {Boolean(unitInfo.model && unitInfo.factory) && <br />}
@@ -597,7 +598,7 @@ export function MapVehiclesSidebar({
                                                         styles.MapVehiclesSidebarAdditionalSubitle,
                                                     )}
                                                 >
-                                                    {unitInfo.factory}
+                                                    {t(unitInfo.factory)}
                                                 </span>
                                             )}
                                         </div>