matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull locale from state, almost get dynamic locales working #7

Browse Source
This commit is contained in:
Alex Gleason
2020-04-28 15:25:10 -05:00
parent ea5643f138
commit c0f17cfc21
4 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/gabsocial/actions/settings.js
View File

@ -21,6 +21,8 @@ const defaultSettings = ImmutableMap({
deleteModal: true,
defaultPrivacy: 'public',
theme: 'lime',
// locale: navigator.language.slice(0, 2) || 'en', // FIXME: Dynamic locales
locale: 'en',
systemFont: false,
dyslexicFont: false,

61
app/gabsocial/containers/gabsocial.js
View File

@ -24,9 +24,6 @@ import { fetchMe } from 'gabsocial/actions/me';
import PublicLayout from 'gabsocial/features/public_layout';
import { getSettings } from 'gabsocial/actions/settings';
const { localeData, messages } = getLocale();
addLocaleData(localeData);
export const store = configureStore();
const hydrateAction = hydrateStore(initialState);
@ -50,6 +47,7 @@ const mapStateToProps = (state) => {
systemFont: settings.get('systemFont'),
dyslexicFont: settings.get('dyslexicFont'),
demetricator: settings.get('demetricator'),
locale: settings.get('locale'),
};
};
@ -64,12 +62,16 @@ class GabSocialMount extends React.PureComponent {
systemFont: PropTypes.bool,
dyslexicFont: PropTypes.bool,
demetricator: PropTypes.bool,
locale: PropTypes.string.isRequired,
};
render() {
const { me, theme, reduceMotion, systemFont, dyslexicFont, demetricator } = this.props;
const { me, theme, reduceMotion, systemFont, dyslexicFont, demetricator, locale } = this.props;
if (me === null) return null;
const { localeData, messages } = getLocale();
addLocaleData(localeData);
// Disabling introduction for launch
// const { showIntroduction } = this.props;
//
@ -86,21 +88,24 @@ class GabSocialMount extends React.PureComponent {
});
return (
<>
<Helmet>
<body className={bodyClass} />
{theme && <link rel='stylesheet' href={`/packs/css/${theme}.chunk.css`} />}
</Helmet>
<BrowserRouter>
<ScrollContext>
<Switch>
{!me && <Route exact path='/' component={PublicLayout} />}
<Route exact path='/about/:slug?' component={PublicLayout} />
<Route path='/' component={UI} />
</Switch>
</ScrollContext>
</BrowserRouter>
</>
<IntlProvider locale={locale} messages={messages}>
<>
<Helmet>
<body className={bodyClass} />
<script src={`/packs/js/locale_${locale}.chunk.js`} />
{theme && <link rel='stylesheet' href={`/packs/css/${theme}.chunk.css`} />}
</Helmet>
<BrowserRouter>
<ScrollContext>
<Switch>
{!me && <Route exact path='/' component={PublicLayout} />}
<Route exact path='/about/:slug?' component={PublicLayout} />
<Route path='/' component={UI} />
</Switch>
</ScrollContext>
</BrowserRouter>
</>
</IntlProvider>
);
}
@ -108,21 +113,13 @@ class GabSocialMount extends React.PureComponent {
export default class GabSocial extends React.PureComponent {
static propTypes = {
locale: PropTypes.string.isRequired,
};
render() {
const { locale } = this.props;
return (
<IntlProvider locale={locale} messages={messages}>
<Provider store={store}>
<ErrorBoundary>
<GabSocialMount />
</ErrorBoundary>
</Provider>
</IntlProvider>
<Provider store={store}>
<ErrorBoundary>
<GabSocialMount />
</ErrorBoundary>
</Provider>
);
}

3
app/gabsocial/main.js
View File

@ -22,9 +22,8 @@ function main() {
ready(() => {
const mountNode = document.getElementById('gabsocial');
const props = JSON.parse(mountNode.getAttribute('data-props'));
ReactDOM.render(<GabSocial {...props} />, mountNode);
ReactDOM.render(<GabSocial />, mountNode);
if (process.env.NODE_ENV === 'production') {
// avoid offline in dev mode because it's harder to debug
require('offline-plugin/runtime').install();