From b416402f107dd34d4438b0f93ef147ba4f684ca2 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Wed, 14 Nov 2012 19:38:35 +0100 Subject: [PATCH] Fix language auto-detection --- src/templates/index.html | 5 ++--- src/templates/pad.html | 17 ++++++++--------- src/templates/timeslider.html | 15 ++++++++++----- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/templates/index.html b/src/templates/index.html index ee3009dd1..c1214007f 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -31,7 +31,6 @@ - @@ -188,11 +187,11 @@ (function(document) { // Set language for l10n var language = document.cookie.match(/language=(\w{2})/); - document.documentElement.lang = language? language[1] : 'en'; + if(language) document.documentElement.lang = language[1]; })(document) // start the custom js if (typeof customStart == "function") customStart(); - + diff --git a/src/templates/pad.html b/src/templates/pad.html index 2e169cc07..35f0b5dee 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -33,7 +33,6 @@ - @@ -370,10 +369,9 @@ <% e.begin_block("scripts"); %> - + + @@ -399,10 +402,6 @@ + + @@ -184,10 +193,6 @@ var clientVars = {}; (function () { - // Set language for l10n - var language = document.cookie.match(/language=(\w{2})/); - document.documentElement.lang = language? language[1] : 'en'; - var pathComponents = location.pathname.split('/'); // Strip 'p', the padname and 'timeslider' from the pathname and set as baseURL