diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-22 16:31:58 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-22 16:31:58 -0600 |
| commit | c2d98c2c1f4860c11aedf43aff5e360256a89835 (patch) | |
| tree | 4304f7584025477d74e5e70677c4f5a70c26bb58 /web/templates | |
| parent | 6e2c1b7fd5248c6a4a91edcd59fa124c8d3c744a (diff) | |
| parent | d352c5b64dddfb8e46b18edbd7352c41495078a1 (diff) | |
| download | chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.gz chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.bz2 chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.zip | |
merging
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/head.html | 36 | ||||
| -rw-r--r-- | web/templates/login.html | 2 |
2 files changed, 34 insertions, 4 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index 689c69d3c..4060d2410 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -15,6 +15,19 @@ <!-- iOS add to homescreen --> <!-- Android add to homescreen --> + <link rel="apple-touch-icon" sizes="57x57" href="/static/images/favicon/apple-touch-icon-57x57.png"> + <link rel="apple-touch-icon" sizes="60x60" href="/static/images/favicon/apple-touch-icon-60x60.png"> + <link rel="apple-touch-icon" sizes="72x72" href="/static/images/favicon/apple-touch-icon-72x72.png"> + <link rel="apple-touch-icon" sizes="76x76" href="/static/images/favicon/apple-touch-icon-76x76.png"> + <link rel="apple-touch-icon" sizes="114x114" href="/static/images/favicon/apple-touch-icon-114x114.png"> + <link rel="apple-touch-icon" sizes="120x120" href="/static/images/favicon/apple-touch-icon-120x120.png"> + <link rel="apple-touch-icon" sizes="144x144" href="/static/images/favicon/apple-touch-icon-144x144.png"> + <link rel="apple-touch-icon" sizes="152x152" href="/static/images/favicon/apple-touch-icon-152x152.png"> + <link rel="apple-touch-icon" sizes="180x180" href="/static/images/favicon/apple-touch-icon-180x180.png"> + <link rel="icon" type="image/png" sizes="32x32" href="/static/images/favicon/favicon-32x32.png"> + <link rel="icon" type="image/png" sizes="192x192" href="/static/images/favicon/android-chrome-192x192.png"> + <link rel="icon" type="image/png" sizes="96x96" href="/static/images/favicon/favicon-96x96.png"> + <link rel="icon" type="image/png" sizes="16x16" href="/static/images/favicon/favicon-16x16.png"> <link rel="manifest" href="/static/config/manifest.json"> <!-- Android add to homescreen --> @@ -27,11 +40,15 @@ <link rel="stylesheet" href="/static/css/katex.min.css"> <link rel="stylesheet" class="code_theme" href=""> - <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon"> - <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon"> + <script src="/static/js/intl-1.0.0/Intl.js"></script> + <script src="/static/js/intl-1.0.0/locale-data/jsonp/en.js"></script> + <script src="/static/js/intl-1.0.0/locale-data/jsonp/es.js"></script> <script src="/static/js/react-0.14.3.js"></script> <script src="/static/js/react-dom-0.14.3.js"></script> + <script src="/static/js/react-intl-2.0.0-beta-2/react-intl.js"></script> + <script src="/static/js/react-intl-2.0.0-beta-2/locale-data/en.js"></script> + <script src="/static/js/react-intl-2.0.0-beta-2/locale-data/es.js"></script> <script src="/static/js/jquery-2.1.4.js"></script> <script src="/static/js/bootstrap-3.3.5.js"></script> <script src="/static/js/bootstrap-colorpicker.min.js"></script> @@ -45,16 +62,29 @@ <style id="antiClickjack">body{display:none !important;}</style> <script> + ReactIntl.addLocaleData(ReactIntlLocaleData.en); + ReactIntl.addLocaleData(ReactIntlLocaleData.es); + window.mm_config = {{ .ClientCfg }}; window.mm_license = {{ .ClientLicense }}; window.mm_team = {{ .Team }}; window.mm_user = {{ .User }}; window.mm_channel = {{ .Channel }}; + window.mm_locale = {{ .Locale }}; if ({{.SessionTokenIndex}} >= 0) { window.mm_session_token_index = {{.SessionTokenIndex}}; $.ajaxSetup({ - headers: { 'X-MM-TokenIndex': mm_session_token_index } + headers: { + 'X-MM-TokenIndex': mm_session_token_index, + 'Accept-Language': mm_locale + } + }); + } else { + $.ajaxSetup({ + headers: { + 'Accept-Language': mm_locale + } }); } diff --git a/web/templates/login.html b/web/templates/login.html index a5809a1f4..f6a551220 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -20,7 +20,7 @@ </div> </div> <script> -window.setup_login_page({{ .Props }}); + window.setup_login_page({{ .Props }}); </script> </body> </html> |