Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, but we've deleted it.
  Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
  Reworked upstream, but the code was mostly in
  `app/javascript/locales/index.js` in glitch-soc.
  Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
  Deleted upstream, as upstream now directly loads the
  JSON at runtime.
  Deleted as well, will switch to runtime loading in
  an upcoming commit.
- `config/webpack/shared.js`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
  Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
  instead.
  Moved the glitch-soc logic there and deleted the file.

.eslintrc.js

@@ -293,6 +293,7 @@ module.exports = {
         '.*rc.js',
         'ide-helper.js',
         'config/webpack/**/*',
+        'config/formatjs-formatter.js',
       ],
 
       env: {

.github/workflows/check-i18n.yml

@@ -41,8 +41,7 @@ jobs:
 
       - name: Check for missing strings in English JSON
         run: |
-          yarn build:development
+          yarn i18n:extract --throws
-          yarn manage:translations en
           git diff --exit-code
 
       - name: Check locale file normalization

app/javascript/locales/index.js

@@ -7,3 +7,16 @@ export function setLocale(locale) {
 export function getLocale() {
   return theLocale;
 }
+
+export function onProviderError(error) {
+  // Silent the error, like upstream does
+  if(process.env.NODE_ENV === 'production') return;
+
+  // This browser does not advertise Intl support for this locale, we only print a warning
+  // As-per the spec, the browser should select the best matching locale
+  if(typeof error === "object" && error.message.match("MISSING_DATA")) {
+    console.warn(error.message);
+  }
+
+  console.error(error);
+}

app/javascript/mastodon/actions/notifications.js

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

app/javascript/mastodon/components/domain.tsx

@@ -1,7 +1,6 @@
 import { useCallback } 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';
 
@@ -15,9 +14,11 @@ const messages = defineMessages({
 interface Props {
   domain: string;
   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(() => {
     onUnblockDomain(domain);
   }, [domain, onUnblockDomain]);
@@ -41,5 +42,3 @@ const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
     </div>
   );
 };
-
-export const Domain = injectIntl(_Domain);

app/javascript/mastodon/components/load_gap.tsx

@@ -1,7 +1,6 @@
 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 'mastodon/components/icon';
 
@@ -13,10 +12,11 @@ interface Props {
   disabled: boolean;
   maxId: string;
   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(() => {
     onClick(maxId);
   }, [maxId, onClick]);
@@ -32,5 +32,3 @@ const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => {
     </button>
   );
 };
-
-export const LoadGap = injectIntl(_LoadGap);

app/javascript/mastodon/components/relative_timestamp.tsx

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

app/javascript/mastodon/containers/admin_component.jsx

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

app/javascript/mastodon/containers/compose_container.jsx

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

app/javascript/mastodon/containers/mastodon.jsx

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

app/javascript/mastodon/containers/media_container.jsx

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

app/javascript/mastodon/features/onboarding/follows.jsx

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { FormattedMessage, FormattedHTMLMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
@@ -77,7 +77,7 @@ class Follows extends PureComponent {
             {loadedContent}
           </div>
 
-          <p className='onboarding__lead'><FormattedHTMLMessage id='onboarding.tips.accounts_from_other_servers' defaultMessage='<strong>Did you know?</strong> Since Mastodon is decentralized, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!' /></p>
+          <p className='onboarding__lead'><FormattedMessage id='onboarding.tips.accounts_from_other_servers' defaultMessage='<strong>Did you know?</strong> Since Mastodon is decentralized, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!' values={{ strong: chunks => <strong>{chunks}</strong> }} /></p>
 
           <div className='onboarding__footer'>
             <button className='link-button' onClick={onBack}><FormattedMessage id='onboarding.actions.back' defaultMessage='Take me back' /></button>

app/javascript/mastodon/features/onboarding/share.jsx

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage, FormattedHTMLMessage } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
@@ -168,9 +168,9 @@ class Share extends PureComponent {
           <CopyPasteText value={intl.formatMessage(messages.shareableMessage, { username: `@${account.get('username')}@${domain}`, url })} />
 
           <TipCarousel>
-            <div><p className='onboarding__lead'><FormattedHTMLMessage id='onboarding.tips.verification' defaultMessage='<strong>Did you know?</strong> You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!' /></p></div>
+            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.verification' defaultMessage='<strong>Did you know?</strong> You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!'  values={{ strong: chunks => <strong>{chunks}</strong> }}  /></p></div>
-            <div><p className='onboarding__lead'><FormattedHTMLMessage id='onboarding.tips.migration' defaultMessage='<strong>Did you know?</strong> If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!' values={{ domain }} /></p></div>
+            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.migration' defaultMessage='<strong>Did you know?</strong> If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!' values={{ domain, strong: chunks => <strong>{chunks}</strong> }} /></p></div>
-            <div><p className='onboarding__lead'><FormattedHTMLMessage id='onboarding.tips.2fa' defaultMessage='<strong>Did you know?</strong> You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!' /></p></div>
+            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.2fa' defaultMessage='<strong>Did you know?</strong> You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!'  values={{ strong: chunks => <strong>{chunks}</strong> }}  /></p></div>
           </TipCarousel>
 
           <p className='onboarding__lead'><FormattedMessage id='onboarding.share.next_steps' defaultMessage='Possible next steps:' /></p>

app/javascript/mastodon/load_locale.js

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

app/javascript/mastodon/locales/whitelist_af.json

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

app/javascript/mastodon/locales/whitelist_an.json

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

app/javascript/mastodon/locales/whitelist_ar.json

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

app/javascript/mastodon/locales/whitelist_ast.json

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

app/javascript/mastodon/locales/whitelist_be.json

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

app/javascript/mastodon/locales/whitelist_bg.json

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

app/javascript/mastodon/locales/whitelist_bn.json

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

app/javascript/mastodon/locales/whitelist_br.json

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

app/javascript/mastodon/locales/whitelist_bs.json

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

app/javascript/mastodon/locales/whitelist_ca.json

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

app/javascript/mastodon/locales/whitelist_ckb.json

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

app/javascript/mastodon/locales/whitelist_co.json

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

app/javascript/mastodon/locales/whitelist_cs.json

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

app/javascript/mastodon/locales/whitelist_csb.json

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

app/javascript/mastodon/locales/whitelist_cy.json

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

app/javascript/mastodon/locales/whitelist_da.json

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

app/javascript/mastodon/locales/whitelist_de.json

@@ -1,5 +0,0 @@
-[
-  "account.badges.bot",
-  "compose_form.publish_loud",
-  "search_results.hashtags"
-]

app/javascript/mastodon/locales/whitelist_el.json

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

app/javascript/mastodon/locales/whitelist_en-GB.json

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

app/javascript/mastodon/locales/whitelist_en.json

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

app/javascript/mastodon/locales/whitelist_eo.json

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

app/javascript/mastodon/locales/whitelist_es-AR.json

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

app/javascript/mastodon/locales/whitelist_es-MX.json

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

app/javascript/mastodon/locales/whitelist_es.json

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

app/javascript/mastodon/locales/whitelist_et.json

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

app/javascript/mastodon/locales/whitelist_eu.json

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

app/javascript/mastodon/locales/whitelist_fa.json

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

app/javascript/mastodon/locales/whitelist_fi.json

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

app/javascript/mastodon/locales/whitelist_fo.json

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

app/javascript/mastodon/locales/whitelist_fr-QC.json

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

app/javascript/mastodon/locales/whitelist_fr.json

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

app/javascript/mastodon/locales/whitelist_fy.json

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

app/javascript/mastodon/locales/whitelist_ga.json

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

app/javascript/mastodon/locales/whitelist_gd.json

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

app/javascript/mastodon/locales/whitelist_gl.json

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

app/javascript/mastodon/locales/whitelist_he.json

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

app/javascript/mastodon/locales/whitelist_hi.json

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

app/javascript/mastodon/locales/whitelist_hr.json

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

app/javascript/mastodon/locales/whitelist_hu.json

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

app/javascript/mastodon/locales/whitelist_hy.json

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

app/javascript/mastodon/locales/whitelist_id.json

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

app/javascript/mastodon/locales/whitelist_ig.json

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

app/javascript/mastodon/locales/whitelist_io.json

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

app/javascript/mastodon/locales/whitelist_is.json

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

app/javascript/mastodon/locales/whitelist_it.json

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

app/javascript/mastodon/locales/whitelist_ja.json

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

app/javascript/mastodon/locales/whitelist_ka.json

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

app/javascript/mastodon/locales/whitelist_kab.json

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

app/javascript/mastodon/locales/whitelist_kk.json

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

app/javascript/mastodon/locales/whitelist_kn.json

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

app/javascript/mastodon/locales/whitelist_ko.json

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

app/javascript/mastodon/locales/whitelist_ku.json

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

app/javascript/mastodon/locales/whitelist_kw.json

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

app/javascript/mastodon/locales/whitelist_la.json

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

app/javascript/mastodon/locales/whitelist_lt.json

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

app/javascript/mastodon/locales/whitelist_lv.json

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

app/javascript/mastodon/locales/whitelist_mk.json

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

app/javascript/mastodon/locales/whitelist_ml.json

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

app/javascript/mastodon/locales/whitelist_mr.json

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

app/javascript/mastodon/locales/whitelist_ms.json

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

app/javascript/mastodon/locales/whitelist_my.json

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

app/javascript/mastodon/locales/whitelist_nl.json

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

app/javascript/mastodon/locales/whitelist_nn.json

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

app/javascript/mastodon/locales/whitelist_no.json

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

app/javascript/mastodon/locales/whitelist_oc.json

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

app/javascript/mastodon/locales/whitelist_pa.json

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

app/javascript/mastodon/locales/whitelist_pl.json

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

app/javascript/mastodon/locales/whitelist_pt-BR.json

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

app/javascript/mastodon/locales/whitelist_pt-PT.json

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

app/javascript/mastodon/locales/whitelist_ro.json

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

app/javascript/mastodon/locales/whitelist_ru.json

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

app/javascript/mastodon/locales/whitelist_sa.json

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

app/javascript/mastodon/locales/whitelist_sc.json

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

app/javascript/mastodon/locales/whitelist_sco.json

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

app/javascript/mastodon/locales/whitelist_si.json

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

app/javascript/mastodon/locales/whitelist_sk.json

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

app/javascript/mastodon/locales/whitelist_sl.json

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

app/javascript/mastodon/locales/whitelist_sq.json

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

app/javascript/mastodon/locales/whitelist_sr-Latn.json

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

app/javascript/mastodon/locales/whitelist_sr.json

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

app/javascript/mastodon/locales/whitelist_sv.json

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

app/javascript/mastodon/locales/whitelist_szl.json

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

app/javascript/mastodon/locales/whitelist_ta.json

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

app/javascript/mastodon/locales/whitelist_tai.json

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

app/javascript/mastodon/locales/whitelist_te.json

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