mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 01:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Move locale detection to the client

Browse source 
* l10n.js is doing locale detection already, so
we shouldn't interfere but help it do its job
* this should also fix the ?lang embed parameter
* Set language from cookie on page init for l10n
to load the right translation
This commit is contained in:
Marcel Klehr 2012-11-14 17:01:59 +01:00
parent ffb7cf47f2
commit f5563ab704
4 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/templates/index.html
View file

@ -32,7 +32,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<script type="text/javascript" src="static/js/l10n.js"></script>
<link rel="resource" type="application/l10n" href="locale.ini" />
<link rel="resource" type="application/l10n" href="locales.ini" />
<link rel="shortcut icon" href="<%=settings.favicon%>">
<style>
@ -185,6 +185,12 @@
return randomstring;
}
(function(document) {
// Set language for l10n
var language = document.cookie.match(/language=(\w{2})/);
document.documentElement.lang = language? language[1] : 'en';
})(document)
// start the custom js
if (typeof customStart == "function") customStart();
</script>

6
src/templates/pad.html
View file

@ -34,7 +34,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<script type="text/javascript" src="../static/js/l10n.js"></script>
<link rel="resource" type="application/l10n" href="../locale.ini" />
<link rel="resource" type="application/l10n" href="../locales.ini" />
<link rel="shortcut icon" href="<%=settings.favicon%>">
@ -399,7 +399,9 @@
<script type="text/javascript">
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('/');

5
src/templates/timeslider.html
View file

@ -33,7 +33,7 @@
<meta name="robots" content="noindex, nofollow">
<link rel="shortcut icon" href="<%=settings.favicon%>">
<script type="text/javascript" src="../../static/js/l10n.js"></script>
<link rel="resource" type="application/l10n" href="../../locale.ini" />
<link rel="resource" type="application/l10n" href="../../locales.ini" />
<link rel="stylesheet" href="../../static/css/pad.css">
<link rel="stylesheet" href="../../static/css/timeslider.css">
<link rel="stylesheet" href="../../static/custom/timeslider.css">
@ -184,6 +184,9 @@
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('/');