diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-26 09:49:55 -0500 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-26 09:49:55 -0500 |
| commit | 2b1b1e28e113f8a902f2e2f8d8a639acddbea316 (patch) | |
| tree | 41e566f8bb970b6027c02d428597daedd2d8f30b | |
| parent | ab5425f9b9f8a2e3ead637a27dc01bc9d06e16b7 (diff) | |
| parent | 746b7d4a247c6d870d2bc53a779c5730ebc8a1d0 (diff) | |
| download | chat-2b1b1e28e113f8a902f2e2f8d8a639acddbea316.tar.gz chat-2b1b1e28e113f8a902f2e2f8d8a639acddbea316.tar.bz2 chat-2b1b1e28e113f8a902f2e2f8d8a639acddbea316.zip | |
Merge pull request #1987 from mattermost/PLT-7-fix
PLT-7 fixing loc on safari
| -rw-r--r-- | web/templates/head.html | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index 32bf337bc..fc16eb2dc 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -62,14 +62,11 @@ <style id="antiClickjack">body{display:none !important;}</style> <script> - // if ('ReactIntl' in window && 'ReactIntlLocaleData' in window) { - // Object.keys(ReactIntlLocaleData).forEach((lang) => { - // ReactIntl.addLocaleData(ReactIntlLocaleData[lang]); - // }); - // } - - ReactIntl.addLocaleData(ReactIntlLocaleData.en); - ReactIntl.addLocaleData(ReactIntlLocaleData.es); + if ('ReactIntl' in window && 'ReactIntlLocaleData' in window) { + Object.keys(ReactIntlLocaleData).forEach(function(lang) { + ReactIntl.addLocaleData(ReactIntlLocaleData[lang]); + }); + } window.mm_config = {{ .ClientCfg }}; window.mm_license = {{ .ClientLicense }}; |