Merge branch 'dev' into release/v8.0.0

TrainLCD · Oct 10, 2024 · a010154 · a010154
2 parents 3da20ce + e9d2c16
commit a010154
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/components/RouteList.tsx b/src/components/RouteList.tsx
@@ -60,9 +60,14 @@ const ItemCell = ({
   }, [currentStation?.groupId, item.stops])
 
   const bottomText = useMemo(() => {
-    return `${item.stops[0]?.name}から${
-      item.stops[item.stops.length - 1]?.name
-    }まで`
+    if (isJapanese) {
+      return `${item.stops[0]?.name}から${
+        item.stops[item.stops.length - 1]?.name
+      }まで`
+    }
+    return `${item.stops[0]?.nameRoman} - ${
+      item.stops[item.stops.length - 1]?.nameRoman
+    }`
   }, [item.stops])
 
   return (

diff --git a/src/components/TrainTypeInfoModal.tsx b/src/components/TrainTypeInfoModal.tsx
@@ -150,7 +150,9 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
                 }}
               >
                 {!loading && stopStations.length
-                  ? stopStations.map((s) => s.name).join('、')
+                  ? stopStations
+                      .map((s) => (isJapanese ? s.name : s.nameRoman))
+                      .join('、')
                   : `${translate('loadingAPI')}...`}
               </Typography>
               <Typography
@@ -202,7 +204,7 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
                       flex: 1,
                     }}
                   >
-                    {l.nameShort}:{' '}
+                    {isJapanese ? l.nameShort : l.nameRoman}:{' '}
                   </Typography>
                   <Typography
                     style={{
@@ -213,7 +215,9 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
                       lineHeight: RFValue(14),
                     }}
                   >
-                    {l.trainType?.name ?? '普通/各駅停車'}
+                    {isJapanese
+                      ? l.trainType?.name ?? '普通/各駅停車'
+                      : l.trainType?.nameRoman ?? 'Local'}
                   </Typography>
                 </View>
               ))}