Skip to content

Commit

Permalink
Merge branch 'dev' into middleware-graphql
Browse files Browse the repository at this point in the history
  • Loading branch information
binh-dam-ibigroup committed Sep 4, 2024
2 parents ad5a491 + c4dfc9e commit d839208
Show file tree
Hide file tree
Showing 48 changed files with 1,133 additions and 934 deletions.
694 changes: 423 additions & 271 deletions __tests__/components/viewers/__snapshots__/nearby-view.js.snap

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions example-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ map:
initLat: 45.52
initLon: -122.682
# autoFlyOnTripFormUpdate: false
# navigationControlPosition: "bottom-right"
baseLayers:
- name: Streets
# These tiles are free to use, but not in production
Expand Down Expand Up @@ -408,6 +409,8 @@ itinerary:
previewOverlay: false
# Whether to add a OTP_RR_A11Y_ROUTING_ENABLED error to all itineraries with accessibility scores
displayA11yError: false
# Whether to display itinerary info in the side of the preview or next to the departure times
showInlineItinerarySummary: false
# The sort option to use by default
# Available sort options: 'BEST', 'DURATION', 'ARRIVALTIME', 'WALKTIME', 'COST', 'DEPARTURETIME'
# defaultSort: "BEST" # Default
Expand All @@ -421,6 +424,8 @@ itinerary:
# - 'WALKTIME'
# - 'COST'
# - 'DEPARTURETIME'
# In the batch itinerary UI, this setting will always show both departure/arrival times
alwaysShowBothTimes: false

# The transitOperators key is a list of transit operators that can be used to
# order transit agencies when sorting by route. Also, this can optionally
Expand Down
7 changes: 5 additions & 2 deletions i18n/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ common:
noItineraryToDisplay: No itinerary to display.
relativeCo2: |
{co2} {isMore, select, true {more} other {less} } CO₂ than driving alone
timeStartEnd: "{start} – {end}"
transfers: "{transfers, plural, =0 {} one {# transfer} other {# transfers}}"
linkOpensNewWindow: (Opens new window)
modes:
Expand Down Expand Up @@ -273,13 +274,15 @@ components:
park-and-ride: Park & Ride Locations
satellite: Satellite
shared-vehicles: Shared Vehicles
stations: Transit Stations
stops: Transit Stops
streets: Streets
MapillaryFrame:
title: Imagery of the street
MetroUI:
arriveAt: You arrive
itineraryDescription: "{time} itinerary using {routes}"
itinerarySummary: from {stopName} | {cost}
leaveAt: You leave
multipleOptions: Multiple Options
orAlternatives: or other routes in the same direction
Expand Down Expand Up @@ -672,8 +675,8 @@ components:
tripBegins: >-
Trip is due to begin at {tripStart, time, short}. (Realtime monitoring
will begin at {monitoringStart, time, short}.)
tripStartIsDelayed: Trip start time is delayed ${duration}!
tripStartIsEarly: Trip start time is happening ${duration} earlier than expected!
tripStartIsDelayed: Trip start time is delayed {duration}!
tripStartIsEarly: Trip start time is happening {duration} earlier than expected!
tripStartsSoonNoUpdates: Trip is starting soon (no realtime updates available).
tripStartsSoonOnTime: Trip is starting soon and is about on time.
TripSummary:
Expand Down
40 changes: 15 additions & 25 deletions i18n/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ actions:
No se puede guardar el plan: este plan no se pudo guardar debido a la
falta de capacidad en uno o más vehículos. Por favor, vuelva a planificar
su viaje.
maxTripRequestsExceeded: Número de solicitudes de viaje superadas sin resultados
válidos
maxTripRequestsExceeded: Número de solicitudes de viaje superadas sin resultados válidos
saveItinerariesError: "No se pudieron guardar los itinerarios: {err}"
setDateError: "Error al establecer la fecha:"
setGroupSizeError: "No se pudo establecer el tamaño del grupo:"
Expand All @@ -53,13 +52,10 @@ actions:
authTokenError: Error al obtener un token de autorización.
confirmDeleteMonitoredTrip: ¿Desea eliminar este viaje?
confirmDeletePlace: ¿Quiere eliminar este lugar?
emailVerificationResent: El mensaje de verificación de correo electrónico ha sido
reenviado.
emailVerificationResent: El mensaje de verificación de correo electrónico ha sido reenviado.
genericError: "Se ha encontrado un error: {err}"
itineraryExistenceCheckFailed: Comprobación de errores para ver si el viaje seleccionado
es posible.
mustAcceptTermsToSavePlace: Acepte los Términos de uso (en Mi Cuenta) para guardar
las ubicaciones.
itineraryExistenceCheckFailed: Comprobación de errores para ver si el viaje seleccionado es posible.
mustAcceptTermsToSavePlace: Acepte los Términos de uso (en Mi Cuenta) para guardar las ubicaciones.
mustBeLoggedInToSavePlace: Por favor, inicia la sesión para guardar las ubicaciones.
placeRemembered: La configuración de este lugar se ha guardado.
preferencesSaved: Sus preferencias se han guardado.
Expand Down Expand Up @@ -212,8 +208,7 @@ components:
a incluir el transporte publico en la selección de modos.
origin: origen
planTripTooltip: Planificar viaje
validationMessage: "Por favor, defina los siguientes campos para planificar un
viaje: {issues}"
validationMessage: "Por favor, defina los siguientes campos para planificar un viaje: {issues}"
BeforeSignInScreen:
mainTitle: Iniciando sesión
message: >
Expand Down Expand Up @@ -369,12 +364,12 @@ components:
disponibles}}
companyBicycle: Bicicleta {company}
companyScooter: Scooter {company}
distanceAway: "{localizedDistanceString} de distancia"
error: Se ha producido un error al cargar los servicios cercanos.
header: Ver cerca
nearbyListIntro: Lista de {count} entidades cercanas.
nothingNearby: No ubicaciónes cercanas.
spacesAvailable: "{spacesAvailable} espacios libres disponibles"
distanceAway: '{localizedDistanceString} de distancia'
NewAccountWizard:
createNewAccount: Crear una nueva cuenta
finish: ¡Configuración de la cuenta completa!
Expand Down Expand Up @@ -455,7 +450,8 @@ components:
minutos.
verified: Verificado
verify: Verificar
verifySms: Por favor, complete el proceso de verificación para configurar las
verifySms: >-
Por favor, complete el proceso de verificación para configurar las
notificaciones por SMS.
Place:
deleteThisPlace: Borrar este lugar
Expand Down Expand Up @@ -562,8 +558,7 @@ components:
header: ¡La sesión está a punto de terminar!
keepSession: Continuar sesión
SimpleRealtimeAnnotation:
usingRealtimeInfo: Este viaje utiliza información de tráfico y retrasos en tiempo
real
usingRealtimeInfo: Este viaje utiliza información de tráfico y retrasos en tiempo real
StackedPaneDisplay:
savePreferences: Guardar preferencias
StopScheduleTable:
Expand Down Expand Up @@ -625,18 +620,15 @@ components:
travelingAt: Viajando a {milesPerHour}
vehicleName: Vehículo {vehicleNumber}
TripBasicsPane:
checkingItineraryExistence: Comprobación de la existencia de itinerarios para
cada día de la semana…
checkingItineraryExistence: Comprobación de la existencia de itinerarios para cada día de la semana…
tripDaysPrompt: ¿Qué días hace este viaje?
tripIsAvailableOnDaysIndicated: Su viaje está disponible en los días de la semana
indicados anteriormente.
tripIsAvailableOnDaysIndicated: Su viaje está disponible en los días de la semana indicados anteriormente.
tripNamePrompt: "Por favor, indique un nombre para este viaje:"
tripNotAvailableOnDay: El viaje no está disponible el {repeatedDay}
unsavedChangesExistingTrip: >-
Todavía no ha guardado su viaje. Si abandona la página, los cambios se
perderán.
unsavedChangesNewTrip: Todavía no ha guardado su nuevo viaje. Si abandona la página,
se perderá.
unsavedChangesNewTrip: Todavía no ha guardado su nuevo viaje. Si abandona la página, se perderá.
TripNotificationsPane:
advancedSettings: Configuración avanzada
altRouteRecommended: Se recomienda una ruta alternativa o un punto de transferencia
Expand Down Expand Up @@ -701,10 +693,8 @@ components:
tripBegins: >-
El viaje debe comenzar a las {tripStart, time, short}. (El seguimiento
en tiempo real comenzará a las {monitoringStart, time, short}.)
tripStartIsDelayed: ¡La hora de inicio del viaje se retrasa ${duration}!
tripStartIsEarly: >-
¡La hora de inicio del viaje se produce ${duration} antes de lo
previsto!
tripStartIsDelayed: ¡La hora de inicio del viaje se retrasa {duration}!
tripStartIsEarly: ¡La hora de inicio del viaje se produce {duration} antes de lo previsto!
tripStartsSoonNoUpdates: >-
El viaje comienza pronto (no hay actualizaciones disponibles en tiempo
real).
Expand All @@ -714,10 +704,10 @@ components:
leaveAt: "Salida a las "
TripSummaryPane:
happensOnDays: "Ocurre en: {days}"
monitoredTripDays: Días de viaje monitoreados
notifications: "{leadTimeInMinutes} minutos antes de la salida programada"
notificationsDisabled: Notificaciones desactivadas
timeAndDuration: Tiempo y duración del viaje
monitoredTripDays: Días de viaje monitoreados
TripTools:
copyLink: Copiar enlace
header: Herramientas
Expand Down
7 changes: 5 additions & 2 deletions i18n/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ common:
noItineraryToDisplay: Aucun trajet à afficher.
relativeCo2: |
{co2} de CO₂ en {isMore, select, true {plus} other {moins} } qu'en voiture
timeStartEnd: "{start} – {end}"
transfers: >-
{transfers, plural, =0 {} one {# correspondance} other {#
correspondances}}
Expand Down Expand Up @@ -290,13 +291,15 @@ components:
park-and-ride: Parcs relais
satellite: Satellite
shared-vehicles: Véhicules en partage
stations: Arrêts et stations
stops: Arrêts et stations
streets: Plan des rues
MapillaryFrame:
title: Vue panoramique
MetroUI:
arriveAt: Vous arrivez à
itineraryDescription: Trajet de {time} par les lignes {routes}
itinerarySummary: Partez à {stopName} | {cost}
leaveAt: Partez à
multipleOptions: Plusieurs options
orAlternatives: ou autres lignes dans la même direction
Expand Down Expand Up @@ -706,8 +709,8 @@ components:
tripBegins: >-
Départ prévu à {tripStart, time, short}. (Le suivi en temps réel
débutera à {monitoringStart, time, short}.)
tripStartIsDelayed: Départ retardé de ${duration}.
tripStartIsEarly: Départ avancé de ${duration} !
tripStartIsDelayed: Départ retardé de {duration}.
tripStartIsEarly: Départ avancé de {duration} !
tripStartsSoonNoUpdates: Départ proche (pas de données en temps réel).
tripStartsSoonOnTime: Départ proche et prévu à l'heure.
TripSummary:
Expand Down
4 changes: 2 additions & 2 deletions i18n/ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,8 @@ components:
tripBegins: >-
트립이 {tripStart, time, short}에 시작될 것으로 예정되어 있습니다. (실시간 모니터링은
{monitoringStart, time, short}에 시작됩니다.)
tripStartIsDelayed: 트립 시작 시간이 ${duration} 지연됩니다!
tripStartIsEarly: 트립이 예상보다 ${duration} 일찍 시작됩니다!
tripStartIsDelayed: 트립 시작 시간이 {duration} 지연됩니다!
tripStartIsEarly: 트립이 예상보다 {duration} 일찍 시작됩니다!
tripStartsSoonNoUpdates: 트립이 곧 시작됩니다 (실시간 업데이트를 사용할 수 없습니다).
tripStartsSoonOnTime: 트립은 곧 정시에 시작됩니다.
TripSummary:
Expand Down
4 changes: 2 additions & 2 deletions i18n/ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,8 @@ components:
tripBegins: >-
Поездка должна начаться в {tripStart, time, short}. (Отслеживание в
реальном времени запустится в {monitoringStart, time, short}.)
tripStartIsDelayed: Начало поездки откладывается на ${duration}!
tripStartIsEarly: Начало поездки произойдет на ${duration} раньше ожидаемого!
tripStartIsDelayed: Начало поездки откладывается на {duration}!
tripStartIsEarly: Начало поездки произойдет на {duration} раньше ожидаемого!
tripStartsSoonNoUpdates: Поездка скоро начнется (обновления в реальном времени недоступны).
tripStartsSoonOnTime: Поездка скоро начнется. Без задержек.
TripSummary:
Expand Down
4 changes: 2 additions & 2 deletions i18n/tl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -658,8 +658,8 @@ components:
tripBegins: >-
Magsisimula ang biyahe nang {tripStart, time, short}. (Magsisimula ang
realtime na pagsubaybay nang {monitoringStart, time, short}.)
tripStartIsDelayed: Naantala ang oras ng pagsisimula ng biyahe nang ${duration}!
tripStartIsEarly: Nagsisimula na ang biyahe ${duration} na mas maaga kaysa sa inaasahan!
tripStartIsDelayed: Naantala ang oras ng pagsisimula ng biyahe nang {duration}!
tripStartIsEarly: Nagsisimula na ang biyahe {duration} na mas maaga kaysa sa inaasahan!
tripStartsSoonNoUpdates: >-
Malapit nang magsimula ang biyahe (walang realtime na update na
available).
Expand Down
4 changes: 2 additions & 2 deletions i18n/vi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -647,9 +647,9 @@ components:
tripBegins: >-
Chuyến đi sẽ bắt đầu lúc {tripStart, time, short}. (Việc theo dõi thời
gian thực sẽ bắt đầu lúc {monitoringStart, time, short}.)
tripStartIsDelayed: Thời gian bắt đầu chuyến đi bị trì hoãn ${duration}!
tripStartIsDelayed: Thời gian bắt đầu chuyến đi bị trì hoãn {duration}!
tripStartIsEarly: >-
Thời gian bắt đầu chuyến đi đang diễn ra sớm hơn ${duration} so với dự
Thời gian bắt đầu chuyến đi đang diễn ra sớm hơn {duration} so với dự
kiến!
tripStartsSoonNoUpdates: Chuyến đi đang bắt đầu sớm (không có cập nhật về thời gian thực).
tripStartsSoonOnTime: Chuyến đi đang bắt đầu sớm và sắp đúng giờ.
Expand Down
4 changes: 2 additions & 2 deletions i18n/zh_Hans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -579,8 +579,8 @@ components:
tripBegins: >-
您的行程将于 {tripStart, time, short} 开始. (实时跟踪将于{monitoringStart, time,
short}开始.)
tripStartIsDelayed: 行程开始时间延迟 ${duration}!
tripStartIsEarly: 开始时间比预期早 ${duration}!
tripStartIsDelayed: 行程开始时间延迟 {duration}!
tripStartIsEarly: 开始时间比预期早 {duration}!
tripStartsSoonNoUpdates: 行程即将开始 (没有实时更新).
tripStartsSoonOnTime: 行程即将开始而且大约是准时的.
TripSummary:
Expand Down
Loading

0 comments on commit d839208

Please sign in to comment.