libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it!"

Browse source 
This reverts commit 5fb7a03fb34078a75fe5932563e5a9fe44c57015.
This commit is contained in:
Marcel Klehr 2012-12-19 19:48:08 +01:00
parent 00d7ebc646
commit 3c3c1630b1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/node/hooks/i18n.js
View file

@ -110,16 +110,15 @@ exports.expressCreateServer = function(n, args) {
//works with /locale/en and /locale/en.json requests
var locale = req.params.locale.split('.')[0];
if (exports.availableLangs.hasOwnProperty(locale)) {
// Don't include utf8 encoding (see https://forum.jquery.com/topic/the-problem-with-ie8-and-encoding-error-c00ce56e)
res.setHeader('Content-Type', 'application/json');
res.send('{"'+locale+'":'+JSON.stringify(locales[locale])+'}');
res.setHeader('Content-Type', 'application/json; charset=utf8');
res.send('{"'+locale+'":'+JSON.stringify(locales[locale])+'}');
} else {
res.send(404, 'Language not available');
}
})
args.app.get('/locales.json', function(req, res) {
res.setHeader('Content-Type', 'application/json');// don't send encoding (see above)
res.setHeader('Content-Type', 'application/json; charset=utf8');
res.send(localeIndex);
})