Merge branch 'dev' into allow-more-styling

# Conflicts:
#	package.json
#	yarn.lock

__tests__/reducers/__snapshots__/create-otp-reducer.js.snap

@@ -23,23 +23,13 @@ Object {
     "transitOperators": Array [],
   },
   "currentQuery": Object {
-    "bikeSpeed": 3.58,
     "date": "2019-08-04",
     "departArrive": "NOW",
-    "endTime": "09:00",
-    "from": null,
     "intermediatePlaces": Array [],
-    "maxBikeTime": 20,
-    "maxEScooterDistance": 4828,
-    "maxWalkTime": 15,
     "mode": "WALK,TRANSIT",
     "numItineraries": 3,
     "routingType": "ITINERARY",
-    "startTime": "07:00",
     "time": "19:34",
-    "to": null,
-    "watts": 250,
-    "wheelchair": false,
   },
   "filter": Object {
     "sort": Object {

__tests__/reducers/__snapshots__/create-user-reducer.js.snap

@@ -11,18 +11,10 @@ Object {
   },
   "localUser": Object {
     "defaults": Object {
-      "bikeSpeed": 3.58,
-      "endTime": "09:00",
       "intermediatePlaces": Array [],
-      "maxBikeTime": 20,
-      "maxEScooterDistance": 4828,
-      "maxWalkTime": 15,
       "mode": "WALK,TRANSIT",
       "numItineraries": 3,
       "routingType": "ITINERARY",
-      "startTime": "07:00",
-      "watts": 250,
-      "wheelchair": false,
     },
     "favoriteStops": Array [],
     "recentPlaces": Array [],

__tests__/util/api.ts

@@ -0,0 +1,16 @@
+import { getDefaultQuery } from '../../lib/util/api'
+
+describe('util > aoi', () => {
+  describe('getDefaultQuery', () => {
+    it('initializes numItineraries from config', () => {
+      const config = {
+        modes: {
+          numItineraries: 5
+        }
+      }
+      expect(getDefaultQuery(config).numItineraries).toBe(5)
+
+      expect(getDefaultQuery({}).numItineraries).toBe(3)
+    })
+  })
+})

example-config.yml

@@ -223,6 +223,8 @@ geocoder:
 
 # Use this mode config for the enhanced Transit+ config
 modes:
+  ### Optional number of itineraries to return by default - Defaults to 3.
+  # numItineraries: 3
   # Definition for the mode buttons to display in trip form
   modeButtons:
     - iconName: bus
@@ -339,6 +341,8 @@ itinerary:
   # Whether the plan first/previous/next/last buttons should be shown along with
   # plan trip itineraries.
   showPlanFirstLastButtons: false
+  # adds the 'about' and '~' prefixes to the duration of non transit legs and trip details panel
+  showApproximatePrefixAccessLegs: false
   # Show all walking legs regardless of distance
   showAllWalkLegs: false
   # Filters out trips returned by OTP by default, unless specifically requested.
@@ -611,8 +615,15 @@ itinerary:
 #   vi:
 #     name: Tiếng Việt
 
-#   zh:
-#     name: 中国人
+#   # Chinese (Simplified) must be entered using 'zh-Hans',
+#   # or, if no other Chinese language is defined, using 'zh'.
+#   zh-Hans:
+#     name: 汉语
+
+#   # Chinese (Traditional) must be entered using 'zh-Hant'.
+#   # If Chinese (Simplified) is also used, it must be defined as 'zh-Hans'
+#   zh-Hant:
+#     name: 漢語
 
 #   es:
 #     name: Español

i18n/es.yml

@@ -364,6 +364,7 @@ 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.
@@ -449,6 +450,9 @@ components:
       minutos.
     verified: Verificado
     verify: Verificar
+    verifySms: >-
+      Por favor, complete el proceso de verificación para configurar las
+      notificaciones por SMS.
   Place:
     deleteThisPlace: Borrar este lugar
     enterAlert: >
@@ -702,8 +706,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
   TripTools:
     copyLink: Copiar enlace
     header: Herramientas