Correct bug preventing translations from displaying

This commit is contained in:
Eric 2020-07-30 21:03:07 -05:00 committed by Eric Schultz
parent 025b1cbbe3
commit ae0e3e0da0

View file

@ -9,14 +9,7 @@ import {CSRFInterceptor} from "../../lib/csrf_interceptor";
import * as CustomAPIS from "../../lib/apis" import * as CustomAPIS from "../../lib/apis"
// const enLocaleData = require('react-intl/locale-data/en');
const I18n = require('../../../../i18n.js.erb') const I18n = require('../../../../i18n.js.erb')
// const localeData = [...enLocaleData]
// Object.keys(I18n.translations).filter((i:string) => i !== 'en').forEach((i:string) => {
// const data = [...require(`react-intl/locale-data/${i}`)]
// localeData.concat(data)
// })
// addLocaleData(localeData)
interface RootProps interface RootProps
{ {
@ -41,7 +34,7 @@ export default class Root extends React.Component<RootProps, {}> {
this.apiManager = new ApiManager(APIS.concat(CustomAPIS.APIS as Array<any>), CSRFInterceptor) this.apiManager = new ApiManager(APIS.concat(CustomAPIS.APIS as Array<any>), CSRFInterceptor)
} }
return <IntlProvider locale={I18n.locale} defaultLocale={I18n.defaultLocale} messages={I18n.translations[I18n.locale]}> return <IntlProvider locale={I18n.locale} defaultLocale={I18n.defaultLocale} messages={convert(I18n.translations[I18n.locale]) as any}>
<Provider ApiManager={this.apiManager}> <Provider ApiManager={this.apiManager}>
{this.props.children} {this.props.children}
</Provider> </Provider>