treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] Upgrade react-intl 

Port 44cd88adc4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
pull/62/head
Renaud Chaput 2023-05-31 23:43:39 +02:00 committed by Claire
parent 85722a918d
commit 9e133e2527
111 changed files with 168 additions and 1349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/actions/notifications.js
View File

@ -1,4 +1,4 @@
import IntlMessageFormat from 'intl-messageformat'; import { IntlMessageFormat } from 'intl-messageformat';
import { defineMessages } from 'react-intl'; import { defineMessages } from 'react-intl';
import { List as ImmutableList } from 'immutable'; import { List as ImmutableList } from 'immutable';

11
app/javascript/flavours/glitch/components/domain.tsx
View File

@ -1,8 +1,7 @@
import { useCallback } from 'react'; import { useCallback } from 'react';
import * as React from 'react'; import * as React from 'react';
import type { InjectedIntl } from 'react-intl'; import { defineMessages, useIntl } from 'react-intl';
import { defineMessages, injectIntl } from 'react-intl';
import { IconButton } from './icon_button'; import { IconButton } from './icon_button';
@ -16,9 +15,11 @@ const messages = defineMessages({
interface Props { interface Props {
domain: string; domain: string;
onUnblockDomain: (domain: string) => void; onUnblockDomain: (domain: string) => void;
intl: InjectedIntl;
} }
const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
export const Domain: React.FC<Props> = ({ domain, onUnblockDomain }) => {
const intl = useIntl();
const handleDomainUnblock = useCallback(() => { const handleDomainUnblock = useCallback(() => {
onUnblockDomain(domain); onUnblockDomain(domain);
}, [domain, onUnblockDomain]); }, [domain, onUnblockDomain]);
@ -42,5 +43,3 @@ const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
</div> </div>
); );
}; };
export const Domain = injectIntl(_Domain);

10
app/javascript/flavours/glitch/components/load_gap.tsx
View File

@ -1,7 +1,6 @@
import { useCallback } from 'react'; import { useCallback } from 'react';
import type { InjectedIntl } from 'react-intl'; import { useIntl, defineMessages } from 'react-intl';
import { injectIntl, defineMessages } from 'react-intl';
import { Icon } from 'flavours/glitch/components/icon'; import { Icon } from 'flavours/glitch/components/icon';
@ -13,10 +12,11 @@ interface Props {
disabled: boolean; disabled: boolean;
maxId: string; maxId: string;
onClick: (maxId: string) => void; onClick: (maxId: string) => void;
intl: InjectedIntl;
} }
const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => { export const LoadGap: React.FC<Props> = ({ disabled, maxId, onClick }) => {
const intl = useIntl();
const handleClick = useCallback(() => { const handleClick = useCallback(() => {
onClick(maxId); onClick(maxId);
}, [maxId, onClick]); }, [maxId, onClick]);
@ -32,5 +32,3 @@ const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => {
</button> </button>
); );
}; };
export const LoadGap = injectIntl(_LoadGap);

14
app/javascript/flavours/glitch/components/relative_timestamp.tsx
View File

@ -1,6 +1,6 @@
import { Component } from 'react'; import { Component } from 'react';
import type { InjectedIntl } from 'react-intl'; import type { IntlShape } from 'react-intl';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
const messages = defineMessages({ const messages = defineMessages({
@ -103,7 +103,7 @@ const getUnitDelay = (units: string) => {
}; };
export const timeAgoString = ( export const timeAgoString = (
intl: InjectedIntl, intl: IntlShape,
date: Date, date: Date,
now: number, now: number,
year: number, year: number,
@ -155,7 +155,7 @@ export const timeAgoString = (
}; };
const timeRemainingString = ( const timeRemainingString = (
intl: InjectedIntl, intl: IntlShape,
date: Date, date: Date,
now: number, now: number,
timeGiven = true timeGiven = true
@ -190,7 +190,7 @@ const timeRemainingString = (
}; };
interface Props { interface Props {
intl: InjectedIntl; intl: IntlShape;
timestamp: string; timestamp: string;
year: number; year: number;
futureDate?: boolean; futureDate?: boolean;
@ -201,7 +201,7 @@ interface States {
} }
class RelativeTimestamp extends Component<Props, States> { class RelativeTimestamp extends Component<Props, States> {
state = { state = {
now: this.props.intl.now(), now: Date.now(),
}; };
static defaultProps = { static defaultProps = {
@ -223,7 +223,7 @@ class RelativeTimestamp extends Component<Props, States> {
UNSAFE_componentWillReceiveProps(nextProps: Props) { UNSAFE_componentWillReceiveProps(nextProps: Props) {
if (this.props.timestamp !== nextProps.timestamp) { if (this.props.timestamp !== nextProps.timestamp) {
this.setState({ now: this.props.intl.now() }); this.setState({ now: Date.now() });
} }
} }
@ -253,7 +253,7 @@ class RelativeTimestamp extends Component<Props, States> {
: Math.max(updateInterval, unitRemainder); : Math.max(updateInterval, unitRemainder);
this._timer = window.setTimeout(() => { this._timer = window.setTimeout(() => {
this.setState({ now: this.props.intl.now() }); this.setState({ now: Date.now() });
}, delay); }, delay);
} }

9
app/javascript/flavours/glitch/containers/admin_component.jsx
View File

@ -1,12 +1,11 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { PureComponent } from 'react'; import { PureComponent } from 'react';
import { IntlProvider, addLocaleData } from 'react-intl'; import { IntlProvider } from 'react-intl';
import { getLocale } from 'mastodon/locales'; import { getLocale, onProviderError } from 'mastodon/locales';
const { localeData, messages } = getLocale(); const { messages } = getLocale();
addLocaleData(localeData);
export default class AdminComponent extends PureComponent { export default class AdminComponent extends PureComponent {
@ -19,7 +18,7 @@ export default class AdminComponent extends PureComponent {
const { locale, children } = this.props; const { locale, children } = this.props;
return ( return (
<IntlProvider locale={locale} messages={messages}> <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
{children} {children}
</IntlProvider> </IntlProvider>
); );

9
app/javascript/flavours/glitch/containers/compose_container.jsx
View File

@ -1,7 +1,7 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { PureComponent } from 'react'; import { PureComponent } from 'react';
import { IntlProvider, addLocaleData } from 'react-intl'; import { IntlProvider } from 'react-intl';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
@ -11,10 +11,9 @@ import Compose from 'flavours/glitch/features/standalone/compose';
import initialState from 'flavours/glitch/initial_state'; import initialState from 'flavours/glitch/initial_state';
import { store } from 'flavours/glitch/store'; import { store } from 'flavours/glitch/store';
import { getLocale } from 'mastodon/locales'; import { getLocale, onProviderError } from 'mastodon/locales';
const { localeData, messages } = getLocale(); const { messages } = getLocale();
addLocaleData(localeData);
if (initialState) { if (initialState) {
store.dispatch(hydrateStore(initialState)); store.dispatch(hydrateStore(initialState));
@ -32,7 +31,7 @@ export default class TimelineContainer extends PureComponent {
const { locale } = this.props; const { locale } = this.props;
return ( return (
<IntlProvider locale={locale} messages={messages}> <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
<Provider store={store}> <Provider store={store}>
<Compose /> <Compose />
</Provider> </Provider>

9
app/javascript/flavours/glitch/containers/mastodon.jsx
View File

@ -1,7 +1,7 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { PureComponent } from 'react'; import { PureComponent } from 'react';
import { IntlProvider, addLocaleData } from 'react-intl'; import { IntlProvider } from 'react-intl';
import { Helmet } from 'react-helmet'; import { Helmet } from 'react-helmet';
import { BrowserRouter, Route } from 'react-router-dom'; import { BrowserRouter, Route } from 'react-router-dom';
@ -18,10 +18,9 @@ import ErrorBoundary from 'flavours/glitch/components/error_boundary';
import UI from 'flavours/glitch/features/ui'; import UI from 'flavours/glitch/features/ui';
import initialState, { title as siteTitle } from 'flavours/glitch/initial_state'; import initialState, { title as siteTitle } from 'flavours/glitch/initial_state';
import { store } from 'flavours/glitch/store'; import { store } from 'flavours/glitch/store';
import { getLocale } from 'locales'; import { getLocale, onProviderError } from 'locales';
const { localeData, messages } = getLocale(); const { messages } = getLocale();
addLocaleData(localeData);
const title = process.env.NODE_ENV === 'production' ? siteTitle : `${siteTitle} (Dev)`; const title = process.env.NODE_ENV === 'production' ? siteTitle : `${siteTitle} (Dev)`;
@ -87,7 +86,7 @@ export default class Mastodon extends PureComponent {
const { locale } = this.props; const { locale } = this.props;
return ( return (
<IntlProvider locale={locale} messages={messages}> <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
<ReduxProvider store={store}> <ReduxProvider store={store}>
<ErrorBoundary> <ErrorBoundary>
<BrowserRouter> <BrowserRouter>

9
app/javascript/flavours/glitch/containers/media_container.jsx
View File

@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import { PureComponent } from 'react'; import { PureComponent } from 'react';
import { createPortal } from 'react-dom'; import { createPortal } from 'react-dom';
import { IntlProvider, addLocaleData } from 'react-intl'; import { IntlProvider } from 'react-intl';
import { fromJS } from 'immutable'; import { fromJS } from 'immutable';
@ -16,10 +16,9 @@ import MediaModal from 'flavours/glitch/features/ui/components/media_modal';
import Video from 'flavours/glitch/features/video'; import Video from 'flavours/glitch/features/video';
import { getScrollbarWidth } from 'flavours/glitch/utils/scrollbar'; import { getScrollbarWidth } from 'flavours/glitch/utils/scrollbar';
import { getLocale } from 'mastodon/locales'; import { getLocale, onProviderError } from 'mastodon/locales';
const { localeData, messages } = getLocale(); const { messages } = getLocale();
addLocaleData(localeData);
const MEDIA_COMPONENTS = { MediaGallery, Video, Card, Poll, Hashtag, Audio }; const MEDIA_COMPONENTS = { MediaGallery, Video, Card, Poll, Hashtag, Audio };
@ -85,7 +84,7 @@ export default class MediaContainer extends PureComponent {
} }
return ( return (
<IntlProvider locale={locale} messages={messages}> <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
<> <>
{[].map.call(components, (component, i) => { {[].map.call(components, (component, i) => {
const componentName = component.getAttribute('data-component'); const componentName = component.getAttribute('data-component');

21
app/javascript/flavours/glitch/load_locale.js Normal file
View File

@ -0,0 +1,21 @@
import { setLocale } from 'locales';
export async function loadLocale() {
const locale = document.querySelector('html').lang || 'en';
const upstreamLocaleData = await import(
/* webpackMode: "lazy" */
/* webpackChunkName: "locales/vanilla/[request]" */
/* webpackInclude: /\.json$/ */
/* webpackPreload: true */
`mastodon/locales/${locale}.json`);
const localeData = await import(
/* webpackMode: "lazy" */
/* webpackChunkName: "locales/glitch/[request]" */
/* webpackInclude: /\.json$/ */
/* webpackPreload: true */
`flavours/glitch/locales/${locale}.json`);
setLocale({ messages: {...upstreamLocaleData, ...localeData} });
}

1114
app/javascript/flavours/glitch/locales/defaultMessages.json
View File

File diff suppressed because it is too large Load Diff

2
app/javascript/flavours/glitch/locales/whitelist_af.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_an.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ar.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ast.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_be.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_bg.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_bn.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_br.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_bs.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ca.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ckb.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_co.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_cs.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_cy.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_da.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_de.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_el.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_en-GB.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_en.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_eo.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_es-AR.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_es-MX.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_es.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_et.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_eu.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_fa.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_fi.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_fo.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_fr-QC.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_fr.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_fy.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ga.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_gd.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_gl.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_he.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_hi.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_hr.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_hu.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_hy.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_id.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ig.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_io.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_is.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_it.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ja.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ka.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_kab.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_kk.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_kn.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ko.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ku.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_kw.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_la.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_lt.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_lv.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_mk.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ml.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_mr.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ms.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_my.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_nl.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_nn.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_no.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_oc.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_pa.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_pl.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_pt-BR.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_pt-PT.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ro.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ru.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sa.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sc.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sco.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_si.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sk.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sl.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sq.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sr-Latn.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sr.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_sv.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_szl.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ta.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_tai.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_te.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_th.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_tr.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_tt.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ug.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_uk.json
View File

@ -1,2 +0,0 @@
[
]

2
app/javascript/flavours/glitch/locales/whitelist_ur.json
View File

@ -1,2 +0,0 @@
[
]

Some files were not shown because too many files have changed in this diff Show More