Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
bc6a0b3
improvement(active-trip-renderer): Localize component
philip-cline Jul 21, 2021
3b867ef
Merge branch 'react-intl-ramp-up' of https://github.com/opentripplann…
philip-cline Jul 21, 2021
b66a0fd
improvement(base-renderer): Localize Base Renderer
philip-cline Jul 21, 2021
ab18e82
Merge branch 'dev' into react-intl-ramp-up
binh-dam-ibigroup Jul 21, 2021
34de016
style(narrative-itinerary-header): order keys properly
philip-cline Jul 21, 2021
32becd7
style(linting):
philip-cline Jul 21, 2021
e5732d9
refactor(lint): Fix lint errors
binh-dam-ibigroup Jul 21, 2021
a4d07a0
Merge branch 'react-intl-ramp-up' of https://github.com/opentripplann…
binh-dam-ibigroup Jul 21, 2021
60a16bc
refactor(components/user): Localize more user components.
binh-dam-ibigroup Jul 30, 2021
c6c131f
refactor(i18n,NotificationPrefsPane): Localize components
binh-dam-ibigroup Aug 2, 2021
f135b16
refactor(i18n, user): Localize more user settings components.
binh-dam-ibigroup Aug 2, 2021
e25f3b8
refactor(i18n, user): Localize more user components.
binh-dam-ibigroup Aug 2, 2021
8d8928b
refactor(i1un,user): Localize more user settings components.
binh-dam-ibigroup Aug 3, 2021
486e8b2
refactor(ResponsiveWebapp): Initialize locale when laoding other url …
binh-dam-ibigroup Aug 3, 2021
d302718
refactor(NavLoginButton): Localize component.
binh-dam-ibigroup Aug 3, 2021
4b5f8b9
test(create-otp-reducer): Update snapshot
binh-dam-ibigroup Aug 3, 2021
5587e2a
refactor(TripSummary): Localize TripSummary, TripSummaryPane
binh-dam-ibigroup Aug 3, 2021
09664bd
chore(i18n): Match FR entries to EN ones,
binh-dam-ibigroup Aug 3, 2021
49bc428
refactor(TripNotificationPane,TripStatus): Localize components.
binh-dam-ibigroup Aug 4, 2021
45f38ca
chore(i18n/fr-FR): Tweak translation
binh-dam-ibigroup Aug 4, 2021
c10ec99
refactor(base and active renderers): Fix localization of components
philip-cline Aug 5, 2021
6c54a1e
Merge branch 'react-intl-ramp-up' of https://github.com/opentripplann…
philip-cline Aug 5, 2021
aafc05c
chore(narrative-interaries-header): address comments
philip-cline Aug 5, 2021
ec7f684
chore(i18n/fr-FR): Match translation file with en-US.
binh-dam-ibigroup Aug 5, 2021
f8572ec
chore(en-US): address formatting comments
philip-cline Aug 5, 2021
dba7632
Merge branch 'react-intl-ramp-up' of https://github.com/opentripplann…
philip-cline Aug 5, 2021
d61cbbc
refactor(TripBasicsPane): Localize component.
binh-dam-ibigroup Aug 5, 2021
428cc24
refactor(SavedTripScreen): Localize component.
binh-dam-ibigroup Aug 5, 2021
d881d32
refactor(SavedTripList/Editor): Localize components.
binh-dam-ibigroup Aug 6, 2021
b2d49ca
refactor(Trip status renderers): Localize trip status renderers.
binh-dam-ibigroup Aug 9, 2021
b107329
refactor(Base/ActiveTripRenderer): Move renderer messages under TripS…
binh-dam-ibigroup Aug 9, 2021
9502c4b
refactor(mobile): Localize components
binh-dam-ibigroup Aug 9, 2021
0cf087c
refactor(mobile): Finish localizing mobile screens.
binh-dam-ibigroup Aug 9, 2021
eb14d49
refactor(WelcomeScreen): Localize component
binh-dam-ibigroup Aug 9, 2021
beeadac
refactor(util/user): Localize custom location types.
binh-dam-ibigroup Aug 10, 2021
f216837
fix(index.html): Copy file from a11y branch.
binh-dam-ibigroup Aug 12, 2021
0179759
fix(a11y): Update html lang attribute when changing locale.
binh-dam-ibigroup Aug 12, 2021
84ea84d
refactor(LiveStopTimes and StopViewer): localize components
philip-cline Aug 13, 2021
ac4ace0
test(StopViewer Test): Add intl wrapper to mockWithProvider
philip-cline Aug 13, 2021
1cc18ed
refactor(StopViewer): Check for state.user
philip-cline Aug 13, 2021
fd8c45e
refactor: add i18n for callTaker actions and refactor user actions i18n
evansiroky Aug 14, 2021
e931984
test(StopViewer test): fix failing test
philip-cline Aug 16, 2021
7600b0c
refactor(PatternRow, FormattedDuration & Time): Localize PatternRow, …
philip-cline Aug 16, 2021
a1d2afd
refactor: add i18n for field trip actions
evansiroky Aug 17, 2021
ff21e54
refactor: add i18n for location actions
evansiroky Aug 18, 2021
be803a4
refactor(RealtimeStatusLabel): Localize component.
binh-dam-ibigroup Aug 20, 2021
5f2392b
refactor(TripViewer): Localize components.
binh-dam-ibigroup Aug 20, 2021
f64ec7a
refactor(StopScheduleTable): Localize component.
binh-dam-ibigroup Aug 20, 2021
fdac844
refactor: add i18n for map actions
evansiroky Aug 23, 2021
85d40b9
refactor: properly call formatMessage and use inline message defs
evansiroky Aug 23, 2021
a059a5c
refactor: add i18n for user actions
evansiroky Aug 23, 2021
702975d
refactor: add i18n to app-menu and batch-routing-panel
evansiroky Aug 23, 2021
62f9ef0
refactor(util/state): Localize state error messages.
binh-dam-ibigroup Aug 25, 2021
df7ef73
refactor(util/state): Add i18n support for errorMessages in config.yml.
binh-dam-ibigroup Aug 25, 2021
79a52fe
chore(i18n/fr-FR): Add missing translations
binh-dam-ibigroup Aug 25, 2021
45add91
refactor(i18n): Move startOver string to common category.
binh-dam-ibigroup Aug 25, 2021
ebe2068
refactor(util/state): Localize title bar logic.
binh-dam-ibigroup Aug 25, 2021
a597dd0
refactor(PrintLayout): Localize component.
binh-dam-ibigroup Aug 25, 2021
68ee3c0
refactor(NotFound): Localize component.
binh-dam-ibigroup Aug 25, 2021
2130b24
refactor(StopTimeCell): Localize component
philip-cline Aug 25, 2021
293f8e9
refactor(form buttons): Localize Add Place and Plan Trip buttons.
binh-dam-ibigroup Aug 26, 2021
8a8cfae
refactor(PatternRow): move formatting to CSS class
philip-cline Aug 30, 2021
16ff909
refactor(SettingsPreview): Localize component, refactor as functional…
philip-cline Aug 31, 2021
47fc0dd
refactor(SwitchButton): Localize component, refactor as functional co…
philip-cline Aug 31, 2021
889152b
refactor(TabbedFormPanel): Localize component
philip-cline Aug 31, 2021
db4f615
refactor(UserTripSettings): Localize component
philip-cline Aug 31, 2021
879a9da
refactor(BatchSettings,ModeButton): Localize components.
binh-dam-ibigroup Aug 31, 2021
58d0b25
Merge branch 'react-intl-ramp-up' of https://github.com/opentripplann…
binh-dam-ibigroup Aug 31, 2021
7e4610e
refactor(UserSettings): localize component
philip-cline Sep 10, 2021
b9ac4ba
refactor(Merge dev): Merge dev & refactor a few small components
philip-cline Sep 13, 2021
1b7c65c
refactor(PatternRow): Add ARIA roles
philip-cline Sep 14, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11,498 changes: 5,896 additions & 5,602 deletions __tests__/components/viewers/__snapshots__/stop-viewer.js.snap

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Object {
"ui": Object {
"diagramLeg": null,
"locale": null,
"localizedMessages": Object {},
"localizedMessages": null,
"mobileScreen": 1,
"printView": false,
},
Expand Down
12 changes: 9 additions & 3 deletions __tests__/test-utils/mock-data/store.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { connectRouter, routerMiddleware } from 'connected-react-router'
import Enzyme, {mount} from 'enzyme'
import EnzymeReactAdapter from 'enzyme-adapter-react-16'
import { IntlProvider } from 'react-intl'
import {mountToJson} from 'enzyme-to-json'
import { createHashHistory } from 'history'
import clone from 'lodash/cloneDeep'
Expand Down Expand Up @@ -44,9 +45,14 @@ export function mockWithProvider (
) {
const store = configureStore(storeMiddleWare)(storeState)
const wrapper = mount(
<Provider store={store}>
<ConnectedComponent {...connectedComponentProps} />
</Provider>
<IntlProvider
defaultLocale={'en-US'}
locale={'en-US'}
>
<Provider store={store}>
<ConnectedComponent {...connectedComponentProps} />
</Provider>
</IntlProvider>
)

return {
Expand Down
13 changes: 13 additions & 0 deletions example-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,19 @@ itinerary:
# default is 60 seconds.
# onTimeThresholdSeconds: 60

### You can customize OTP error messages for itinerary searches based on OTP HTTP codes.
### A separate message can be set for each language or locale if necessary.
# errorMessages:
# - id: 404
# msg:
# en: Sorry, we couldn't find any transit or rideshare/carshare options at the time and/or location you chose. Please try again later, or change the settings of your trip.
# fr-FR: Aucun trajet en transports publics ou en partage de voiture n'a été trouvé pour l'heure et le lieu que vous avez indiqués. Veuillez réessayer plus tard, ou changez les paramètres de votre recherche.
# modes:
# - CAR_HAIL
# - CAR_RENT
# - id: 480
# msg: No available transit routes or rideshare/carshare service at origin.

# Format the date time format for display.
dateTime:
longDateFormat: DD-MM-YYYY
Expand Down
Loading