Move language merge logic to i18n/index

This simplifies implementations one new languages
2020-04-15 21:37:02 -04:00
parent a6c9bf1b15
commit 3c4de3c8b5
4 changed files with 110 additions and 106 deletions
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Provider } from 'react-redux'
 import { createHashHistory } from 'history'
-import { Admin, resolveBrowserLocale, Resource } from 'react-admin'
+import { Admin, Resource } from 'react-admin'
 import dataProvider from './dataProvider'
 import authProvider from './authProvider'
 import polyglotI18nProvider from 'ra-i18n-polyglot'
@@ -21,7 +21,7 @@ import createAdminStore from './store/createAdminStore'

 const i18nProvider = polyglotI18nProvider(
  (locale) => (messages[locale] ? messages[locale] : messages.en),
-  localStorage.getItem('locale') || resolveBrowserLocale()
+  localStorage.getItem('locale') || 'en'
 )

 const history = createHashHistory()