fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1192 from marcelklehr/fix/l10n-ie-bug 

Fix #1186 Autodetection wouldn't work correctly in IE9
This commit is contained in:
John McLear 2012-11-21 08:46:14 -08:00
parent a6cbcc9d51 dcb3da829d
commit 4fb46c0063
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static/js/l10n.js
View File

@ -902,7 +902,7 @@ document.webL10n = (function(window, document, undefined) {
// browser-specific startup // browser-specific startup
if (document.addEventListener) { // modern browsers and IE9+ if (document.addEventListener) { // modern browsers and IE9+
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
var lang = document.documentElement.lang || navigator.language; var lang = document.documentElement.lang || navigator.language || navigator.userLanguage || 'en';
loadLocale(lang, translateFragment); loadLocale(lang, translateFragment);
}, false); }, false);
} else if (window.attachEvent) { // IE8 and before (= oldIE) } else if (window.attachEvent) { // IE8 and before (= oldIE)
@ -977,7 +977,7 @@ document.webL10n = (function(window, document, undefined) {
// startup for IE<9 // startup for IE<9
window.attachEvent('onload', function() { window.attachEvent('onload', function() {
gTextProp = document.body.textContent ? 'textContent' : 'innerText'; gTextProp = document.body.textContent ? 'textContent' : 'innerText';
var lang = document.documentElement.lang || window.navigator.userLanguage; var lang = document.documentElement.lang || navigator.language || navigator.userLanguage || 'en';
loadLocale(lang, translateFragment); loadLocale(lang, translateFragment);
}); });
} }