[Glitch] Fix /share and cleanup and reorganize frontend locale loading
				
					
				
			Port b0780cfeed to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
			
			
This commit is contained in:
		@@ -1,8 +1,6 @@
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import { PureComponent } from 'react';
 | 
			
		||||
 | 
			
		||||
import { IntlProvider } from 'react-intl';
 | 
			
		||||
 | 
			
		||||
import { Helmet } from 'react-helmet';
 | 
			
		||||
import { BrowserRouter, Route } from 'react-router-dom';
 | 
			
		||||
 | 
			
		||||
@@ -17,10 +15,8 @@ import { connectUserStream } from 'flavours/glitch/actions/streaming';
 | 
			
		||||
import ErrorBoundary from 'flavours/glitch/components/error_boundary';
 | 
			
		||||
import UI from 'flavours/glitch/features/ui';
 | 
			
		||||
import initialState, { title as siteTitle } from 'flavours/glitch/initial_state';
 | 
			
		||||
import { IntlProvider } from 'flavours/glitch/locales';
 | 
			
		||||
import { store } from 'flavours/glitch/store';
 | 
			
		||||
import { getLocale, onProviderError } from 'locales';
 | 
			
		||||
 | 
			
		||||
const { messages } = getLocale();
 | 
			
		||||
 | 
			
		||||
const title = process.env.NODE_ENV === 'production' ? siteTitle : `${siteTitle} (Dev)`;
 | 
			
		||||
 | 
			
		||||
@@ -44,10 +40,6 @@ const createIdentityContext = state => ({
 | 
			
		||||
 | 
			
		||||
export default class Mastodon extends PureComponent {
 | 
			
		||||
 | 
			
		||||
  static propTypes = {
 | 
			
		||||
    locale: PropTypes.string.isRequired,
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  static childContextTypes = {
 | 
			
		||||
    identity: PropTypes.shape({
 | 
			
		||||
      signedIn: PropTypes.bool.isRequired,
 | 
			
		||||
@@ -83,10 +75,8 @@ export default class Mastodon extends PureComponent {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  render () {
 | 
			
		||||
    const { locale } = this.props;
 | 
			
		||||
 | 
			
		||||
    return (
 | 
			
		||||
      <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
 | 
			
		||||
      <IntlProvider>
 | 
			
		||||
        <ReduxProvider store={store}>
 | 
			
		||||
          <ErrorBoundary>
 | 
			
		||||
            <BrowserRouter>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user