diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-05-12 09:12:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 09:12:55 -0400 |
| commit | 1397798f1763b0848957a8672c8d40b6243764d5 (patch) | |
| tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/components/root.jsx | |
| parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
| parent | 9d109b070037951fcd0832b785eba8a3db9a157c (diff) | |
| download | chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2 chat-1397798f1763b0848957a8672c8d40b6243764d5.zip | |
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'webapp/components/root.jsx')
| -rw-r--r-- | webapp/components/root.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx index 6907e84e4..701ee6e80 100644 --- a/webapp/components/root.jsx +++ b/webapp/components/root.jsx @@ -20,8 +20,8 @@ export default class Root extends React.Component { constructor(props) { super(props); this.state = { - locale: 'en', - translations: null + locale: LocalizationStore.getLocale(), + translations: LocalizationStore.getTranslations() }; this.localizationChanged = this.localizationChanged.bind(this); @@ -113,7 +113,7 @@ export default class Root extends React.Component { LocalizationStore.addChangeListener(this.localizationChanged); // Get our localizaiton - GlobalActions.loadDefaultLocale(); + GlobalActions.loadCurrentLocale(); } componentWillUnmount() { |