Skip to content

Commit

Permalink
Merge branch 'dev' into nearby-view-react-to-user-location
Browse files Browse the repository at this point in the history
  • Loading branch information
miles-grant-ibigroup authored May 6, 2024
2 parents 88be9f9 + 5f21292 commit 9971a6c
Show file tree
Hide file tree
Showing 51 changed files with 1,864 additions and 876 deletions.
1,030 changes: 802 additions & 228 deletions __tests__/components/viewers/__snapshots__/nearby-view.js.snap

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,11 @@ exports[`components > viewers > stop viewer should render with initial stop id a
</div>
<styled.div>
<div
className="sc-cjHJky bihPUp"
className="sc-ihmZXn bfHSFP"
>
<styled.div>
<div
className="sc-edoYdd ipgOiu"
className="sc-edoYdd jGAQLh"
>
<h1>
<FormattedMessage
Expand Down
2 changes: 2 additions & 0 deletions example-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,8 @@ itinerary:
# vehicleIconHighlight: true
# # Customize vehicle icon padding (the default iconPadding is 2px in otp-ui)
# vehicleIconPadding: 0
# # Remove vehicles from map that haven't sent an update in this number of seconds
# maxRealtimeVehicleAge: 60
# # Interval for refreshing vehicle positions
# vehiclePositionRefreshSeconds: 30 # defaults to 30 seconds.

Expand Down
31 changes: 18 additions & 13 deletions i18n/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ common:
tuesday: Tuesday
wednesday: Wednesday
daysOfWeekCompact:
friday: Fri.
monday: Mon.
saturday: Sat.
sunday: Sun.
thursday: Thu.
tuesday: Tue.
wednesday: Wed.
friday: F
monday: M
saturday: S
sunday: Su
thursday: Th
tuesday: T
wednesday: W
daysOfWeekPlural:
friday: Fridays
monday: Mondays
Expand Down Expand Up @@ -351,6 +351,7 @@ components:
bikesAvailable: "{bikesAvailable, plural, one {# bike} other {# bikes}} available"
companyBicycle: "{company} Bike"
companyScooter: "{company} Scooter"
distanceAway: "{localizedDistanceString} away"
error: An error occurred loading nearby amenities.
header: Nearby View
nearbyListIntro: List of {count} nearby entities.
Expand Down Expand Up @@ -599,7 +600,8 @@ components:
vehicleName: Vehicle {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: Checking itinerary existence for each day of the week...
selectAtLeastOneDay: Please select at least one day to monitor.
onlyOnDate: Only on {date, date, ::eeeee yyyyMMdd}
recurringEachWeek: On certain days each week
tripDaysPrompt: What days do you take this trip?
tripIsAvailableOnDaysIndicated: Your trip is available on the days of the week as indicated above.
tripNamePrompt: "Please provide a name for this trip:"
Expand Down Expand Up @@ -658,6 +660,9 @@ components:
awaiting: Awaiting calculation...
description: Please wait a bit for the trip to calculate.
heading: Trip not yet calculated
past:
description: This is a one-time trip that occurred in the past.
heading: Trip is in the past
snoozed:
description: Unsnooze trip monitoring to see the updated status.
heading: Trip monitoring is snoozed for today
Expand All @@ -676,11 +681,11 @@ components:
arriveAt: "Arrive at "
leaveAt: "Leave at "
TripSummaryPane:
happensOnDays: "Happens on: <strong>{days}</strong>"
notifications: >-
Notifications: <strong>{leadTimeInMinutes} min. before scheduled
departure</strong>
notificationsDisabled: "Notifications: <strong>Disabled</strong>"
happensOnDays: "Happens on: {days}"
monitoredTripDays: Trip monitored days
notifications: "{leadTimeInMinutes} min. before scheduled departure"
notificationsDisabled: Notifications disabled
timeAndDuration: Trip time and duration
TripTools:
copyLink: Copy Link
header: Trip Tools
Expand Down
24 changes: 11 additions & 13 deletions i18n/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ common:
tuesday: Martes
wednesday: Miércoles
daysOfWeekCompact:
friday: Vie.
monday: Lun.
saturday: Sáb.
sunday: Dom.
thursday: Jue.
tuesday: Mar.
wednesday: Mié.
friday: V
monday: L
saturday: S
sunday: D
thursday: J
tuesday: M
wednesday: X
daysOfWeekPlural:
friday: Viernes
monday: Lunes
Expand Down Expand Up @@ -527,6 +527,7 @@ components:
tripNotFound: No se encontró el viaje
tripNotFoundDescription: Lo sentimos, no se encontró el viaje solicitado.
tripNotifications: Notificaciones de viaje
deleteSavedTrip: Borrar viaje guardado
SavedTripList:
alertTag: "{alerta, plural, one {Ver una alerta} other {Ver # alertas}}"
fromTo: De {from} al {to}
Expand Down Expand Up @@ -617,7 +618,6 @@ components:
vehicleName: Vehículo {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: Comprobación de la existencia de itinerarios para cada día de la semana…
selectAtLeastOneDay: Por favor, seleccione al menos un día para el seguimiento.
tripDaysPrompt: ¿Qué días hace este viaje?
tripIsAvailableOnDaysIndicated: Su viaje está disponible en los días de la semana indicados anteriormente.
tripNamePrompt: "Por favor, indique un nombre para este viaje:"
Expand Down Expand Up @@ -702,11 +702,9 @@ components:
arriveAt: "Llegue a las "
leaveAt: "Salida a las "
TripSummaryPane:
happensOnDays: "Ocurre en: <strong>{days}</strong>"
notifications: >-
Notificaciones: <strong>{leadTimeInMinutes} minutos antes de la salida
programada</strong>
notificationsDisabled: "Notificaciones: <strong>Desactivadas</strong>"
happensOnDays: "Ocurre en: {days}"
notifications: "{leadTimeInMinutes} minutos antes de la salida programada"
notificationsDisabled: Notificaciones desactivadas
TripTools:
copyLink: Copiar enlace
header: Herramientas
Expand Down
33 changes: 19 additions & 14 deletions i18n/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ common:
tuesday: mardi
wednesday: mercredi
daysOfWeekCompact:
friday: ven.
monday: lun.
saturday: sam.
sunday: dim.
thursday: jeu.
tuesday: mar.
wednesday: mer.
friday: V
monday: L
saturday: S
sunday: D
thursday: J
tuesday: M
wednesday: M
daysOfWeekPlural:
friday: vendredis
monday: lundis
Expand Down Expand Up @@ -370,6 +370,7 @@ components:
disponibles}}
companyBicycle: Vélo {company}
companyScooter: Trottinette {company}
distanceAway: à {localizedDistanceString}
error: Erreur lors du chargement des services à proximité.
header: À proximité
nearbyListIntro: Liste de {count} entités à proximité.
Expand Down Expand Up @@ -528,7 +529,7 @@ components:
signInText: Connectez-vous pour enregistrer
signInTooltip: Veuillez vous connecter pour enregistrer ce trajet.
SavedTripEditor:
deleteSavedTrip: Supprimer le trajet enregistré
deleteSavedTrip: Supprimer ce trajet
editSavedTrip: Modifier un trajet enregistré
saveNewTrip: Enregistrer un nouveau trajet
tripInformation: Informations sur le trajet
Expand Down Expand Up @@ -629,7 +630,8 @@ components:
vehicleName: Véhicule {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: Vérification du trajet pour chaque jour de la semaine...
selectAtLeastOneDay: Veuillez choisir au moins un jour pour effectuer le suivi.
onlyOnDate: "{date, date, ::eeeee yyyyMMdd} uniquement"
recurringEachWeek: Certains jours chaque semaine
tripDaysPrompt: Quels jours effectuez-vous ce trajet ?
tripIsAvailableOnDaysIndicated: Votre trajet est possible les jours indiqués ci-dessus.
tripNamePrompt: "Saisissez un nom pour ce trajet :"
Expand Down Expand Up @@ -692,6 +694,9 @@ components:
Veuillez patienter pendant que les conditions du trajet sont
déterminées.
heading: Conditions du trajet indéterminées
past:
description: Le jour de ce trajet non-répété est passé.
heading: Trajet dans le passé
snoozed:
description: Reprenez le suivi pour obtenir des dernières conditions de votre trajet.
heading: Suivi suspendu jusqu'à demain
Expand All @@ -710,11 +715,11 @@ components:
arriveAt: "Arrivée à "
leaveAt: "Partez à "
TripSummaryPane:
happensOnDays: "Effectué : <strong>{days}</strong>"
notifications: >-
Notifications : <strong>{leadTimeInMinutes} mn avant l'heure de départ
prévue</strong>
notificationsDisabled: "Notifications : <strong>Désactivées</strong>"
happensOnDays: "Effectué : {days}"
monitoredTripDays: Jours de suivi de ce trajet
notifications: "{leadTimeInMinutes} mn avant l'heure de départ prévue"
notificationsDisabled: Notifications désactivées
timeAndDuration: Heure et durée du trajet
TripTools:
copyLink: Copier le lien
header: Outils
Expand Down
7 changes: 3 additions & 4 deletions i18n/ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,6 @@ components:
vehicleName: 차량 {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: 각 요일의 트립을 확인 중…
selectAtLeastOneDay: 모니터링하려면 최소 1일 이상을 선택하세요.
tripDaysPrompt: 어느 요일에 이 트립을 사용하시나요?
tripIsAvailableOnDaysIndicated: 트립은 위에 표시된 요일에 제공됩니다.
tripNamePrompt: "이 트립의 이름을 입력하세요:"
Expand Down Expand Up @@ -592,9 +591,9 @@ components:
arriveAt: "도착 "
leaveAt: "출발 "
TripSummaryPane:
happensOnDays: "발생: <strong>{days}</strong>"
notifications: "알림: <strong>출발 예정 시간 {leadTimeInMinutes} 분 전</strong>"
notificationsDisabled: "알림: <strong>비활성화됨</strong>"
happensOnDays: "발생: {days}"
notifications: 출발 예정 시간 {leadTimeInMinutes} 분 전
notificationsDisabled: "알림: 비활성화됨"
TripTools:
copyLink: 링크 복사
header: 도구
Expand Down
9 changes: 3 additions & 6 deletions i18n/ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,6 @@ components:
vehicleName: Транспортное средство {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: Проверка маршрута на каждый день недели…
selectAtLeastOneDay: Для просмотра выберите хотя бы один день.
tripDaysPrompt: В какие дни вы хотите совершать эту поездку?
tripIsAvailableOnDaysIndicated: Поездка доступна для указанных выше дней.
tripNamePrompt: "Укажите имя поездки:"
Expand Down Expand Up @@ -652,11 +651,9 @@ components:
arriveAt: "Прибытие в "
leaveAt: "Оставить "
TripSummaryPane:
happensOnDays: "Проходит в такие дни: <strong>{days}</strong>"
notifications: >-
Уведомления: за <strong>{leadTimeInMinutes} мин до запланированного
времени отправления</strong>
notificationsDisabled: "Уведомления: <strong>отключены</strong>"
happensOnDays: "Проходит в такие дни: {days}"
notifications: за <strong>{leadTimeInMinutes} мин до запланированного времени отправления
notificationsDisabled: "Уведомления: отключены"
TripTools:
copyLink: Скопировать ссылку
header: Инструменты маршрута
Expand Down
9 changes: 3 additions & 6 deletions i18n/tl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,6 @@ components:
vehicleName: Sasakyan {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: Tinitingnan kung may itinerary para sa bawat araw ng linggo...
selectAtLeastOneDay: Pumili ng kahit isang araw lang na susubaybayan.
tripDaysPrompt: Anong mga araw mo ginagawa ang biyaheng ito?
tripIsAvailableOnDaysIndicated: Available ang iyong biyahe sa mga araw ng linggo na nakasaad sa itaas.
tripNamePrompt: "Pangalanan ang biyaheng ito:"
Expand Down Expand Up @@ -670,11 +669,9 @@ components:
arriveAt: "Darating nang "
leaveAt: "Umalis sa "
TripSummaryPane:
happensOnDays: "Mangyayari sa: <strong>{days}</strong>"
notifications: >-
Mga Notification: <strong>{leadTimeInMinutes} (na) minuto bago ang
nakaiskedyul na pag-alis</strong>
notificationsDisabled: "Mga Notification: <strong>Naka-disable</strong>"
happensOnDays: "Mangyayari sa: {days}"
notifications: "{leadTimeInMinutes} (na) minuto bago ang nakaiskedyul na pag-alis"
notificationsDisabled: "Mga Notification: Naka-disable"
TripTools:
copyLink: Kopyahin ang Link
header: Mga Tool sa Biyahe
Expand Down
23 changes: 10 additions & 13 deletions i18n/vi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ common:
tuesday: Thứ ba
wednesday: Thứ tư
daysOfWeekCompact:
friday: Thứ sáu
monday: Thứ hai
saturday: Thứ bảy
sunday: Chủ nhật
thursday: Thứ năm
tuesday: Thứ ba
wednesday: Thứ tư
friday: T6
monday: T2
saturday: T7
sunday: CN
thursday: T5
tuesday: T3
wednesday: T4
daysOfWeekPlural:
friday: Các thứ sáu
monday: Các thứ hai
Expand Down Expand Up @@ -579,7 +579,6 @@ components:
vehicleName: Phương tiện giao thông {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: Kiểm tra sự tồn tại của hành trình cho mỗi ngày trong tuần…
selectAtLeastOneDay: Vui lòng chọn ít nhất một ngày để theo dõi.
tripDaysPrompt: Bạn thực hiện chuyến đi này vào những ngày nào?
tripIsAvailableOnDaysIndicated: Chuyến đi của bạn có sẵn vào những ngày trong tuần như đã nêu ở trên.
tripNamePrompt: "Vui lòng cung cấp tên cho chuyến đi này:"
Expand Down Expand Up @@ -659,11 +658,9 @@ components:
arriveAt: "Đến nơi "
leaveAt: "Rời đi lúc "
TripSummaryPane:
happensOnDays: "Xảy ra vào: <strong>{days}</strong>"
notifications: >-
Thông báo: <strong>{leadTimeInMinutes} phút trước khi khởi hành theo lịch
trình</strong>
notificationsDisabled: "Thông báo: <strong>Đã tắt</strong>"
happensOnDays: "Xảy ra vào: {days}"
notifications: "{leadTimeInMinutes} phút trước khi khởi hành theo lịch trình"
notificationsDisabled: Thông báo đã tắt
TripTools:
copyLink: Sao chép URL
header: Công cụ
Expand Down
7 changes: 3 additions & 4 deletions i18n/zh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ components:
vehicleName: 车辆 {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: 检查一周中每一天的行程存在…
selectAtLeastOneDay: 请至少选择一天进行监测.
tripDaysPrompt: 您这次行程是在哪天进行的?
tripIsAvailableOnDaysIndicated: 您的行程可以在上述一周的日子里进行.
tripNamePrompt: "请为这次旅行提供一个名称:"
Expand Down Expand Up @@ -589,9 +588,9 @@ components:
arriveAt: "到达 "
leaveAt: "离开 "
TripSummaryPane:
happensOnDays: "发生在: <strong>{days}</strong>"
notifications: "通知: <strong>预定出发前 {leadTimeInMinutes} </strong>"
notificationsDisabled: "通知: <strong>已禁用</strong>"
happensOnDays: "发生在: {days}"
notifications: 预定出发前 {leadTimeInMinutes}
notificationsDisabled: "通知: 已禁用"
TripTools:
copyLink: 复制链接
header: 工具
Expand Down
Loading

0 comments on commit 9971a6c

Please sign in to comment.