Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] Improve react intl support (#1237)
Shan He0b91f4d1ed75
diff --git a/docs/api-reference/localization/README.md b/docs/api-reference/localization/README.mdindex ad115d96b..718261d5b 100644--- a/docs/api-reference/localization/README.md+++ b/docs/api-reference/localization/README.md@@ -1,6 +1,15 @@# Localization-Kepler.gl supports localization trough [react-intl]. Locale is determined by `uiState.locale` value.+Kepler.gl supports localization through [react-intl]. Locale is determined by `uiState.locale` value.+Current supported languages are:++| locale code | Language | Default? |+|-------------|------------|----------|+| en | English | default |+| fi | Finish | |+| pt | Portuguese | |+| ca | Catalan | |+| es | Spanish | |## Changing default language@@ -26,7 +35,7 @@ const reducers = combineReducers({## Adding new language-Let's say we want to add the Swedish language to kepler.gl. Easiest way to add translation of new language is to follow these steps:+Let's say we want to add the Swedish language to kepler.gl. Easiest way to add translation of new language is to follow these 3 steps:- Find out the [language code][language-codes] for Swedish: `sv`- Add new translation file `src/localization/sv.js` by copying `src/localization/en.js` and translating the strings@@ -37,9 +46,50 @@ Let's say we want to add the Swedish language to kepler.gl. Easiest way to add ten : 'English',fi : 'Suomi',pt: 'Português',+ // add Swedish languagesv: 'Svenska'}```+## Modify default translation or add new translation+the `localeMessages` prop of `KeplerGl` takes additional translations and merge with default translation.++#### Example 1. Update default translation+To update the english translation of `layerManager.addData`, pass `localeMessages` like this.++```javascript+const localeMessages = {+ en: {+ ['layerManager.addData']: 'Add Data to Layer'+ }+};++const App = () => (+ <KeplerGl+ id="map"+ localeMessages={messages}+ mapboxApiAccessToken={Token}+ />+);+```+#### Example 2. Pass additional translation+Sometimes together with dependency injection, you might need to add additional translations to the customized component. For example, adding an additional `settings` panel in the side panel, you will need to provide a translation for the panel name assigned to `sidebar.panels.settings`++```javascript+const localeMessages = {+ en: {+ ['sidebar.panels.settings']: 'Settings'+ }+};++const App = () => (+ <KeplerGl+ id="map"+ localeMessages={messages}+ mapboxApiAccessToken={Token}+ />+);+```+[react-intl]: https://github.com/formatjs/react-intl[language-codes]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codesdiff --git a/examples/demo-app/src/app.js b/examples/demo-app/src/app.jsindex e30a066cf..730c83b9e 100644--- a/examples/demo-app/src/app.js+++ b/examples/demo-app/src/app.js@@ -23,6 +23,7 @@ import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';import styled, {ThemeProvider} from 'styled-components';import window from 'global/window';import {connect} from 'react-redux';+import {theme} from 'kepler.gl/styles';import Banner from './components/banner';import Announcement, {FormLink} from './components/announcement';@@ -30,6 +31,8 @@ import {replaceLoadDataModal} from './factories/load-data-modal';import {replaceMapControl} from './factories/map-control';import {replacePanelHeader} from './factories/panel-header';import {AUTH_TOKENS} from './constants/default-settings';+import {messages} from './constants/localization';+import {loadRemoteMap,loadSampleConfigurations,@@ -395,6 +398,7 @@ class App extends Component {width={width}height={height}cloudProviders={CLOUD_PROVIDERS}+ localeMessages={messages}onExportToCloudSuccess={onExportFileSuccess}onLoadCloudMapSuccess={onLoadCloudMapSuccess}/>diff --git a/examples/demo-app/src/components/load-data-modal/load-remote-map.js b/examples/demo-app/src/components/load-data-modal/load-remote-map.jsindex 2e38499c9..6e808aa8d 100644--- a/examples/demo-app/src/components/load-data-modal/load-remote-map.js+++ b/examples/demo-app/src/components/load-data-modal/load-remote-map.js@@ -23,8 +23,7 @@ import React, {Component} from 'react';import PropTypes from 'prop-types';import styled from 'styled-components';import {CORS_LINK} from '../../constants/default-settings';-import {messages} from '../../constants/localization';-import {FormattedHTMLMessage, FormattedMessage, IntlProvider} from 'react-intl';+import {FormattedHTMLMessage, FormattedMessage} from 'react-intl';const propTypes = {onLoadRemoteMap: PropTypes.func.isRequired@@ -96,13 +95,10 @@ const Error = ({error, url}) => ();class LoadRemoteMap extends Component {- constructor(props) {- super(props);+ state = {+ dataUrl: ''+ };- this.state = {- dataUrl: ''- };- }onMapUrlChange = e => {// TODO: validate urlthis.setState({@@ -120,42 +116,39 @@ class LoadRemoteMap extends Component {};render() {- const {locale} = this.props;return (<div><InputForm>- <IntlProvider locale={locale} messages={messages[locale]}>- <StyledDescription>- <FormattedMessage id={'loadRemoteMap.description'} />- </StyledDescription>- <StyledInputLabel>- <FormattedMessage id={'loadRemoteMap.message'} />- </StyledInputLabel>- <StyledInputLabel>- <FormattedMessage id={'loadRemoteMap.examples'} />- <ul>- <li>https://your.map.url/map.json</li>- <li>http://your.map.url/data.csv</li>- </ul>- </StyledInputLabel>- <StyledInputLabel>- <FormattedMessage id={'loadRemoteMap.cors'} />{' '}- <FormattedHTMLMessage id={'loadRemoteMap.clickHere'} values={{corsLink: CORS_LINK}} />- </StyledInputLabel>- <StyledFromGroup>- <StyledInput- onChange={this.onMapUrlChange}- type="text"- placeholder="Url"- value={this.state.dataUrl}- error={this.props.error}- />- <StyledBtn type="submit" onClick={this.onLoadRemoteMap}>- <FormattedMessage id={'loadRemoteMap.fetch'} />- </StyledBtn>- </StyledFromGroup>- {this.props.error && <Error error={this.props.error} url={this.props.option.dataUrl} />}- </IntlProvider>+ <StyledDescription>+ <FormattedMessage id={'loadRemoteMap.description'} />+ </StyledDescription>+ <StyledInputLabel>+ <FormattedMessage id={'loadRemoteMap.message'} />+ </StyledInputLabel>+ <StyledInputLabel>+ <FormattedMessage id={'loadRemoteMap.examples'} />+ <ul>+ <li>https://your.map.url/map.json</li>+ <li>http://your.map.url/data.csv</li>+ </ul>+ </StyledInputLabel>+ <StyledInputLabel>+ <FormattedMessage id={'loadRemoteMap.cors'} />{' '}+ <FormattedHTMLMessage id={'loadRemoteMap.clickHere'} values={{corsLink: CORS_LINK}} />+ </StyledInputLabel>+ <StyledFromGroup>+ <StyledInput+ onChange={this.onMapUrlChange}+ type="text"+ placeholder="Url"+ value={this.state.dataUrl}+ error={this.props.error}+ />+ <StyledBtn type="submit" onClick={this.onLoadRemoteMap}>+ <FormattedMessage id={'loadRemoteMap.fetch'} />+ </StyledBtn>+ </StyledFromGroup>+ {this.props.error && <Error error={this.props.error} url={this.props.option.dataUrl} />}</InputForm></div>);diff --git a/examples/demo-app/src/components/load-data-modal/sample-data-viewer.js b/examples/demo-app/src/components/load-data-modal/sample-data-viewer.jsindex 5d733087d..f02875425 100644--- a/examples/demo-app/src/components/load-data-modal/sample-data-viewer.js+++ b/examples/demo-app/src/components/load-data-modal/sample-data-viewer.js@@ -18,13 +18,12 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {Component} from 'react';+import React, {useEffect} from 'react';import PropTypes from 'prop-types';import styled from 'styled-components';import {format} from 'd3-format';import {LoadingDialog} from 'kepler.gl/components';-import {FormattedMessage, IntlProvider} from 'react-intl';-import {messages} from '../../constants/localization';+import {FormattedMessage} from 'react-intl';const numFormat = format(',');@@ -92,63 +91,66 @@ const StyledError = styled.div`const SampleMap = ({id, sample, onClick, locale}) => (<StyledSampleMap id={id} className="sample-map-gallery__item">- <IntlProvider locale={locale} messages={messages[locale]}>- <div className="sample-map">- <div className="sample-map__image" onClick={onClick}>- {sample.imageUrl && <img src={sample.imageUrl} />}- </div>- <div className="sample-map__title">{sample.label}</div>- <div className="sample-map__size">- <FormattedMessage- id={'sampleDataViewer.rowCount'}- values={{rowCount: numFormat(sample.size)}}- />- </div>- <StyledImageCaption className="sample-map__image__caption">- {sample.description}- </StyledImageCaption>+ <div className="sample-map">+ <div className="sample-map__image" onClick={onClick}>+ {sample.imageUrl && <img src={sample.imageUrl} />}</div>- </IntlProvider>+ <div className="sample-map__title">{sample.label}</div>+ <div className="sample-map__size">+ <FormattedMessage+ id={'sampleDataViewer.rowCount'}+ values={{rowCount: numFormat(sample.size)}}+ />+ </div>+ <StyledImageCaption className="sample-map__image__caption">+ {sample.description}+ </StyledImageCaption>+ </div></StyledSampleMap>);-export default class SampleMapGallery extends Component {- static propTypes = {- sampleMaps: PropTypes.arrayOf(PropTypes.object),- onLoadSample: PropTypes.func.isRequired,- loadSampleConfigurations: PropTypes.func.isRequired,- error: PropTypes.object- };- componentDidMount() {- if (!this.props.sampleMaps.length) {- this.props.loadSampleConfigurations();+const SampleMapGallery = ({+ sampleMaps,+ onLoadSample,+ error,+ isMapLoading,+ locale,+ loadSampleConfigurations+}) => {+ useEffect(() => {+ if (!sampleMaps.length) {+ loadSampleConfigurations();}- }+ }, [sampleMaps, loadSampleConfigurations]);- render() {- const {sampleMaps, onLoadSample, error, isMapLoading, locale} = this.props;- return (- <div className="sample-data-modal">- {error ? (- <StyledError>{error.message}</StyledError>- ) : isMapLoading ? (- <LoadingDialog size={64} />- ) : (- <StyledSampleGallery className="sample-map-gallery">- {sampleMaps- .filter(sp => sp.visible)- .map(sp => (- <SampleMap- id={sp.id}- sample={sp}- key={sp.id}- onClick={() => onLoadSample(sp)}- locale={locale}- />- ))}- </StyledSampleGallery>- )}- </div>- );- }-}+ return (+ <div className="sample-data-modal">+ {error ? (+ <StyledError>{error.message}</StyledError>+ ) : isMapLoading ? (+ <LoadingDialog size={64} />+ ) : (+ <StyledSampleGallery className="sample-map-gallery">+ {sampleMaps+ .filter(sp => sp.visible)+ .map(sp => (+ <SampleMap+ id={sp.id}+ sample={sp}+ key={sp.id}+ onClick={() => onLoadSample(sp)}+ locale={locale}+ />+ ))}+ </StyledSampleGallery>+ )}+ </div>+ );+};++SampleMapGallery.propTypes = {+ sampleMaps: PropTypes.arrayOf(PropTypes.object),+ onLoadSample: PropTypes.func.isRequired,+ loadSampleConfigurations: PropTypes.func.isRequired,+ error: PropTypes.object+};diff --git a/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js b/examples/demo-app/src/components/load-data-modal/sample-maps-tab.jsindex 29049e802..8a2787281 100644--- a/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js+++ b/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js@@ -22,10 +22,9 @@ import React from 'react';import styled from 'styled-components';import {Icons} from 'kepler.gl/components';import {media} from 'kepler.gl/styles';-import {FormattedMessage, IntlProvider} from 'react-intl';+import {FormattedMessage} from 'react-intl';import {ASSETS_URL} from '../../constants/default-settings';-import {messages} from '../../constants/localization';const StyledMapIcon = styled.div`background-image: url("${ASSETS_URL}icon-demo-map.jpg");@@ -88,21 +87,19 @@ const StyledTrySampleData = styled.div`}`;-const SampleMapsTab = ({onClick, intl}) => {+const SampleMapsTab = ({onClick}) => {return (<StyledTrySampleData className="try-sample-data"><StyledMapIcon className="demo-map-icon" />- <IntlProvider locale={intl.locale} messages={messages[intl.locale]}>- <div className="demo-map-title">- <div className="demo-map-label">- <FormattedMessage id={'sampleMapsTab.noData'} />- </div>- <div className="demo-map-action" onClick={onClick}>- <FormattedMessage id={'sampleMapsTab.trySampleData'} />- <Icons.ArrowRight height="16px" />- </div>+ <div className="demo-map-title">+ <div className="demo-map-label">+ <FormattedMessage id={'sampleMapsTab.noData'} defaultMessage="No Data" /></div>- </IntlProvider>+ <div className="demo-map-action" onClick={onClick}>+ <FormattedMessage id={'sampleMapsTab.trySampleData'} defaultMessage="Sample Maps" />+ <Icons.ArrowRight height="16px" />+ </div>+ </div></StyledTrySampleData>);};diff --git a/examples/demo-app/src/constants/localization.js b/examples/demo-app/src/constants/localization.jsindex 3dc705c6d..636bb0278 100644--- a/examples/demo-app/src/constants/localization.js+++ b/examples/demo-app/src/constants/localization.js@@ -21,6 +21,7 @@// Add english messages here, other languages will use these// if translations not available for every messageconst en = {+ 'modal.loadData.remote': 'Load Map using URL','sampleMapsTab.noData': 'No data ?','sampleMapsTab.trySampleData': 'Try sample data','sampleDataViewer.rowCount': ' {rowCount} rows',@@ -38,7 +39,7 @@ const en = {export const messages = {en,fi: {- ...en,+ 'modal.loadData.remote': 'Lataa kartta URL-osoitteen avulla','sampleMapsTab.noData': 'Ei aineistoja?','sampleMapsTab.trySampleData': 'Kokeile testiaineistoja','sampleDataViewer.rowCount': ' {rowCount} riviä',@@ -53,7 +54,7 @@ export const messages = {'loadRemoteMap.fetch': 'Nouda'},ca: {- ...en,+ 'modal.loadData.remote': 'Carrega mapa mitjançant URL','sampleMapsTab.noData': 'Cap dada?','sampleMapsTab.trySampleData': 'Prova dades de mostra','sampleDataViewer.rowCount': ' {rowCount} files',@@ -68,7 +69,7 @@ export const messages = {'loadRemoteMap.fetch': 'Cerca'},es: {- ...en,+ 'modal.loadData.remote': 'Cargar mapa usando URL','sampleMapsTab.noData': 'Ningún dato?','sampleMapsTab.trySampleData': 'Prueba datos de muestra','sampleDataViewer.rowCount': ' {rowCount} files',diff --git a/examples/demo-app/src/factories/load-data-modal.js b/examples/demo-app/src/factories/load-data-modal.jsindex 4c81f02ea..90f5bc16f 100644--- a/examples/demo-app/src/factories/load-data-modal.js+++ b/examples/demo-app/src/factories/load-data-modal.js@@ -18,33 +18,30 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import {LoadDataModalFactory} from 'kepler.gl/components';-import {withState} from 'kepler.gl/components';+import {LoadDataModalFactory, withState} from 'kepler.gl/components';import {LOADING_METHODS} from '../constants/default-settings';import SampleMapGallery from '../components/load-data-modal/sample-data-viewer';import LoadRemoteMap from '../components/load-data-modal/load-remote-map';import SampleMapsTab from '../components/load-data-modal/sample-maps-tab';-import {loadRemoteMap, loadSample, loadSampleConfigurations} from '../actions';-const additionalMethods = {- remote: {- id: LOADING_METHODS.remote,- label: 'Load Map using URL',- elementType: LoadRemoteMap- },- sample: {- id: LOADING_METHODS.sample,- label: 'Sample Maps',- elementType: SampleMapGallery,- tabElementType: SampleMapsTab- }-};-const CustomLoadDataModalFactory = (...deps) => {const LoadDataModal = LoadDataModalFactory(...deps);const defaultLoadingMethods = LoadDataModal.defaultProps.loadingMethods;+ const additionalMethods = {+ remote: {+ id: LOADING_METHODS.remote,+ label: 'modal.loadData.remote',+ elementType: LoadRemoteMap+ },+ sample: {+ id: LOADING_METHODS.sample,+ label: 'modal.loadData.sample',+ elementType: SampleMapGallery,+ tabElementType: SampleMapsTab+ }+ };// add more loading methodsLoadDataModal.defaultProps = {diff --git a/examples/webpack.config.local.js b/examples/webpack.config.local.jsindex dc81e5917..c21e1d4fc 100644--- a/examples/webpack.config.local.js+++ b/examples/webpack.config.local.js@@ -53,7 +53,8 @@ function makeLocalDevConfig(env, EXAMPLE_DIR = LIB_DIR, externals = {}) {react: `${NODE_MODULES_DIR}/react`,'react-dom': `${NODE_MODULES_DIR}/react-dom`,'react-redux': `${NODE_MODULES_DIR}/react-redux/lib`,- 'styled-components': `${NODE_MODULES_DIR}/styled-components`+ 'styled-components': `${NODE_MODULES_DIR}/styled-components`,+ 'react-intl': `${NODE_MODULES_DIR}/react-intl`};// resolve deck.gl from local dirdiff --git a/src/components/common/file-uploader/file-upload.js b/src/components/common/file-uploader/file-upload.jsindex e7b5f606d..31236caa5 100644--- a/src/components/common/file-uploader/file-upload.js+++ b/src/components/common/file-uploader/file-upload.js@@ -20,6 +20,7 @@import React, {Component, createRef} from 'react';import styled from 'styled-components';+import {injectIntl} from 'react-intl';import UploadButton from './upload-button';import {DragNDrop, FileType} from 'components/common/icons';import FileUploadProgress from 'components/common/file-uploader/file-upload-progress';@@ -30,7 +31,7 @@ import {GUIDES_FILE_FORMAT_DOC} from 'constants/user-guides';import ReactMarkdown from 'react-markdown';// Breakpointsimport {media} from 'styles/media-breakpoints';-import {FormattedMessage, injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';/** @typedef {import('./file-upload').FileUploadProps} FileUploadProps */diff --git a/src/components/common/info-helper.js b/src/components/common/info-helper.jsindex b281735f6..757ef6ab2 100644--- a/src/components/common/info-helper.js+++ b/src/components/common/info-helper.js@@ -20,7 +20,8 @@import React from 'react';import PropTypes from 'prop-types';-import {FormattedMessage, useIntl} from 'react-intl';+import {useIntl} from 'react-intl';+import {FormattedMessage} from 'localization';import {Tooltip} from './styled-components';import {Docs} from 'components/common/icons';import styled from 'styled-components';diff --git a/src/components/common/item-selector/chickleted-input.js b/src/components/common/item-selector/chickleted-input.jsindex 563cb79b2..c740b7705 100644--- a/src/components/common/item-selector/chickleted-input.js+++ b/src/components/common/item-selector/chickleted-input.js@@ -23,7 +23,7 @@ import PropTypes from 'prop-types';import styled from 'styled-components';import Delete from '../icons/delete';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const propTypes = {// required propertiesdiff --git a/src/components/common/item-selector/item-selector.js b/src/components/common/item-selector/item-selector.jsindex c78d4fb32..a515c8377 100644--- a/src/components/common/item-selector/item-selector.js+++ b/src/components/common/item-selector/item-selector.js@@ -32,7 +32,8 @@ import {Delete} from 'components/common/icons';import DropdownList, {ListItem} from './dropdown-list';import {toArray} from 'utils/utils';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledDropdownSelect = styled.div.attrs({className: 'item-selector__dropdown'diff --git a/src/components/common/modal.js b/src/components/common/modal.jsindex 5aed7730b..5113e9975 100644--- a/src/components/common/modal.js+++ b/src/components/common/modal.js@@ -20,7 +20,7 @@import React, {Component} from 'react';import PropTypes from 'prop-types';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import styled from 'styled-components';import Modal from 'react-modal';diff --git a/src/components/common/toolbar-item.js b/src/components/common/toolbar-item.jsindex 5c303d016..911ac6cd3 100644--- a/src/components/common/toolbar-item.js+++ b/src/components/common/toolbar-item.js@@ -20,7 +20,7 @@import React from 'react';import styled from 'styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledDiv = styled.div.attrs({className: 'toolbar-item'diff --git a/src/components/filters/multi-select-filter.js b/src/components/filters/multi-select-filter.jsindex b639a458d..de5f02271 100644--- a/src/components/filters/multi-select-filter.js+++ b/src/components/filters/multi-select-filter.js@@ -21,7 +21,7 @@import React from 'react';import ItemSelector from '../common/item-selector/item-selector';import {PanelLabel} from '../common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';export default function MultiSelectFilterFactory() {const MultiSelectFilter = ({filter, setFilter}) => (diff --git a/src/components/filters/single-select-filter.js b/src/components/filters/single-select-filter.jsindex 852d9b9cf..64b7dd443 100644--- a/src/components/filters/single-select-filter.js+++ b/src/components/filters/single-select-filter.js@@ -21,7 +21,7 @@import React from 'react';import ItemSelector from '../common/item-selector/item-selector';import {PanelLabel, SidePanelSection} from '../common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';export default function SingleSelectFilterFactory() {const SingleSelectFilter = ({filter, setFilter}) => (diff --git a/src/components/kepler-gl.js b/src/components/kepler-gl.jsindex 1ec7a3e81..58638481e 100644--- a/src/components/kepler-gl.js+++ b/src/components/kepler-gl.js@@ -53,6 +53,7 @@ import GeoCoderPanelFactory from './geocoder-panel';import {generateHashId} from 'utils/utils';import {validateToken} from 'utils/mapbox-utils';+import {mergeMessages} from 'utils/locale-utils';import {theme as basicTheme, themeLT, themeBS} from 'styles/base';@@ -175,6 +176,11 @@ function KeplerGlFactory(: {});+ localeMessagesSelector = createSelector(+ props => props.localeMessages,+ customMessages => (customMessages ? mergeMessages(messages, customMessages) : messages)+ );+/* private methods */_validateMapboxToken() {const {mapboxApiAccessToken} = this.props;@@ -344,10 +350,11 @@ function KeplerGlFactory(const isExportingImage = uiState.exportImage.exporting;const theme = this.availableThemeSelector(this.props);+ const localeMessages = this.localeMessagesSelector(this.props);return (<RootContext.Provider value={this.root}>- <IntlProvider locale={uiState.locale} messages={messages[uiState.locale]}>+ <IntlProvider locale={uiState.locale} messages={localeMessages[uiState.locale]}><ThemeProvider theme={theme}><GlobalStylewidth={width}diff --git a/src/components/map/map-control.js b/src/components/map/map-control.jsindex c0a18c91f..0bab4e6be 100644--- a/src/components/map/map-control.js+++ b/src/components/map/map-control.js@@ -22,7 +22,7 @@ import React, {Component, useCallback} from 'react';import PropTypes from 'prop-types';import {createSelector} from 'reselect';import styled from 'styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import classnames from 'classnames';import {IconRoundSmall, MapControlButton, Tooltip} from 'components/common/styled-components';diff --git a/src/components/map/map-legend.js b/src/components/map/map-legend.jsindex 18a55ae3a..8bf55a4ff 100644--- a/src/components/map/map-legend.js+++ b/src/components/map/map-legend.js@@ -24,7 +24,7 @@ import styled from 'styled-components';import {rgb} from 'd3-color';import ColorLegend from 'components/common/color-legend';import {CHANNEL_SCALES, DIMENSIONS} from 'constants/default-settings';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';export const StyledMapControlLegend = styled.div`padding: 10px 0 10px ${props => props.theme.mapControl.padding}px;diff --git a/src/components/map/map-popover.js b/src/components/map/map-popover.jsindex da2972456..60f470df6 100644--- a/src/components/map/map-popover.js+++ b/src/components/map/map-popover.js@@ -25,7 +25,8 @@ import LayerHoverInfoFactory from './layer-hover-info';import CoordinateInfoFactory from './coordinate-info';import {Pin, ArrowLeft, ArrowRight} from 'components/common/icons';import ErrorBoundary from 'components/common/error-boundary';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';const MAX_WIDTH = 500;const MAX_HEIGHT = 600;diff --git a/src/components/modals/add-map-style-modal.js b/src/components/modals/add-map-style-modal.jsindex 739acc8c4..a963a67fd 100644--- a/src/components/modals/add-map-style-modal.js+++ b/src/components/modals/add-map-style-modal.js@@ -35,7 +35,8 @@ import {media} from 'styles/media-breakpoints';// Utilsimport {transformRequest} from 'utils/map-style-utils/mapbox-utils';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';const MapH = 190;const MapW = 264;diff --git a/src/components/modals/delete-data-modal.js b/src/components/modals/delete-data-modal.jsindex a576c1a44..e069f2b5d 100644--- a/src/components/modals/delete-data-modal.js+++ b/src/components/modals/delete-data-modal.js@@ -21,7 +21,7 @@import React from 'react';import styled from 'styled-components';import DatasetLabel from 'components/common/dataset-label';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledMsg = styled.div`margin-top: 24px;diff --git a/src/components/modals/export-data-modal.js b/src/components/modals/export-data-modal.jsindex 2401644d5..02d59d24e 100644--- a/src/components/modals/export-data-modal.js+++ b/src/components/modals/export-data-modal.js@@ -29,7 +29,8 @@ import {StyledModalContent,StyledType} from 'components/common/styled-components';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';const propTypes = {datasets: PropTypes.object.isRequired,diff --git a/src/components/modals/export-image-modal.js b/src/components/modals/export-image-modal.jsindex 030c0e5e3..610f5abd0 100644--- a/src/components/modals/export-image-modal.js+++ b/src/components/modals/export-image-modal.js@@ -27,7 +27,8 @@ import {EXPORT_IMG_RATIO_OPTIONS, EXPORT_IMG_RESOLUTION_OPTIONS} from 'constantsimport {StyledModalContent, SelectionButton} from 'components/common/styled-components';import Switch from 'components/common/switch';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';const ImageOptionList = styled.div`display: flex;diff --git a/src/components/modals/export-map-modal/export-html-map.js b/src/components/modals/export-map-modal/export-html-map.jsindex ac310d66c..8434e4027 100644--- a/src/components/modals/export-map-modal/export-html-map.js+++ b/src/components/modals/export-map-modal/export-html-map.js@@ -25,7 +25,8 @@ import {StyledExportMapSection, StyledWarning, ExportMapLink} from './componentsimport {EXPORT_HTML_MAP_MODE_OPTIONS} from 'constants/default-settings';import {EXPORT_HTML_MAP_DOC, EXPORT_HTML_MAP_MODES_DOC} from 'constants/user-guides';import styled from 'styled-components';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';const ExportMapStyledExportSection = styled(StyledExportSection)`.disclaimer {diff --git a/src/components/modals/export-map-modal/export-json-map.js b/src/components/modals/export-map-modal/export-json-map.jsindex d88011b44..b8d7409eb 100644--- a/src/components/modals/export-map-modal/export-json-map.js+++ b/src/components/modals/export-map-modal/export-json-map.js@@ -25,7 +25,7 @@ import {ADD_DATA_TO_MAP_DOC} from 'constants/user-guides';import styled from 'styled-components';import {StyledExportSection} from 'components/common/styled-components';import {StyledExportMapSection, StyledWarning, ExportMapLink} from './components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledJsonExportSection = styled(StyledExportSection)`.note {diff --git a/src/components/modals/export-map-modal/export-map-modal.js b/src/components/modals/export-map-modal/export-map-modal.jsindex a4db9cd03..14aa2a113 100644--- a/src/components/modals/export-map-modal/export-map-modal.js+++ b/src/components/modals/export-map-modal/export-map-modal.js@@ -27,7 +27,7 @@ import {EXPORT_MAP_FORMATS, EXPORT_MAP_FORMAT_OPTIONS} from 'constants/default-simport {StyledExportMapSection} from './components';import ExportHtmlMapFactory from './export-html-map';import ExportJsonMapFactory from './export-json-map';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const propTypes = {options: PropTypes.object,diff --git a/src/components/modals/load-data-modal.d.ts b/src/components/modals/load-data-modal.d.tsindex f97173174..f19f5e49a 100644--- a/src/components/modals/load-data-modal.d.ts+++ b/src/components/modals/load-data-modal.d.ts@@ -16,6 +16,7 @@ export type LoadDataModalProps = {fileFormatNames: string[];/** A list of typically 3 letter extensions (without '.') for file matching */fileExtensions: string[];+ isCloudMapLoading: boolean;/** Set to true if app wants to do its own file filtering */disableExtensionFilter?: boolean;};diff --git a/src/components/modals/load-data-modal.js b/src/components/modals/load-data-modal.jsindex 6adad6001..bc0e351cd 100644--- a/src/components/modals/load-data-modal.js+++ b/src/components/modals/load-data-modal.js@@ -21,11 +21,11 @@import React, {useState} from 'react';import styled from 'styled-components';import get from 'lodash.get';+import {useIntl} from 'react-intl';import FileUploadFactory from 'components/common/file-uploader/file-upload';import LoadStorageMapFactory from './load-storage-map';import ModalTabsFactory from './modal-tabs';-import LoadingDialog from './loading-dialog';import {LOADING_METHODS} from 'constants/default-settings';@@ -49,11 +49,12 @@ LoadDataModalFactory.deps = [ModalTabsFactory, FileUploadFactory, LoadStorageMapexport function LoadDataModalFactory(ModalTabs, FileUpload, LoadStorageMap) {/** @type {React.FunctionComponent<LoadDataModalProps>} */const LoadDataModal = props => {- // @ts-ignore TODO check why this is not defined- const {isCloudMapLoading} = props;- const {loadingMethods} = props;+ const intl = useIntl();+ const {loadingMethods, isCloudMapLoading} = props;const [currentMethod, toggleMethod] = useState(getDefaultMethod(loadingMethods));+ const ElementType = currentMethod.elementType;+return (<StyledLoadDataModal><ModalTabs@@ -64,7 +65,7 @@ export function LoadDataModalFactory(ModalTabs, FileUpload, LoadStorageMap) {{isCloudMapLoading ? (<LoadingDialog size={64} />) : (- currentMethod && <currentMethod.elementType key={currentMethod.id} {...props} />+ currentMethod && <ElementType key={currentMethod.id} intl={intl} {...props} />)}</StyledLoadDataModal>);@@ -86,6 +87,7 @@ export function LoadDataModalFactory(ModalTabs, FileUpload, LoadStorageMap) {}]};+return LoadDataModal;}diff --git a/src/components/modals/load-storage-map.js b/src/components/modals/load-storage-map.jsindex 3b5ddc912..f7e89dd4d 100644--- a/src/components/modals/load-storage-map.js+++ b/src/components/modals/load-storage-map.js@@ -27,7 +27,7 @@ import {Button} from 'components/common/styled-components';import CloudTile from './cloud-tile';import {Base, ArrowLeft} from 'components/common/icons';import ProviderModalContainer from './provider-modal-container';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledProviderSection = styled.div.attrs({className: 'provider-selection'diff --git a/src/components/modals/loading-dialog.js b/src/components/modals/loading-dialog.jsindex c0404e789..4c0c134e8 100644--- a/src/components/modals/loading-dialog.js+++ b/src/components/modals/loading-dialog.js@@ -21,7 +21,7 @@import React from 'react';import styled from 'styled-components';import LoadingSpinner from 'components/common/loading-spinner';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledSpinner = styled.div`text-align: center;diff --git a/src/components/modals/overwrite-map-modal.js b/src/components/modals/overwrite-map-modal.jsindex d3f401130..b9c42eb03 100644--- a/src/components/modals/overwrite-map-modal.js+++ b/src/components/modals/overwrite-map-modal.js@@ -23,7 +23,7 @@ import styled from 'styled-components';import {CenterVerticalFlexbox} from 'components/common/styled-components';import {UploadAnimation} from './status-panel';import ImageModalContainer from './image-modal-container';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledMsg = styled.div`margin-top: 24px;diff --git a/src/components/modals/save-map-modal.js b/src/components/modals/save-map-modal.jsindex 53bc20e39..867eacf0f 100644--- a/src/components/modals/save-map-modal.js+++ b/src/components/modals/save-map-modal.js@@ -38,7 +38,7 @@ import {StyledModalInputFootnote} from 'components/common/styled-components';import ImagePreview from 'components/common/image-preview';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledSaveMapModal = styled.div.attrs({className: 'save-map-modal'diff --git a/src/components/modals/share-map-modal.js b/src/components/modals/share-map-modal.jsindex 16b90c64e..b0df1881f 100644--- a/src/components/modals/share-map-modal.js+++ b/src/components/modals/share-map-modal.js@@ -33,7 +33,7 @@ import {} from 'components/common/styled-components';import CloudTile from './cloud-tile';import StatusPanel from './status-panel';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';export const StyledInputLabel = styled.label`font-size: 12px;diff --git a/src/components/modals/status-panel.js b/src/components/modals/status-panel.jsindex 59b97de8f..b58a5bd5d 100644--- a/src/components/modals/status-panel.js+++ b/src/components/modals/status-panel.js@@ -23,7 +23,7 @@ import styled from 'styled-components';import {MapIcon} from 'components/common/icons';import {StyledExportSection} from 'components/common/styled-components';import ErrorDisplay from './error-display';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledUploader = styled.div`display: flex;diff --git a/src/components/modals/storage-map-viewer.js b/src/components/modals/storage-map-viewer.jsindex be077bea3..2e87e30da 100644--- a/src/components/modals/storage-map-viewer.js+++ b/src/components/modals/storage-map-viewer.js@@ -23,7 +23,7 @@ import PropTypes from 'prop-types';import styled from 'styled-components';import moment from 'moment';import {LeftArrow} from 'components/common/icons';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const imageH = 108;diff --git a/src/components/side-panel.js b/src/components/side-panel.jsindex 8631f6841..1b440a9b1 100644--- a/src/components/side-panel.js+++ b/src/components/side-panel.js@@ -19,7 +19,7 @@// THE SOFTWARE.import React, {PureComponent} from 'react';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import PropTypes from 'prop-types';import styled from 'styled-components';import get from 'lodash.get';diff --git a/src/components/side-panel/common/dataset-info.js b/src/components/side-panel/common/dataset-info.jsindex b93ab3452..de938acfe 100644--- a/src/components/side-panel/common/dataset-info.js+++ b/src/components/side-panel/common/dataset-info.js@@ -21,7 +21,7 @@import React from 'react';import styled from 'styled-components';import {format} from 'd3-format';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const numFormat = format(',');diff --git a/src/components/side-panel/common/dataset-title.js b/src/components/side-panel/common/dataset-title.jsindex e0d4ff532..f5928d07f 100644--- a/src/components/side-panel/common/dataset-title.js+++ b/src/components/side-panel/common/dataset-title.js@@ -20,7 +20,7 @@import React, {PureComponent} from 'react';import styled from 'styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import {CenterFlexbox, Tooltip} from 'components/common/styled-components';import {ArrowRight, Table, Trash} from 'components/common/icons';diff --git a/src/components/side-panel/common/source-data-selector.js b/src/components/side-panel/common/source-data-selector.jsindex 8493b8652..435c66c4f 100644--- a/src/components/side-panel/common/source-data-selector.js+++ b/src/components/side-panel/common/source-data-selector.js@@ -24,7 +24,7 @@ import {createSelector} from 'reselect';import {PanelLabel, SidePanelSection} from 'components/common/styled-components';import ItemSelector from 'components/common/item-selector/item-selector';import DatasetTagFactory from 'components/side-panel/common/dataset-tag';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const defaultPlaceHolder = 'Select A Data Source';diff --git a/src/components/side-panel/filter-manager.js b/src/components/side-panel/filter-manager.jsindex 24a18cd86..2fd6b4e93 100644--- a/src/components/side-panel/filter-manager.js+++ b/src/components/side-panel/filter-manager.js@@ -21,7 +21,7 @@import React, {Component} from 'react';import PropTypes from 'prop-types';import {createSelector} from 'reselect';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import {Button, SidePanelDivider, SidePanelSection} from 'components/common/styled-components';import {Add} from 'components/common/icons';import SourceDataCatalogFactory from './common/source-data-catalog';diff --git a/src/components/side-panel/interaction-panel/brush-config.js b/src/components/side-panel/interaction-panel/brush-config.jsindex fd68f64d5..3262a00fd 100644--- a/src/components/side-panel/interaction-panel/brush-config.js+++ b/src/components/side-panel/interaction-panel/brush-config.js@@ -23,7 +23,7 @@ import RangeSliderFactory from 'components/common/range-slider';import {PanelLabel, SidePanelSection} from 'components/common/styled-components';import {BRUSH_CONFIG} from 'utils/interaction-utils';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';BrushConfigFactory.deps = [RangeSliderFactory];diff --git a/src/components/side-panel/interaction-panel/interaction-panel.js b/src/components/side-panel/interaction-panel/interaction-panel.jsindex bf6a59b9f..a8e8bc0d8 100644--- a/src/components/side-panel/interaction-panel/interaction-panel.js+++ b/src/components/side-panel/interaction-panel/interaction-panel.js@@ -32,7 +32,7 @@ import {PanelHeaderContent,PanelContent} from 'components/common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledPanelContent = styled(PanelContent)`border-top: 1px solid ${props => props.theme.panelBorderColor};diff --git a/src/components/side-panel/interaction-panel/tooltip-config.js b/src/components/side-panel/interaction-panel/tooltip-config.jsindex 549c9bb70..1b263bdf0 100644--- a/src/components/side-panel/interaction-panel/tooltip-config.js+++ b/src/components/side-panel/interaction-panel/tooltip-config.js@@ -20,7 +20,9 @@import React, {Component} from 'react';import styled from 'styled-components';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';+import {SidePanelSection,SBFlexboxNoMargin,diff --git a/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.js b/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.jsindex d3069b54b..b8eede82c 100644--- a/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.js+++ b/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.js@@ -24,7 +24,7 @@ import {ChickletButton, ChickletTag} from 'components/common/item-selector/chickimport {Hash, Delete} from 'components/common/icons';import DropdownList from 'components/common/item-selector/dropdown-list';import {Tooltip} from 'components/common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import onClickOutside from 'react-onclickoutside';import {FIELD_OPTS} from 'constants/default-settings';import {TOOLTIP_FORMATS, TOOLTIP_FORMAT_TYPES, TOOLTIP_KEY} from 'constants/tooltip';diff --git a/src/components/side-panel/layer-manager.js b/src/components/side-panel/layer-manager.jsindex 826989c3b..85f01135c 100644--- a/src/components/side-panel/layer-manager.js+++ b/src/components/side-panel/layer-manager.js@@ -25,7 +25,8 @@ import PropTypes from 'prop-types';import {sortableContainer, sortableElement} from 'react-sortable-hoc';import styled from 'styled-components';import {createSelector} from 'reselect';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';import {arrayMove} from 'utils/data-utils';import LayerPanelFactory from './layer-panel/layer-panel';diff --git a/src/components/side-panel/layer-panel/color-range-selector.js b/src/components/side-panel/layer-panel/color-range-selector.jsindex 707a2958d..b98bd7067 100644--- a/src/components/side-panel/layer-panel/color-range-selector.js+++ b/src/components/side-panel/layer-panel/color-range-selector.js@@ -32,7 +32,7 @@ import CustomPalette from './custom-palette';import {COLOR_RANGES} from 'constants/color-ranges';import {numberSort} from 'utils/data-utils';import {reverseColorRange} from 'utils/color-utils';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';export const ALL_TYPES = uniq(COLOR_RANGES.map(c => c.type)diff --git a/src/components/side-panel/layer-panel/dimension-scale-selector.js b/src/components/side-panel/layer-panel/dimension-scale-selector.jsindex c0890b367..cc39cebbe 100644--- a/src/components/side-panel/layer-panel/dimension-scale-selector.js+++ b/src/components/side-panel/layer-panel/dimension-scale-selector.js@@ -21,7 +21,7 @@import React from 'react';import {PanelLabel, SidePanelSection} from 'components/common/styled-components';import ItemSelector from 'components/common/item-selector/item-selector';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import {camelize} from 'utils/utils';const DimensionScaleSelector = ({label, onSelect, options, scaleType, disabled = false}) => {diff --git a/src/components/side-panel/layer-panel/layer-column-config.js b/src/components/side-panel/layer-panel/layer-column-config.jsindex 4e2a18ba6..166d402fc 100644--- a/src/components/side-panel/layer-panel/layer-column-config.js+++ b/src/components/side-panel/layer-panel/layer-column-config.js@@ -21,7 +21,7 @@import React, {Component} from 'react';import PropTypes from 'prop-types';import styled from 'styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import FieldSelector from 'components/common/field-selector';import {createSelector} from 'reselect';diff --git a/src/components/side-panel/layer-panel/layer-config-group.js b/src/components/side-panel/layer-panel/layer-config-group.jsindex e6ed8f663..eda77efbe 100644--- a/src/components/side-panel/layer-panel/layer-config-group.js+++ b/src/components/side-panel/layer-panel/layer-config-group.js@@ -22,7 +22,7 @@ import React, {Component} from 'react';import {polyfill} from 'react-lifecycles-compat';import styled from 'styled-components';import classnames from 'classnames';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import Switch from 'components/common/switch';import InfoHelper from 'components/common/info-helper';import {VertThreeDots} from 'components/common/icons';diff --git a/src/components/side-panel/layer-panel/layer-configurator.js b/src/components/side-panel/layer-panel/layer-configurator.jsindex 2dd77cf43..4aae8dcd5 100644--- a/src/components/side-panel/layer-panel/layer-configurator.js+++ b/src/components/side-panel/layer-panel/layer-configurator.js@@ -22,7 +22,7 @@import React, {Component, Fragment} from 'react';import PropTypes from 'prop-types';import styled from 'styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import {Button, Input, PanelLabel, SidePanelSection} from 'components/common/styled-components';import ItemSelector from 'components/common/item-selector/item-selector';diff --git a/src/components/side-panel/layer-panel/layer-panel-header.js b/src/components/side-panel/layer-panel/layer-panel-header.jsindex 6ab961807..586251574 100644--- a/src/components/side-panel/layer-panel/layer-panel-header.js+++ b/src/components/side-panel/layer-panel/layer-panel-header.js@@ -27,7 +27,7 @@ import PanelHeaderAction from 'components/side-panel/panel-header-action';import {ArrowDown, EyeSeen, EyeUnseen, Trash, VertDots} from 'components/common/icons';import {InlineInput, StyledPanelHeader} from 'components/common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const propTypes = {// requireddiff --git a/src/components/side-panel/layer-panel/layer-type-selector.js b/src/components/side-panel/layer-panel/layer-type-selector.jsindex 02b3244a0..a29bd03d3 100644--- a/src/components/side-panel/layer-panel/layer-type-selector.js+++ b/src/components/side-panel/layer-panel/layer-type-selector.js@@ -28,7 +28,7 @@ import ItemSelector from 'components/common/item-selector/item-selector';import {CLOUDFRONT} from 'constants/default-settings';import {SidePanelSection} from 'components/common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const ITEM_SIZE = {large: 50,diff --git a/src/components/side-panel/layer-panel/text-label-panel.js b/src/components/side-panel/layer-panel/text-label-panel.jsindex 240a3377b..dac2ea3d8 100644--- a/src/components/side-panel/layer-panel/text-label-panel.js+++ b/src/components/side-panel/layer-panel/text-label-panel.js@@ -20,7 +20,7 @@import React, {Component} from 'react';import PropTypes from 'prop-types';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import {Button,diff --git a/src/components/side-panel/layer-panel/vis-config-slider.js b/src/components/side-panel/layer-panel/vis-config-slider.jsindex 2a449afec..cf7bde877 100644--- a/src/components/side-panel/layer-panel/vis-config-slider.js+++ b/src/components/side-panel/layer-panel/vis-config-slider.js@@ -23,7 +23,7 @@ import PropTypes from 'prop-types';import {PanelLabel, SidePanelSection} from 'components/common/styled-components';import RangeSliderFactory from 'components/common/range-slider';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const propTypes = {layer: PropTypes.object.isRequired,diff --git a/src/components/side-panel/layer-panel/vis-config-switch.js b/src/components/side-panel/layer-panel/vis-config-switch.jsindex 55d705929..433478a14 100644--- a/src/components/side-panel/layer-panel/vis-config-switch.js+++ b/src/components/side-panel/layer-panel/vis-config-switch.js@@ -25,7 +25,7 @@ import InfoHelper from 'components/common/info-helper';import Switch from 'components/common/switch';import {SidePanelSection, PanelLabel} from 'components/common/styled-components';import {capitalizeFirstLetter} from 'utils/utils';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const propTypes = {layer: PropTypes.object.isRequired,diff --git a/src/components/side-panel/map-manager.js b/src/components/side-panel/map-manager.jsindex 56d54ecfe..e607da935 100644--- a/src/components/side-panel/map-manager.js+++ b/src/components/side-panel/map-manager.js@@ -29,7 +29,8 @@ import {Add} from 'components/common/icons';import {DEFAULT_LAYER_GROUPS} from 'constants/default-settings';import ColorSelector from './layer-panel/color-selector';import {createSelector} from 'reselect';-import {FormattedMessage, injectIntl} from 'react-intl';+import {injectIntl} from 'react-intl';+import {FormattedMessage} from 'localization';MapManagerFactory.deps = [MapStyleSelectorFactory, LayerGroupSelectorFactory];diff --git a/src/components/side-panel/map-style-panel/map-layer-selector.js b/src/components/side-panel/map-style-panel/map-layer-selector.jsindex f404f29c9..64dc7a7bb 100644--- a/src/components/side-panel/map-style-panel/map-layer-selector.js+++ b/src/components/side-panel/map-style-panel/map-layer-selector.js@@ -30,7 +30,7 @@ import {PanelLabelWrapper,CenterFlexbox} from 'components/common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import {camelize} from 'utils/utils';const StyledInteractionPanel = styled.div`diff --git a/src/components/side-panel/map-style-panel/map-style-selector.js b/src/components/side-panel/map-style-panel/map-style-selector.jsindex d42b0d9e2..428fe5150 100644--- a/src/components/side-panel/map-style-panel/map-style-selector.js+++ b/src/components/side-panel/map-style-panel/map-style-selector.js@@ -30,7 +30,7 @@ import {PanelLabel,StyledPanelHeader} from 'components/common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledMapDropdown = styled(StyledPanelHeader)`height: 48px;diff --git a/src/components/side-panel/panel-header-action.js b/src/components/side-panel/panel-header-action.jsindex c9db17b21..3cbeaa052 100644--- a/src/components/side-panel/panel-header-action.js+++ b/src/components/side-panel/panel-header-action.js@@ -22,7 +22,7 @@ import React, {Component} from 'react';import PropTypes from 'prop-types';import classnames from 'classnames';import styled from 'styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import {Tooltip} from 'components/common/styled-components';const HeaderActionWrapper = styled.div`diff --git a/src/components/side-panel/panel-header.js b/src/components/side-panel/panel-header.jsindex 85b155cf2..7604736f2 100644--- a/src/components/side-panel/panel-header.js+++ b/src/components/side-panel/panel-header.js@@ -28,7 +28,7 @@ import {Save, DataTable, Save2, Picture, Db, Map as MapIcon, Share} from 'componimport ClickOutsideCloseDropdown from 'components/side-panel/panel-dropdown';import Toolbar from 'components/common/toolbar';import ToolbarItem from 'components/common/toolbar-item';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledPanelHeader = styled.div.attrs({className: 'side-side-panel__header'diff --git a/src/components/side-panel/panel-toggle.js b/src/components/side-panel/panel-toggle.jsindex 818e2b23f..46c3842b2 100644--- a/src/components/side-panel/panel-toggle.js+++ b/src/components/side-panel/panel-toggle.js@@ -21,7 +21,7 @@import React from 'react';import PropTypes from 'prop-types';import styled from 'styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';import {Tooltip} from 'components/common/styled-components';const propTypes = {diff --git a/src/layers/icon-layer/icon-info-modal.js b/src/layers/icon-layer/icon-info-modal.jsindex 7a85e06f9..2b4fc6f64 100644--- a/src/layers/icon-layer/icon-info-modal.js+++ b/src/layers/icon-layer/icon-info-modal.js@@ -22,7 +22,7 @@ import React from 'react';import styled from 'styled-components';import {line} from 'd3-shape';import {Table, CenterFlexbox} from 'components/common/styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const lineFunction = line().x(d => d[0] * 10)diff --git a/src/layers/trip-layer/trip-info-modal.js b/src/layers/trip-layer/trip-info-modal.jsindex 0078c3d38..ca4b91820 100644--- a/src/layers/trip-layer/trip-info-modal.js+++ b/src/layers/trip-layer/trip-info-modal.js@@ -20,7 +20,7 @@import React from 'react';import styled from 'styled-components';-import {FormattedMessage} from 'react-intl';+import {FormattedMessage} from 'localization';const StyledCode = styled.code`color: ${props => props.theme.titleColorLT};diff --git a/src/localization/formatted-message.js b/src/localization/formatted-message.jsnew file mode 100644index 000000000..d77e97f62--- /dev/null+++ b/src/localization/formatted-message.js@@ -0,0 +1,33 @@+// Copyright (c) 2020 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++import React from 'react';+import {FormattedMessage} from 'react-intl';++const ExhancedFormattedMessage = props => (+ <FormattedMessage+ id={props.id}+ // Us id as default Message to prevent error being thrown+ defaultMessage={props.defaultMessage || props.id}+ {...props}+ />+);++export default ExhancedFormattedMessage;diff --git a/src/localization/index.js b/src/localization/index.jsindex 9968df53d..0ae127a35 100644--- a/src/localization/index.js+++ b/src/localization/index.js@@ -22,14 +22,16 @@ import en from './en';import {flattenMessages} from 'utils/locale-utils';import {LOCALE_CODES} from './locales';-const en_flat = flattenMessages(en);+const enFlat = flattenMessages(en);export const messages = Object.keys(LOCALE_CODES).reduce((acc, key) => ({...acc,- [key]: key === 'en' ? en_flat : {...en_flat, ...flattenMessages(require(`./${key}`).default)}+ [key]: key === 'en' ? enFlat : {...enFlat, ...flattenMessages(require(`./${key}`).default)}}),{});export {LOCALE_CODES, LOCALES} from './locales';++export {default as FormattedMessage} from './formatted-message';diff --git a/src/utils/locale-utils.js b/src/utils/locale-utils.jsindex 2dce51ea1..ae31267d7 100644--- a/src/utils/locale-utils.js+++ b/src/utils/locale-utils.js@@ -18,6 +18,9 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.+import {isObject} from './utils';+import {console as Console} from 'global/console';+// Flat messages since react-intl does not seem to support nested structures// Adapted from https://medium.com/siren-apparel-press/internationalization-and-localization-of-sirenapparel-eu-sirenapparel-us-and-sirenapparel-asia-ddee266066a2export const flattenMessages = (nestedMessages, prefix = '') => {@@ -32,3 +35,25 @@ export const flattenMessages = (nestedMessages, prefix = '') => {return messages;}, {});};++export const mergeMessages = (defaultMessages, userMessages) => {+ if (!isObject(userMessages) || !isObject(userMessages.en)) {+ Console.error(+ 'message should be an object and contain at least the `en` translation. Read more at https://docs.kepler.gl/docs/api-reference/localization'+ );++ return defaultMessages;+ }++ const userEnFlat = flattenMessages(userMessages.en);+ return Object.keys(defaultMessages).reduce(+ (acc, key) => ({+ ...acc,+ [key]:+ key === 'en'+ ? {...defaultMessages.en, ...userEnFlat}+ : {...defaultMessages[key], ...userEnFlat, ...flattenMessages(userMessages[key] || {})}+ }),+ {}+ );+};