diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-25 20:59:01 -0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-25 20:59:01 -0500 |
commit | c44048e5f95b4be43443761c2d7645fee456897c (patch) | |
tree | 2694d508473fa5c66a841743b9e92fb0b2155e58 /web/templates/head.html | |
parent | 2a29232185ed169a9e63e479b7eb67f289be7b68 (diff) | |
parent | 64247fd18c915bda5a2c00e61f0880f153e76235 (diff) | |
download | chat-c44048e5f95b4be43443761c2d7645fee456897c.tar.gz chat-c44048e5f95b4be43443761c2d7645fee456897c.tar.bz2 chat-c44048e5f95b4be43443761c2d7645fee456897c.zip |
Merge pull request #1985 from mattermost/PLT-7-client-infra5
PLT-7 fixing error bar msg
Diffstat (limited to 'web/templates/head.html')
-rw-r--r-- | web/templates/head.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index 4060d2410..845cc76e7 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -62,8 +62,11 @@ <style id="antiClickjack">body{display:none !important;}</style> <script> - ReactIntl.addLocaleData(ReactIntlLocaleData.en); - ReactIntl.addLocaleData(ReactIntlLocaleData.es); + if ('ReactIntl' in window && 'ReactIntlLocaleData' in window) { + Object.keys(ReactIntlLocaleData).forEach((lang) => { + ReactIntl.addLocaleData(ReactIntlLocaleData[lang]); + }); + } window.mm_config = {{ .ClientCfg }}; window.mm_license = {{ .ClientLicense }}; |