deps: i18next 10 -> 23, react-i18next 7 -> 14
Modernizes the whole i18n stack:
- 48 translate([], {wait:true}) / translate() HOCs -> withTranslation()
- react.wait:true -> react.useSuspense:false
- whitelist -> supportedLngs; added compatibilityJSON: 'v3' so our
natural-language keys + v3 _plural layout keep working (custom
separators ss/eth/dj preserved)
- backends: xhr -> i18next-http-backend (client), sync-fs ->
i18next-fs-backend (server); dropped i18next-localstorage-cache
(was enabled:false); languagedetector 2 -> 8
- ReSendEmail: <Interpolate> (removed in v10) -> <Trans values={{email}}/>,
dropped the removed bare t export
- saveMissing handler signature (lngs, ns, key, fallbackValue)
Silences the per-component Translate/I18n legacy-context warnings.
Browser-verified es/en switch and <Trans> interpolation on /fires;
REST smoke byte-identical.
This commit is contained in:
parent
f1eae84e25
commit
12bdbe8fed
52 changed files with 226 additions and 553 deletions
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
import React, { Component } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { translate } from 'react-i18next';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
import { GoogleLayer } from 'react-leaflet-google/lib/';
|
||||
import Gkeys from '/imports/startup/client/Gkeys';
|
||||
import { TileLayer, LayersControl } from 'react-leaflet';
|
||||
|
|
@ -85,4 +85,4 @@ DefMapLayers.defaultProps = {
|
|||
satellite: false
|
||||
};
|
||||
|
||||
export default translate([], { wait: true })(DefMapLayers);
|
||||
export default withTranslation()(DefMapLayers);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import React, { Component, Fragment } from 'react';
|
|||
import { CircleMarker, Marker, Tooltip } from 'react-leaflet';
|
||||
import PropTypes from 'prop-types';
|
||||
import { fireIconS, fireIconM, fireIconL, nFireIcon, industryIcon, regIndustryIcon } from '/imports/ui/components/Maps/Icons';
|
||||
import { translate } from 'react-i18next';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
import { onMarkClick } from './MarkListeners';
|
||||
import FirePopup from './FirePopup';
|
||||
|
||||
|
|
@ -80,4 +80,4 @@ FireIconMark.propTypes = {
|
|||
t: PropTypes.func.isRequired
|
||||
};
|
||||
|
||||
export default translate([], { wait: true })(FireIconMark);
|
||||
export default withTranslation()(FireIconMark);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
import React from 'react';
|
||||
import { CircleMarker } from 'react-leaflet';
|
||||
import PropTypes from 'prop-types';
|
||||
import { translate } from 'react-i18next';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
import FirePopup from './FirePopup';
|
||||
|
||||
/* Less acurate (1 pixel per fire) but faster */
|
||||
|
|
@ -34,4 +34,4 @@ FirePixel.propTypes = {
|
|||
t: PropTypes.func.isRequired
|
||||
};
|
||||
|
||||
export default translate([], { wait: true })(FirePixel);
|
||||
export default withTranslation()(FirePixel);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
import React, { Fragment } from 'react';
|
||||
import { Tooltip } from 'react-leaflet';
|
||||
import PropTypes from 'prop-types';
|
||||
import { translate } from 'react-i18next';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
|
||||
const FirePopup = ({
|
||||
lat,
|
||||
|
|
@ -29,4 +29,4 @@ FirePopup.propTypes = {
|
|||
t: PropTypes.func.isRequired
|
||||
};
|
||||
|
||||
export default translate([], { wait: true })(FirePopup);
|
||||
export default withTranslation()(FirePopup);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
import React, { Component } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { translate } from 'react-i18next';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
import FullscreenControl from 'react-leaflet-fullscreen';
|
||||
import 'react-leaflet-fullscreen/dist/styles.css';
|
||||
|
||||
|
|
@ -25,4 +25,4 @@ FullScreenMap.propTypes = {
|
|||
t: PropTypes.func.isRequired
|
||||
};
|
||||
|
||||
export default translate([], { wait: true })(FullScreenMap);
|
||||
export default withTranslation()(FullScreenMap);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue