Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 01:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #5220

Browse Source
This commit is contained in:
barisusakli
2016-11-20 15:11:34 +03:00
parent 51b41a9b44
commit 2c77a88ba4
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
public/src/app.js
View File

@@ -640,18 +640,24 @@ app.cacheBuster = null;
} else if (window.localStorage.getItem('cookieconsent') === '1') { } else if (window.localStorage.getItem('cookieconsent') === '1') {
return; return;
} }
require(['translator'], function (translator) {
config.cookies.message = translator.unescape(config.cookies.message);
config.cookies.dismiss = translator.unescape(config.cookies.dismiss);
config.cookies.link = translator.unescape(config.cookies.link)
templates.parse('partials/cookie-consent', config.cookies, function (html) { app.parseAndTranslate('partials/cookie-consent', config.cookies, function (html) {
$(document.body).append(html); $(document.body).append(html);
var warningEl = $('.cookie-consent'); var warningEl = $('.cookie-consent');
var dismissEl = warningEl.find('button'); var dismissEl = warningEl.find('button');
dismissEl.on('click', function () { dismissEl.on('click', function () {
// Save consent cookie and remove warning element // Save consent cookie and remove warning element
var now = new Date(); var now = new Date();
window.localStorage.setItem('cookieconsent', '1'); window.localStorage.setItem('cookieconsent', '1');
warningEl.remove(); warningEl.remove();
});
}); });
}); });
}; };
}()); }());

7
src/controllers/api.js
View File

@@ -12,6 +12,7 @@ var categories = require('../categories');
var privileges = require('../privileges'); var privileges = require('../privileges');
var plugins = require('../plugins'); var plugins = require('../plugins');
var widgets = require('../widgets'); var widgets = require('../widgets');
var translator = require('../../public/src/modules/translator');
var accountHelpers = require('../controllers/accounts/helpers'); var accountHelpers = require('../controllers/accounts/helpers');
var apiController = {}; var apiController = {};
@@ -66,9 +67,9 @@ apiController.getConfig = function (req, res, next) {
config.cookies = { config.cookies = {
enabled: parseInt(meta.config.cookieConsentEnabled, 10) === 1, enabled: parseInt(meta.config.cookieConsentEnabled, 10) === 1,
message: meta.config.cookieConsentMessage || '[[global:cookies.message]]', message: translator.escape(meta.config.cookieConsentMessage || '[[global:cookies.message]]').replace(/\\/g, '\\\\'),
dismiss: meta.config.cookieConsentDismiss || '[[global:cookies.accept]]', dismiss: translator.escape(meta.config.cookieConsentDismiss || '[[global:cookies.accept]]').replace(/\\/g, '\\\\'),
link: meta.config.cookieConsentLink || '[[global:cookies.learn_more]]' link: translator.escape(meta.config.cookieConsentLink || '[[global:cookies.learn_more]]').replace(/\\/g, '\\\\')
}; };
async.waterfall([ async.waterfall([