Merge pull request #466 from opentripplanner/dev

Fix Release Oct 5, 2021

Author: binh-dam-ibigroup

i18n/en-US.yml

@@ -113,7 +113,7 @@ components:
     next: Next
     previous: Previous
   RealtimeAnnotation:
-    ignoreServiceDelays: Apply service delays
+    applyServiceDelays: Apply service delays
     delaysNotShownInResults: "Your trip results are currently being affected by service delays.
       These delays do not factor into travel times shown below."
     delaysShownInResults: "Your trip results have been adjusted based on real-time

i18n/fr-FR.yml

@@ -88,7 +88,7 @@ components:
     next: Suivant
     previous: Précédent
   RealtimeAnnotation:
-    ignoreServiceDelays: Appliquer les retards
+    applyServiceDelays: Appliquer les retards
     delaysNotShownInResults: "Vos trajets recherchés sont perturbés par des retards.
       Ces retards ne sont pas pris en compte dans les temps de trajet ci-dessous."
     delaysShownInResults: "Vos trajets recherchés ont été mis à jour avec les conditions en temps réel.

lib/components/app/default-main-panel.js

@@ -26,6 +26,7 @@ class DefaultMainPanel extends Component {
         <div style={{
           bottom: showPlanTripButton ? 55 : 0,
           left: 0,
+          overflowY: 'auto',
           paddingBottom: 15,
           position: 'absolute',
           right: 0,

lib/components/app/responsive-webapp.js

@@ -390,7 +390,7 @@ class RouterWrapperWithAuth0 extends Component {
       showLoginError
     } = this.props
 
-    const router = (
+    const router = localizedMessages && (
       <ComponentContext.Provider value={components}>
         <IntlProvider
           defaultLocale={defaultLocale}

package.json

@@ -33,27 +33,27 @@
   "homepage": "https://github.com/opentripplanner/otp-react-redux#readme",
   "dependencies": {
     "@auth0/auth0-react": "^1.1.0",
-    "@opentripplanner/base-map": "^1.2.0",
-    "@opentripplanner/core-utils": "^3.2.3",
-    "@opentripplanner/endpoints-overlay": "^1.2.0",
-    "@opentripplanner/from-to-location-picker": "^1.2.1",
+    "@opentripplanner/base-map": "^2.0.0",
+    "@opentripplanner/core-utils": "^4.1.0",
+    "@opentripplanner/endpoints-overlay": "^1.3.0",
+    "@opentripplanner/from-to-location-picker": "^1.3.0",
     "@opentripplanner/geocoder": "^1.1.1",
     "@opentripplanner/humanize-distance": "^1.1.0",
-    "@opentripplanner/icons": "^1.1.0",
-    "@opentripplanner/itinerary-body": "^2.3.1",
+    "@opentripplanner/icons": "^1.2.0",
+    "@opentripplanner/itinerary-body": "^2.4.0",
     "@opentripplanner/location-field": "^1.6.1",
-    "@opentripplanner/location-icon": "^1.3.0",
-    "@opentripplanner/park-and-ride-overlay": "^1.2.0",
-    "@opentripplanner/printable-itinerary": "^1.2.0",
-    "@opentripplanner/route-viewer-overlay": "^1.1.0",
-    "@opentripplanner/stop-viewer-overlay": "^1.1.0",
-    "@opentripplanner/stops-overlay": "^3.2.0",
-    "@opentripplanner/transit-vehicle-overlay": "^2.2.0",
-    "@opentripplanner/transitive-overlay": "^1.1.1",
-    "@opentripplanner/trip-details": "^1.3.1",
-    "@opentripplanner/trip-form": "^1.3.1",
-    "@opentripplanner/trip-viewer-overlay": "^1.1.0",
-    "@opentripplanner/vehicle-rental-overlay": "^1.2.0",
+    "@opentripplanner/location-icon": "^1.4.0",
+    "@opentripplanner/park-and-ride-overlay": "^1.2.2",
+    "@opentripplanner/printable-itinerary": "^1.3.0",
+    "@opentripplanner/route-viewer-overlay": "^1.1.1",
+    "@opentripplanner/stop-viewer-overlay": "^1.1.1",
+    "@opentripplanner/stops-overlay": "^3.3.1",
+    "@opentripplanner/transit-vehicle-overlay": "^2.3.1",
+    "@opentripplanner/transitive-overlay": "^1.1.2",
+    "@opentripplanner/trip-details": "^1.4.0",
+    "@opentripplanner/trip-form": "^1.4.0",
+    "@opentripplanner/trip-viewer-overlay": "^1.1.1",
+    "@opentripplanner/vehicle-rental-overlay": "^1.2.1",
     "blob-stream": "^0.1.3",
     "bootstrap": "^3.3.7",
     "bowser": "^1.9.3",