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

Merge pull request #2886 from bhldev/padOptionsLang 

Set language cookie on initial load Issue #2882
This commit is contained in:
John McLear 2016-01-19 23:48:30 +00:00
parent 13d9bdf03a 295672f598
commit d994baeefa
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/node/hooks/express/specialpages.js
View File

@ -2,6 +2,7 @@ var path = require('path');
var eejs = require('ep_etherpad-lite/node/eejs');
var toolbar = require("ep_etherpad-lite/node/utils/toolbar");
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
var settings = require('../../utils/Settings');
exports.expressCreateServer = function (hook_name, args, cb) {
// expose current stats
@ -33,6 +34,13 @@ exports.expressCreateServer = function (hook_name, args, cb) {
//serve pad.html under /p
args.app.get('/p/:pad', function(req, res, next)
{
// Set language for pad editor for the first time
// Or if language cookie doesn't exist
if (req.cookies.language === undefined)
{
res.cookie('language', settings.padOptions.lang);
}
// The below might break for pads being rewritten
var isReadOnly = req.url.indexOf("/p/r.") === 0;
@ -54,7 +62,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
hooks.callAll("padInitToolbar", {
toolbar: toolbar
});
res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html", {
req: req,
toolbar: toolbar