Merge pull request #1062 from opentripplanner/set-locale-on-login

fix(actions/user): Apply persisted preferredLocale on login, if any.

lib/actions/user.js

@@ -16,7 +16,7 @@ import { isBlank } from '../util/ui'
 import { secureFetch } from '../util/middleware'
 import { TRIPS_PATH } from '../util/constants'
 
-import { routeTo } from './ui'
+import { routeTo, setLocale } from './ui'
 import { routingQuery } from './api'
 import { setQueryParam } from './form'
 
@@ -232,7 +232,8 @@ export function fetchTripRequests() {
 /**
  * Updates the redux state with the provided user data, including
  * placing the Home and Work locations at the beginning of the list
- * of saved places for rendering in several UI components.
+ * of saved places for rendering in several UI components,
+ * and applying accessibility and locale settings.
  *
  * Also, fetches monitored trips if requested, i.e. when
  * - initializing the user state with an existing persisted user, or
@@ -248,10 +249,13 @@ function setUser(user, fetchTrips) {
       dispatch(fetchTripRequests())
     }
 
-    const { accessibilityRoutingByDefault } = user
+    const { accessibilityRoutingByDefault, preferredLocale } = user
     if (accessibilityRoutingByDefault !== undefined) {
       dispatch(setQueryParam({ wheelchair: accessibilityRoutingByDefault }))
     }
+    if (!isBlank(preferredLocale)) {
+      dispatch(setLocale(preferredLocale))
+    }
   }
 }
 

lib/components/user/types.ts

@@ -41,6 +41,7 @@ export interface User {
   mobilityProfile?: MobilityProfile
   notificationChannel?: string
   phoneNumber?: string
+  preferredLocale?: string
   pushDevices?: number
   savedLocations?: UserSavedLocation[]
   storeTripHistory?: boolean