From 78005d6124cc029344ff1d039211b4e61bab3b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 22 Jun 2017 18:12:35 -0400 Subject: [PATCH 01/16] show old groups first --- src/controllers/admin/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/admin/groups.js b/src/controllers/admin/groups.js index 5e7dd1e78f..b15f7197d1 100644 --- a/src/controllers/admin/groups.js +++ b/src/controllers/admin/groups.js @@ -16,7 +16,7 @@ groupsController.list = function (req, res, next) { async.waterfall([ function (next) { - db.getSortedSetRevRange('groups:createtime', 0, -1, next); + db.getSortedSetRange('groups:createtime', 0, -1, next); }, function (groupNames, next) { groupNames = groupNames.filter(function (name) { From 0f234601f1492e6cf3d855b0a9c7b4c27644a8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 22 Jun 2017 19:03:49 -0400 Subject: [PATCH 02/16] style changes --- src/controllers/admin/appearance.js | 5 +- src/controllers/admin/cache.js | 5 +- src/controllers/admin/dashboard.js | 121 +++++++++--------- src/controllers/admin/database.js | 49 ++++---- src/controllers/admin/errors.js | 37 +++--- src/controllers/admin/events.js | 42 +++---- src/controllers/admin/groups.js | 39 +++--- src/controllers/admin/homepage.js | 49 +++----- src/controllers/admin/languages.js | 33 ++--- src/controllers/admin/logger.js | 4 +- src/controllers/admin/logs.js | 24 ++-- src/controllers/admin/plugins.js | 86 ++++++------- src/controllers/admin/rewards.js | 19 +-- src/controllers/admin/settings.js | 48 ++++--- src/controllers/admin/sounds.js | 55 ++++---- src/controllers/admin/tags.js | 22 ++-- src/controllers/admin/themes.js | 36 +++--- src/controllers/admin/users.js | 188 ++++++++++++++-------------- src/controllers/admin/widgets.js | 22 ++-- src/controllers/topics.js | 5 +- 20 files changed, 428 insertions(+), 461 deletions(-) diff --git a/src/controllers/admin/appearance.js b/src/controllers/admin/appearance.js index 021733d417..65256f62ad 100644 --- a/src/controllers/admin/appearance.js +++ b/src/controllers/admin/appearance.js @@ -1,12 +1,9 @@ 'use strict'; -var appearanceController = {}; +var appearanceController = module.exports; appearanceController.get = function (req, res) { var term = req.params.term ? req.params.term : 'themes'; res.render('admin/appearance/' + term, {}); }; - - -module.exports = appearanceController; diff --git a/src/controllers/admin/cache.js b/src/controllers/admin/cache.js index dea5f0345b..1284be08be 100644 --- a/src/controllers/admin/cache.js +++ b/src/controllers/admin/cache.js @@ -1,6 +1,6 @@ 'use strict'; -var cacheController = {}; +var cacheController = module.exports; cacheController.get = function (req, res) { var postCache = require('../../posts/cache'); @@ -37,6 +37,3 @@ cacheController.get = function (req, res) { }, }); }; - - -module.exports = cacheController; diff --git a/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.js index 70149e580e..8b1751d2a6 100644 --- a/src/controllers/admin/dashboard.js +++ b/src/controllers/admin/dashboard.js @@ -7,76 +7,79 @@ var db = require('../../database'); var meta = require('../../meta'); var plugins = require('../../plugins'); -var dashboardController = {}; - +var dashboardController = module.exports; dashboardController.get = function (req, res, next) { - async.parallel({ - stats: function (next) { - getStats(next); - }, - notices: function (next) { - var notices = [ - { - done: !meta.reloadRequired, - doneText: '[[admin/general/dashboard:restart-not-required]]', - notDoneText: '[[admin/general/dashboard:restart-required]]', - }, - { - done: plugins.hasListeners('filter:search.query'), - doneText: '[[admin/general/dashboard:search-plugin-installed]]', - notDoneText: '[[admin/general/dashboard:search-plugin-not-installed]]', - tooltip: '[[admin/general/dashboard:search-plugin-tooltip]]', - link: '/admin/extend/plugins', + async.waterfall([ + function (next) { + async.parallel({ + stats: function (next) { + getStats(next); }, - ]; + notices: function (next) { + var notices = [ + { + done: !meta.reloadRequired, + doneText: '[[admin/general/dashboard:restart-not-required]]', + notDoneText: '[[admin/general/dashboard:restart-required]]', + }, + { + done: plugins.hasListeners('filter:search.query'), + doneText: '[[admin/general/dashboard:search-plugin-installed]]', + notDoneText: '[[admin/general/dashboard:search-plugin-not-installed]]', + tooltip: '[[admin/general/dashboard:search-plugin-tooltip]]', + link: '/admin/extend/plugins', + }, + ]; - if (global.env !== 'production') { - notices.push({ - done: false, - notDoneText: '[[admin/general/dashboard:running-in-development]]', - }); - } + if (global.env !== 'production') { + notices.push({ + done: false, + notDoneText: '[[admin/general/dashboard:running-in-development]]', + }); + } - plugins.fireHook('filter:admin.notices', notices, next); + plugins.fireHook('filter:admin.notices', notices, next); + }, + }, next); }, - }, function (err, results) { - if (err) { - return next(err); - } - res.render('admin/general/dashboard', { - version: nconf.get('version'), - notices: results.notices, - stats: results.stats, - }); - }); + function (results) { + res.render('admin/general/dashboard', { + version: nconf.get('version'), + notices: results.notices, + stats: results.stats, + }); + }, + ], next); }; function getStats(callback) { - async.parallel([ + async.waterfall([ function (next) { - getStatsForSet('ip:recent', 'uniqueIPCount', next); - }, - function (next) { - getStatsForSet('users:joindate', 'userCount', next); - }, - function (next) { - getStatsForSet('posts:pid', 'postCount', next); - }, - function (next) { - getStatsForSet('topics:tid', 'topicCount', next); + async.parallel([ + function (next) { + getStatsForSet('ip:recent', 'uniqueIPCount', next); + }, + function (next) { + getStatsForSet('users:joindate', 'userCount', next); + }, + function (next) { + getStatsForSet('posts:pid', 'postCount', next); + }, + function (next) { + getStatsForSet('topics:tid', 'topicCount', next); + }, + ], next); }, - ], function (err, results) { - if (err) { - return callback(err); - } - results[0].name = '[[admin/general/dashboard:unique-visitors]]'; - results[1].name = '[[admin/general/dashboard:users]]'; - results[2].name = '[[admin/general/dashboard:posts]]'; - results[3].name = '[[admin/general/dashboard:topics]]'; + function (results, next) { + results[0].name = '[[admin/general/dashboard:unique-visitors]]'; + results[1].name = '[[admin/general/dashboard:users]]'; + results[2].name = '[[admin/general/dashboard:posts]]'; + results[3].name = '[[admin/general/dashboard:topics]]'; - callback(null, results); - }); + next(null, results); + }, + ], callback); } function getStatsForSet(set, field, callback) { @@ -108,5 +111,3 @@ function getGlobalField(field, callback) { callback(err, parseInt(count, 10) || 0); }); } - -module.exports = dashboardController; diff --git a/src/controllers/admin/database.js b/src/controllers/admin/database.js index 9ce8a3c00f..efec771ee6 100644 --- a/src/controllers/admin/database.js +++ b/src/controllers/admin/database.js @@ -3,33 +3,32 @@ var async = require('async'); var nconf = require('nconf'); -var databaseController = {}; - +var databaseController = module.exports; databaseController.get = function (req, res, next) { - async.parallel({ - redis: function (next) { - if (nconf.get('redis')) { - var rdb = require('../../database/redis'); - rdb.info(rdb.client, next); - } else { - next(); - } + async.waterfall([ + function (next) { + async.parallel({ + redis: function (next) { + if (nconf.get('redis')) { + var rdb = require('../../database/redis'); + rdb.info(rdb.client, next); + } else { + next(); + } + }, + mongo: function (next) { + if (nconf.get('mongo')) { + var mdb = require('../../database/mongo'); + mdb.info(mdb.client, next); + } else { + next(); + } + }, + }, next); }, - mongo: function (next) { - if (nconf.get('mongo')) { - var mdb = require('../../database/mongo'); - mdb.info(mdb.client, next); - } else { - next(); - } + function (results) { + res.render('admin/advanced/database', results); }, - }, function (err, results) { - if (err) { - return next(err); - } - res.render('admin/advanced/database', results); - }); + ], next); }; - -module.exports = databaseController; diff --git a/src/controllers/admin/errors.js b/src/controllers/admin/errors.js index 5a00e95537..55f790edab 100644 --- a/src/controllers/admin/errors.js +++ b/src/controllers/admin/errors.js @@ -6,33 +6,28 @@ var json2csv = require('json-2-csv').json2csv; var meta = require('../../meta'); var analytics = require('../../analytics'); -var errorsController = {}; +var errorsController = module.exports; errorsController.get = function (req, res, next) { - async.parallel({ - 'not-found': async.apply(meta.errors.get, true), - analytics: async.apply(analytics.getErrorAnalytics), - }, function (err, data) { - if (err) { - return next(err); - } - - res.render('admin/advanced/errors', data); - }); + async.waterfall([ + function (next) { + async.parallel({ + 'not-found': async.apply(meta.errors.get, true), + analytics: async.apply(analytics.getErrorAnalytics), + }, next); + }, + function (data) { + res.render('admin/advanced/errors', data); + }, + ], next); }; errorsController.export = function (req, res, next) { async.waterfall([ async.apply(meta.errors.get, false), async.apply(json2csv), - ], function (err, csv) { - if (err) { - return next(err); - } - - res.set('Content-Type', 'text/csv').set('Content-Disposition', 'attachment; filename="404.csv"').send(csv); - }); + function (csv) { + res.set('Content-Type', 'text/csv').set('Content-Disposition', 'attachment; filename="404.csv"').send(csv); + }, + ], next); }; - - -module.exports = errorsController; diff --git a/src/controllers/admin/events.js b/src/controllers/admin/events.js index 97838d2266..f6988ef72e 100644 --- a/src/controllers/admin/events.js +++ b/src/controllers/admin/events.js @@ -6,8 +6,7 @@ var db = require('../../database'); var events = require('../../events'); var pagination = require('../../pagination'); -var eventsController = {}; - +var eventsController = module.exports; eventsController.get = function (req, res, next) { var page = parseInt(req.query.page, 10) || 1; @@ -15,27 +14,26 @@ eventsController.get = function (req, res, next) { var start = (page - 1) * itemsPerPage; var stop = start + itemsPerPage - 1; - async.parallel({ - eventCount: function (next) { - db.sortedSetCard('events:time', next); + async.waterfall([ + function (next) { + async.parallel({ + eventCount: function (next) { + db.sortedSetCard('events:time', next); + }, + events: function (next) { + events.getEvents(start, stop, next); + }, + }, next); }, - events: function (next) { - events.getEvents(start, stop, next); + function (results) { + var pageCount = Math.max(1, Math.ceil(results.eventCount / itemsPerPage)); + + res.render('admin/advanced/events', { + events: results.events, + pagination: pagination.create(page, pageCount), + next: 20, + }); }, - }, function (err, results) { - if (err) { - return next(err); - } - - var pageCount = Math.max(1, Math.ceil(results.eventCount / itemsPerPage)); - - res.render('admin/advanced/events', { - events: results.events, - pagination: pagination.create(page, pageCount), - next: 20, - }); - }); + ], next); }; - -module.exports = eventsController; diff --git a/src/controllers/admin/groups.js b/src/controllers/admin/groups.js index b15f7197d1..b8d9291474 100644 --- a/src/controllers/admin/groups.js +++ b/src/controllers/admin/groups.js @@ -7,7 +7,7 @@ var groups = require('../../groups'); var meta = require('../../meta'); var pagination = require('../../pagination'); -var groupsController = {}; +var groupsController = module.exports; groupsController.list = function (req, res, next) { var page = parseInt(req.query.page, 10) || 1; @@ -30,20 +30,14 @@ groupsController.list = function (req, res, next) { groupNames = groupNames.slice(start, stop + 1); groups.getGroupsData(groupNames, next); }, - function (groupData, next) { - next(null, { groups: groupData, pagination: pagination.create(page, pageCount) }); + function (groupData) { + res.render('admin/manage/groups', { + groups: groupData, + pagination: pagination.create(page, pageCount), + yourid: req.uid, + }); }, - ], function (err, data) { - if (err) { - return next(err); - } - - res.render('admin/manage/groups', { - groups: data.groups, - pagination: data.pagination, - yourid: req.uid, - }); - }); + ], next); }; groupsController.get = function (req, res, callback) { @@ -58,13 +52,12 @@ groupsController.get = function (req, res, callback) { } groups.get(groupName, { uid: req.uid, truncateUserList: true, userListCount: 20 }, next); }, - ], function (err, group) { - if (err) { - return callback(err); - } - group.isOwner = true; - res.render('admin/manage/group', { group: group, allowPrivateGroups: parseInt(meta.config.allowPrivateGroups, 10) === 1 }); - }); + function (group) { + group.isOwner = true; + res.render('admin/manage/group', { + group: group, + allowPrivateGroups: parseInt(meta.config.allowPrivateGroups, 10) === 1, + }); + }, + ], callback); }; - -module.exports = groupsController; diff --git a/src/controllers/admin/homepage.js b/src/controllers/admin/homepage.js index 1450283847..bc0971622f 100644 --- a/src/controllers/admin/homepage.js +++ b/src/controllers/admin/homepage.js @@ -7,8 +7,7 @@ var categories = require('../../categories'); var privileges = require('../../privileges'); var plugins = require('../../plugins'); -var homePageController = {}; - +var homePageController = module.exports; homePageController.get = function (req, res, next) { async.waterfall([ @@ -28,39 +27,29 @@ homePageController.get = function (req, res, next) { name: 'Category: ' + category.name, }; }); - next(null, categoryData); - }, - ], function (err, categoryData) { - if (err || !categoryData) { - categoryData = []; - } - - plugins.fireHook('filter:homepage.get', { routes: [ - { - route: 'categories', - name: 'Categories', - }, - { - route: 'recent', - name: 'Recent', - }, - { - route: 'popular', - name: 'Popular', - }, - ].concat(categoryData) }, function (err, data) { - if (err) { - return next(err); - } + plugins.fireHook('filter:homepage.get', { routes: [ + { + route: 'categories', + name: 'Categories', + }, + { + route: 'recent', + name: 'Recent', + }, + { + route: 'popular', + name: 'Popular', + }, + ].concat(categoryData) }, next); + }, + function (data) { data.routes.push({ route: '', name: 'Custom', }); res.render('admin/general/homepage', data); - }); - }); + }, + ], next); }; - -module.exports = homePageController; diff --git a/src/controllers/admin/languages.js b/src/controllers/admin/languages.js index e2d848ddae..987c1d70cc 100644 --- a/src/controllers/admin/languages.js +++ b/src/controllers/admin/languages.js @@ -1,26 +1,27 @@ 'use strict'; +var async = require('async'); + var languages = require('../../languages'); var meta = require('../../meta'); -var languagesController = {}; - +var languagesController = module.exports; languagesController.get = function (req, res, next) { - languages.list(function (err, languages) { - if (err) { - return next(err); - } - - languages.forEach(function (language) { - language.selected = language.code === (meta.config.defaultLang || 'en-GB'); - }); + async.waterfall([ + function (next) { + languages.list(next); + }, + function (languages) { + languages.forEach(function (language) { + language.selected = language.code === (meta.config.defaultLang || 'en-GB'); + }); - res.render('admin/general/languages', { - languages: languages, - autoDetectLang: parseInt(meta.config.autoDetectLang, 10) === 1, - }); - }); + res.render('admin/general/languages', { + languages: languages, + autoDetectLang: parseInt(meta.config.autoDetectLang, 10) === 1, + }); + }, + ], next); }; -module.exports = languagesController; diff --git a/src/controllers/admin/logger.js b/src/controllers/admin/logger.js index 0e8006bbeb..4d8991e88c 100644 --- a/src/controllers/admin/logger.js +++ b/src/controllers/admin/logger.js @@ -1,9 +1,7 @@ 'use strict'; -var loggerController = {}; +var loggerController = module.exports; loggerController.get = function (req, res) { res.render('admin/development/logger', {}); }; - -module.exports = loggerController; diff --git a/src/controllers/admin/logs.js b/src/controllers/admin/logs.js index c2c5166dd7..1765cfc352 100644 --- a/src/controllers/admin/logs.js +++ b/src/controllers/admin/logs.js @@ -1,21 +1,23 @@ 'use strict'; +var async = require('async'); var validator = require('validator'); -var meta = require('../../meta'); +var meta = require('../../meta'); -var logsController = {}; +var logsController = module.exports; logsController.get = function (req, res, next) { - meta.logs.get(function (err, logs) { - if (err) { - return next(err); - } - - res.render('admin/advanced/logs', { - data: validator.escape(logs), - }); - }); + async.waterfall([ + function (next) { + meta.logs.get(next); + }, + function (logs) { + res.render('admin/advanced/logs', { + data: validator.escape(logs), + }); + }, + ], next); }; diff --git a/src/controllers/admin/plugins.js b/src/controllers/admin/plugins.js index 4e8e1a415e..b04458edae 100644 --- a/src/controllers/admin/plugins.js +++ b/src/controllers/admin/plugins.js @@ -3,54 +3,54 @@ var async = require('async'); var plugins = require('../../plugins'); -var pluginsController = {}; +var pluginsController = module.exports; pluginsController.get = function (req, res, next) { - async.parallel({ - compatible: function (next) { - plugins.list(function (err, plugins) { - if (err || !Array.isArray(plugins)) { - plugins = []; - } + async.waterfall([ + function (next) { + async.parallel({ + compatible: function (next) { + plugins.list(function (err, plugins) { + if (err || !Array.isArray(plugins)) { + plugins = []; + } - next(null, plugins); - }); + next(null, plugins); + }); + }, + all: function (next) { + plugins.list(false, function (err, plugins) { + if (err || !Array.isArray(plugins)) { + plugins = []; + } + + next(null, plugins); + }); + }, + }, next); }, - all: function (next) { - plugins.list(false, function (err, plugins) { - if (err || !Array.isArray(plugins)) { - plugins = []; - } + function (payload) { + var compatiblePkgNames = payload.compatible.map(function (pkgData) { + return pkgData.name; + }); - next(null, plugins); + res.render('admin/extend/plugins', { + installed: payload.compatible.filter(function (plugin) { + return plugin.installed; + }), + upgradeCount: payload.compatible.reduce(function (count, current) { + if (current.installed && current.outdated) { + count += 1; + } + return count; + }, 0), + download: payload.compatible.filter(function (plugin) { + return !plugin.installed; + }), + incompatible: payload.all.filter(function (plugin) { + return compatiblePkgNames.indexOf(plugin.name) === -1; + }), }); }, - }, function (err, payload) { - if (err) { - return next(err); - } - var compatiblePkgNames = payload.compatible.map(function (pkgData) { - return pkgData.name; - }); - - res.render('admin/extend/plugins', { - installed: payload.compatible.filter(function (plugin) { - return plugin.installed; - }), - upgradeCount: payload.compatible.reduce(function (count, current) { - if (current.installed && current.outdated) { - count += 1; - } - return count; - }, 0), - download: payload.compatible.filter(function (plugin) { - return !plugin.installed; - }), - incompatible: payload.all.filter(function (plugin) { - return compatiblePkgNames.indexOf(plugin.name) === -1; - }), - }); - }); + ], next); }; - -module.exports = pluginsController; diff --git a/src/controllers/admin/rewards.js b/src/controllers/admin/rewards.js index 56c5ed3cd0..37b49929bb 100644 --- a/src/controllers/admin/rewards.js +++ b/src/controllers/admin/rewards.js @@ -1,15 +1,18 @@ 'use strict'; -var rewardsController = {}; +var async = require('async'); -rewardsController.get = function (req, res, next) { - require('../../rewards/admin').get(function (err, data) { - if (err) { - return next(err); - } +var rewardsController = module.exports; - res.render('admin/extend/rewards', data); - }); +rewardsController.get = function (req, res, next) { + async.waterfall([ + function (next) { + require('../../rewards/admin').get(next); + }, + function (data) { + res.render('admin/extend/rewards', data); + }, + ], next); }; diff --git a/src/controllers/admin/settings.js b/src/controllers/admin/settings.js index 7d1db3e73e..97d9b17262 100644 --- a/src/controllers/admin/settings.js +++ b/src/controllers/admin/settings.js @@ -36,32 +36,30 @@ function renderEmail(req, res, next) { async.map(emails, function (email, next) { var path = email.replace(emailsPath, '').substr(1).replace('.tpl', ''); - fs.readFile(email, function (err, original) { - if (err) { - return next(err); - } + async.waterfall([ + function (next) { + fs.readFile(email, next); + }, + function (original, next) { + var text = meta.config['email:custom:' + path] ? meta.config['email:custom:' + path] : original.toString(); - var text = meta.config['email:custom:' + path] ? meta.config['email:custom:' + path] : original.toString(); - - next(null, { - path: path, - fullpath: email, - text: text, - original: original.toString(), - }); - }); + next(null, { + path: path, + fullpath: email, + text: text, + original: original.toString(), + }); + }, + ], next); }, next); }, - ], function (err, emails) { - if (err) { - return next(err); - } - - res.render('admin/settings/email', { - emails: emails, - sendable: emails.filter(function (email) { - return email.path.indexOf('_plaintext') === -1 && email.path.indexOf('partials') === -1; - }), - }); - }); + function (emails) { + res.render('admin/settings/email', { + emails: emails, + sendable: emails.filter(function (email) { + return email.path.indexOf('_plaintext') === -1 && email.path.indexOf('partials') === -1; + }), + }); + }, + ], next); } diff --git a/src/controllers/admin/sounds.js b/src/controllers/admin/sounds.js index 164bf4a427..c0ad374a55 100644 --- a/src/controllers/admin/sounds.js +++ b/src/controllers/admin/sounds.js @@ -1,9 +1,11 @@ 'use strict'; +var async = require('async'); + var plugins = require('../../plugins'); var meta = require('../../meta'); -var soundsController = {}; +var soundsController = module.exports; soundsController.get = function (req, res, next) { var types = [ @@ -11,37 +13,36 @@ soundsController.get = function (req, res, next) { 'chat-incoming', 'chat-outgoing', ]; - meta.configs.getFields(types, function (err, settings) { - if (err) { - return next(err); - } - - settings = settings || {}; - - var output = {}; + async.waterfall([ + function (next) { + meta.configs.getFields(types, next); + }, + function (settings) { + settings = settings || {}; + + var output = {}; + + types.forEach(function (type) { + var soundpacks = plugins.soundpacks.map(function (pack) { + var sounds = Object.keys(pack.sounds).map(function (soundName) { + var value = pack.name + ' | ' + soundName; + return { + name: soundName, + value: value, + selected: value === settings[type], + }; + }); - types.forEach(function (type) { - var soundpacks = plugins.soundpacks.map(function (pack) { - var sounds = Object.keys(pack.sounds).map(function (soundName) { - var value = pack.name + ' | ' + soundName; return { - name: soundName, - value: value, - selected: value === settings[type], + name: pack.name, + sounds: sounds, }; }); - return { - name: pack.name, - sounds: sounds, - }; + output[type + '-sound'] = soundpacks; }); - output[type + '-sound'] = soundpacks; - }); - - res.render('admin/general/sounds', output); - }); + res.render('admin/general/sounds', output); + }, + ], next); }; - -module.exports = soundsController; diff --git a/src/controllers/admin/tags.js b/src/controllers/admin/tags.js index f586e5f70c..3fec3915ec 100644 --- a/src/controllers/admin/tags.js +++ b/src/controllers/admin/tags.js @@ -1,18 +1,18 @@ 'use strict'; +var async = require('async'); + var topics = require('../../topics'); -var tagsController = {}; +var tagsController = module.exports; tagsController.get = function (req, res, next) { - topics.getTags(0, 199, function (err, tags) { - if (err) { - return next(err); - } - - res.render('admin/manage/tags', { tags: tags }); - }); + async.waterfall([ + function (next) { + topics.getTags(0, 199, next); + }, + function (tags) { + res.render('admin/manage/tags', { tags: tags }); + }, + ], next); }; - - -module.exports = tagsController; diff --git a/src/controllers/admin/themes.js b/src/controllers/admin/themes.js index cd70522fc9..850feb201d 100644 --- a/src/controllers/admin/themes.js +++ b/src/controllers/admin/themes.js @@ -6,28 +6,23 @@ var async = require('async'); var file = require('../../file'); -var themesController = {}; +var themesController = module.exports; var defaultScreenshotPath = path.join(__dirname, '../../../public/images/themes/default.png'); themesController.get = function (req, res, next) { var themeDir = path.join(__dirname, '../../../node_modules', req.params.theme); var themeConfigPath = path.join(themeDir, 'theme.json'); - + var screenshotPath; async.waterfall([ function (next) { - file.exists(themeConfigPath, function (err, exists) { - if (err) { - return next(err); - } - if (!exists) { - return next(Error('invalid-data')); - } - - next(); - }); + file.exists(themeConfigPath, next); }, - function (next) { + function (exists, next) { + if (!exists) { + return next(Error('invalid-data')); + } + fs.readFile(themeConfigPath, next); }, function (themeConfig, next) { @@ -38,16 +33,13 @@ themesController.get = function (req, res, next) { next(e); } }, - function (screenshotPath, next) { - file.exists(screenshotPath, function (err, exists) { - if (err) { - return next(err); - } - - res.sendFile(exists ? screenshotPath : defaultScreenshotPath); - }); + function (_screenshotPath, next) { + screenshotPath = _screenshotPath; + file.exists(screenshotPath, next); + }, + function (exists) { + res.sendFile(exists ? screenshotPath : defaultScreenshotPath); }, ], next); }; -module.exports = themesController; diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js index 7dd08994cc..d454b287a1 100644 --- a/src/controllers/admin/users.js +++ b/src/controllers/admin/users.js @@ -10,7 +10,7 @@ var pagination = require('../../pagination'); var events = require('../../events'); var plugins = require('../../plugins'); -var usersController = {}; +var usersController = module.exports; var userFields = ['uid', 'username', 'userslug', 'email', 'postcount', 'joindate', 'banned', 'reputation', 'picture', 'flags', 'lastonline', 'email:confirmed']; @@ -63,57 +63,59 @@ usersController.registrationQueue = function (req, res, next) { var stop = start + itemsPerPage - 1; var invitations; - async.parallel({ - registrationQueueCount: function (next) { - db.sortedSetCard('registration:queue', next); - }, - users: function (next) { - user.getRegistrationQueue(start, stop, next); - }, - customHeaders: function (next) { - plugins.fireHook('filter:admin.registrationQueue.customHeaders', { headers: [] }, next); - }, - invites: function (next) { - async.waterfall([ - function (next) { - user.getAllInvites(next); + async.waterfall([ + function (next) { + async.parallel({ + registrationQueueCount: function (next) { + db.sortedSetCard('registration:queue', next); }, - function (_invitations, next) { - invitations = _invitations; - async.map(invitations, function (invites, next) { - user.getUserField(invites.uid, 'username', next); - }, next); + users: function (next) { + user.getRegistrationQueue(start, stop, next); }, - function (usernames, next) { - invitations.forEach(function (invites, index) { - invites.username = usernames[index]; - }); - async.map(invitations, function (invites, next) { - async.map(invites.invitations, user.getUsernameByEmail, next); - }, next); + customHeaders: function (next) { + plugins.fireHook('filter:admin.registrationQueue.customHeaders', { headers: [] }, next); }, - function (usernames, next) { - invitations.forEach(function (invites, index) { - invites.invitations = invites.invitations.map(function (email, i) { - return { - email: email, - username: usernames[index][i] === '[[global:guest]]' ? '' : usernames[index][i], - }; - }); - }); - next(null, invitations); + invites: function (next) { + async.waterfall([ + function (next) { + user.getAllInvites(next); + }, + function (_invitations, next) { + invitations = _invitations; + async.map(invitations, function (invites, next) { + user.getUserField(invites.uid, 'username', next); + }, next); + }, + function (usernames, next) { + invitations.forEach(function (invites, index) { + invites.username = usernames[index]; + }); + async.map(invitations, function (invites, next) { + async.map(invites.invitations, user.getUsernameByEmail, next); + }, next); + }, + function (usernames, next) { + invitations.forEach(function (invites, index) { + invites.invitations = invites.invitations.map(function (email, i) { + return { + email: email, + username: usernames[index][i] === '[[global:guest]]' ? '' : usernames[index][i], + }; + }); + }); + next(null, invitations); + }, + ], next); }, - ], next); + }, next); }, - }, function (err, data) { - if (err) { - return next(err); - } - var pageCount = Math.max(1, Math.ceil(data.registrationQueueCount / itemsPerPage)); - data.pagination = pagination.create(page, pageCount); - data.customHeaders = data.customHeaders.headers; - res.render('admin/manage/registration', data); - }); + function (data) { + var pageCount = Math.max(1, Math.ceil(data.registrationQueueCount / itemsPerPage)); + data.pagination = pagination.create(page, pageCount); + data.customHeaders = data.customHeaders.headers; + res.render('admin/manage/registration', data); + }, + ], next); }; function getUsers(set, section, min, max, req, res, next) { @@ -123,47 +125,48 @@ function getUsers(set, section, min, max, req, res, next) { var stop = start + resultsPerPage - 1; var byScore = min !== undefined && max !== undefined; - async.parallel({ - count: function (next) { - if (byScore) { - db.sortedSetCount(set, min, max, next); - } else if (set === 'users:banned' || set === 'users:notvalidated') { - db.sortedSetCard(set, next); - } else { - db.getObjectField('global', 'userCount', next); - } - }, - users: function (next) { - async.waterfall([ - function (next) { + async.waterfall([ + function (next) { + async.parallel({ + count: function (next) { if (byScore) { - db.getSortedSetRevRangeByScore(set, start, resultsPerPage, max, min, next); + db.sortedSetCount(set, min, max, next); + } else if (set === 'users:banned' || set === 'users:notvalidated') { + db.sortedSetCard(set, next); } else { - user.getUidsFromSet(set, start, stop, next); + db.getObjectField('global', 'userCount', next); } }, - function (uids, next) { - user.getUsersWithFields(uids, userFields, req.uid, next); + users: function (next) { + async.waterfall([ + function (next) { + if (byScore) { + db.getSortedSetRevRangeByScore(set, start, resultsPerPage, max, min, next); + } else { + user.getUidsFromSet(set, start, stop, next); + } + }, + function (uids, next) { + user.getUsersWithFields(uids, userFields, req.uid, next); + }, + ], next); }, - ], next); + }, next); }, - }, function (err, results) { - if (err) { - return next(err); - } - - results.users = results.users.filter(function (user) { - user.email = validator.escape(String(user.email || '')); - return user && parseInt(user.uid, 10); - }); - var data = { - users: results.users, - page: page, - pageCount: Math.max(1, Math.ceil(results.count / resultsPerPage)), - }; - data[section] = true; - render(req, res, data); - }); + function (results) { + results.users = results.users.filter(function (user) { + user.email = validator.escape(String(user.email || '')); + return user && parseInt(user.uid, 10); + }); + var data = { + users: results.users, + page: page, + pageCount: Math.max(1, Math.ceil(results.count / resultsPerPage)), + }; + data[section] = true; + render(req, res, data); + }, + ], next); } function render(req, res, data) { @@ -185,15 +188,14 @@ usersController.getCSV = function (req, res, next) { uid: req.user.uid, ip: req.ip, }); - - user.getUsersCSV(function (err, data) { - if (err) { - return next(err); - } - res.attachment('users.csv'); - res.setHeader('Content-Type', 'text/csv'); - res.end(data); - }); + async.waterfall([ + function (next) { + user.getUsersCSV(next); + }, + function (data) { + res.attachment('users.csv'); + res.setHeader('Content-Type', 'text/csv'); + res.end(data); + }, + ], next); }; - -module.exports = usersController; diff --git a/src/controllers/admin/widgets.js b/src/controllers/admin/widgets.js index 889fa1dcc6..15e75a0f68 100644 --- a/src/controllers/admin/widgets.js +++ b/src/controllers/admin/widgets.js @@ -1,16 +1,16 @@ 'use strict'; -var widgetsController = {}; +var async = require('async'); -widgetsController.get = function (req, res, next) { - require('../../widgets/admin').get(function (err, data) { - if (err) { - return next(err); - } +var widgetsController = module.exports; - res.render('admin/extend/widgets', data); - }); +widgetsController.get = function (req, res, next) { + async.waterfall([ + function (next) { + require('../../widgets/admin').get(next); + }, + function (data) { + res.render('admin/extend/widgets', data); + }, + ], next); }; - - -module.exports = widgetsController; diff --git a/src/controllers/topics.js b/src/controllers/topics.js index a794d40c8a..d560fbcb2a 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -150,6 +150,9 @@ topicsController.get = function (req, res, callback) { if (req.uid) { topicData.rssFeedUrl += '?uid=' + req.uid + '&token=' + rssToken; } + + addTags(topicData, req, res); + topicData.postIndex = req.params.post_index; topicData.pagination = pagination.create(currentPage, pageCount, req.query); topicData.pagination.rel.forEach(function (rel) { @@ -163,8 +166,6 @@ topicsController.get = function (req, res, callback) { req.session.tids_viewed[tid] = Date.now(); } - addTags(topicData, req, res); - if (req.uid) { topics.markAsRead([tid], req.uid, function (err, markedRead) { if (err) { From b0ea511b272ca64bfb86ae176b6713f373a24ac3 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 23 Jun 2017 09:24:49 +0000 Subject: [PATCH 03/16] Latest translations and fallbacks --- public/language/ar/admin/manage/categories.json | 1 + public/language/ar/global.json | 4 +++- public/language/ar/topic.json | 3 +-- public/language/bg/admin/manage/categories.json | 1 + public/language/bg/global.json | 4 +++- public/language/bg/topic.json | 3 +-- public/language/bn/admin/manage/categories.json | 1 + public/language/bn/global.json | 4 +++- public/language/bn/topic.json | 3 +-- public/language/cs/admin/manage/categories.json | 1 + public/language/cs/global.json | 4 +++- public/language/cs/topic.json | 3 +-- public/language/da/admin/manage/categories.json | 1 + public/language/da/global.json | 4 +++- public/language/da/topic.json | 3 +-- public/language/de/admin/manage/categories.json | 1 + public/language/de/global.json | 4 +++- public/language/de/topic.json | 3 +-- public/language/el/admin/manage/categories.json | 1 + public/language/el/global.json | 4 +++- public/language/el/topic.json | 3 +-- public/language/en-US/admin/manage/categories.json | 1 + public/language/en-US/global.json | 4 +++- public/language/en-US/topic.json | 3 +-- public/language/en-x-pirate/admin/manage/categories.json | 1 + public/language/en-x-pirate/global.json | 4 +++- public/language/en-x-pirate/topic.json | 3 +-- public/language/es/admin/manage/categories.json | 1 + public/language/es/global.json | 4 +++- public/language/es/topic.json | 3 +-- public/language/et/admin/manage/categories.json | 1 + public/language/et/global.json | 4 +++- public/language/et/topic.json | 3 +-- public/language/fa-IR/admin/manage/categories.json | 1 + public/language/fa-IR/global.json | 4 +++- public/language/fa-IR/topic.json | 3 +-- public/language/fi/admin/manage/categories.json | 1 + public/language/fi/global.json | 4 +++- public/language/fi/topic.json | 3 +-- public/language/fr/admin/manage/categories.json | 1 + public/language/fr/global.json | 4 +++- public/language/fr/topic.json | 3 +-- public/language/gl/admin/manage/categories.json | 1 + public/language/gl/global.json | 4 +++- public/language/gl/topic.json | 3 +-- public/language/he/admin/manage/categories.json | 1 + public/language/he/global.json | 4 +++- public/language/he/topic.json | 3 +-- public/language/hr/admin/manage/categories.json | 1 + public/language/hr/global.json | 4 +++- public/language/hr/topic.json | 3 +-- public/language/hu/admin/manage/categories.json | 1 + public/language/hu/global.json | 4 +++- public/language/hu/topic.json | 3 +-- public/language/id/admin/manage/categories.json | 1 + public/language/id/global.json | 4 +++- public/language/id/topic.json | 3 +-- public/language/it/admin/manage/categories.json | 1 + public/language/it/global.json | 4 +++- public/language/it/topic.json | 3 +-- public/language/ja/admin/manage/categories.json | 1 + public/language/ja/global.json | 4 +++- public/language/ja/topic.json | 3 +-- public/language/ko/admin/manage/categories.json | 1 + public/language/ko/global.json | 4 +++- public/language/ko/topic.json | 3 +-- public/language/lt/admin/manage/categories.json | 1 + public/language/lt/global.json | 4 +++- public/language/lt/topic.json | 3 +-- public/language/ms/admin/manage/categories.json | 1 + public/language/ms/global.json | 4 +++- public/language/ms/topic.json | 3 +-- public/language/nb/admin/manage/categories.json | 1 + public/language/nb/global.json | 4 +++- public/language/nb/topic.json | 3 +-- public/language/nl/admin/manage/categories.json | 1 + public/language/nl/global.json | 4 +++- public/language/nl/topic.json | 3 +-- public/language/pl/admin/manage/categories.json | 1 + public/language/pl/global.json | 4 +++- public/language/pl/topic.json | 3 +-- public/language/pt-BR/admin/manage/categories.json | 1 + public/language/pt-BR/global.json | 4 +++- public/language/pt-BR/topic.json | 3 +-- public/language/pt-PT/admin/manage/categories.json | 1 + public/language/pt-PT/global.json | 4 +++- public/language/pt-PT/topic.json | 3 +-- public/language/ro/admin/manage/categories.json | 1 + public/language/ro/global.json | 4 +++- public/language/ro/topic.json | 3 +-- public/language/ru/admin/manage/categories.json | 1 + public/language/ru/global.json | 4 +++- public/language/ru/topic.json | 3 +-- public/language/rw/admin/manage/categories.json | 1 + public/language/rw/global.json | 4 +++- public/language/rw/topic.json | 3 +-- public/language/sc/admin/manage/categories.json | 1 + public/language/sc/global.json | 4 +++- public/language/sc/topic.json | 3 +-- public/language/sk/admin/manage/categories.json | 1 + public/language/sk/global.json | 4 +++- public/language/sk/topic.json | 3 +-- public/language/sl/admin/manage/categories.json | 1 + public/language/sl/global.json | 4 +++- public/language/sl/topic.json | 3 +-- public/language/sr/admin/manage/categories.json | 1 + public/language/sr/global.json | 4 +++- public/language/sr/topic.json | 3 +-- public/language/sv/admin/manage/categories.json | 1 + public/language/sv/global.json | 4 +++- public/language/sv/topic.json | 3 +-- public/language/th/admin/manage/categories.json | 1 + public/language/th/global.json | 4 +++- public/language/th/topic.json | 3 +-- public/language/tr/admin/manage/categories.json | 1 + public/language/tr/global.json | 4 +++- public/language/tr/topic.json | 3 +-- public/language/uk/admin/manage/categories.json | 1 + public/language/uk/global.json | 4 +++- public/language/uk/topic.json | 3 +-- public/language/vi/admin/manage/categories.json | 1 + public/language/vi/global.json | 4 +++- public/language/vi/topic.json | 3 +-- public/language/zh-CN/admin/manage/categories.json | 1 + public/language/zh-CN/global.json | 4 +++- public/language/zh-CN/topic.json | 3 +-- public/language/zh-TW/admin/manage/categories.json | 1 + public/language/zh-TW/global.json | 4 +++- public/language/zh-TW/topic.json | 3 +-- 129 files changed, 215 insertions(+), 129 deletions(-) diff --git a/public/language/ar/admin/manage/categories.json b/public/language/ar/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/ar/admin/manage/categories.json +++ b/public/language/ar/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/ar/global.json b/public/language/ar/global.json index 70ac3ba171..73e23bfb28 100644 --- a/public/language/ar/global.json +++ b/public/language/ar/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index f302d9bf6a..4a5c8789b0 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "إلغاء إقفال الموضوع", "thread_tools.move": "نقل الموضوع", "thread_tools.move_all": "نقل الكل", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "إنشاء فرع الموضوع", "thread_tools.delete": "حذف الموضوع", "thread_tools.delete-posts": "مشاركات محذوفة", @@ -72,7 +73,6 @@ "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟", "post_purge_confirm": "هل أنت متأكد أنك تريد تطهير هذه المشاركة؟", "load_categories": "تحميل الفئات", - "disabled_categories_note": "الفئات المعطلة رمادية", "confirm_move": "انقل", "confirm_fork": "فرع", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "نقل المشاركة", "post_moved": "تم نقل المشاركة", "fork_topic": "فرع الموضوع", - "topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة", "fork_topic_instruction": "إضغط على المشاركات التي تريد تفريعها", "fork_no_pids": "لم تختر أي مشاركة", "fork_pid_count": "1% مشاركة محددة", diff --git a/public/language/bg/admin/manage/categories.json b/public/language/bg/admin/manage/categories.json index 934bf262ff..bd503559f6 100644 --- a/public/language/bg/admin/manage/categories.json +++ b/public/language/bg/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Персонализиран клас", "num-recent-replies": "Брой на скорошните отговори", "ext-link": "Външна връзка", + "is-section": "Използване на тази категория като раздел", "upload-image": "Качване на изображение", "delete-image": "Премахване", "category-image": "Изображение на категорията", diff --git a/public/language/bg/global.json b/public/language/bg/global.json index 7a535a1bab..801f82740c 100644 --- a/public/language/bg/global.json +++ b/public/language/bg/global.json @@ -103,5 +103,7 @@ "cookies.message": "Този уеб сайт използва бисквитки, за да предостави услугите си по възможно най-добрия начин.", "cookies.accept": "Разбрано!", "cookies.learn_more": "Научете повече", - "edited": "Редактирано" + "edited": "Редактирано", + "disabled": "Изключено", + "select": "Избиране" } \ No newline at end of file diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index d4bbb10ed7..fb7faaea2f 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Отключване на темата", "thread_tools.move": "Преместване на темата", "thread_tools.move_all": "Преместване на всички", + "thread_tools.select_category": "Избиране на категория", "thread_tools.fork": "Разделяне на темата", "thread_tools.delete": "Изтриване на темата", "thread_tools.delete-posts": "Изтриване на публикациите", @@ -72,7 +73,6 @@ "post_restore_confirm": "Наистина ли искате да възстановите тази публикация?", "post_purge_confirm": "Наистина ли искате да изчистите тази публикация?", "load_categories": "Зареждане на категориите", - "disabled_categories_note": "Изключените категории са засивени", "confirm_move": "Преместване", "confirm_fork": "Разделяне", "bookmark": "Отметка", @@ -84,7 +84,6 @@ "move_post": "Преместване на публикацията", "post_moved": "Публикацията беше преместена!", "fork_topic": "Разделяне на темата", - "topic_will_be_moved_to": "Тази тема ще бъде преместена в категорията", "fork_topic_instruction": "Натиснете публикациите, които искате да отделите", "fork_no_pids": "Няма избрани публикации!", "fork_pid_count": "Избрани публикации: %1", diff --git a/public/language/bn/admin/manage/categories.json b/public/language/bn/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/bn/admin/manage/categories.json +++ b/public/language/bn/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/bn/global.json b/public/language/bn/global.json index 09504ab08b..7741b7b2a8 100644 --- a/public/language/bn/global.json +++ b/public/language/bn/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index 25b18f2972..46b6c48e0f 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "টপিক খুলে দিন", "thread_tools.move": "টপিক সরান", "thread_tools.move_all": "সমস্ত টপিক সরান", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "টপিক ফর্ক করুন", "thread_tools.delete": "টপিক মুছে ফেলুন", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পুনরূূদ্ধার করতে চান ? ", "post_purge_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পার্জ করতে চান ? ", "load_categories": "ক্যাটাগরী লোড করা হচ্ছে", - "disabled_categories_note": "নিস্ক্রীয় ক্যাটাগরীসমূহ ধূসর কালিতে লেখা রয়েছে। ", "confirm_move": "সরান", "confirm_fork": "ফর্ক", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "পোষ্ট সরান", "post_moved": "পোষ্ট সরানো হয়েছে", "fork_topic": "টপিক ফর্ক করুন", - "topic_will_be_moved_to": "এই টপিকটি ক্যাটাগরীতে সরানো হবে", "fork_topic_instruction": "যে পোষ্টটি ফর্ক করতে চান সেটি ক্লিক করুন", "fork_no_pids": "কোন পোষ্ট সিলেক্ট করা হয় নি", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/cs/admin/manage/categories.json b/public/language/cs/admin/manage/categories.json index a6702766ce..6d9b9f161b 100644 --- a/public/language/cs/admin/manage/categories.json +++ b/public/language/cs/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# nedávných odpovědí", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/cs/global.json b/public/language/cs/global.json index 3d6a1fe149..143f909755 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 5720cb73b2..98429c8ad0 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Odemknout téma", "thread_tools.move": "Přesunout téma", "thread_tools.move_all": "Přesunout vše", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Větvit téma", "thread_tools.delete": "Odstranit téma", "thread_tools.delete-posts": "Odstranit přispěvky", @@ -72,7 +73,6 @@ "post_restore_confirm": "Are you sure you want to restore this post?", "post_purge_confirm": "Are you sure you want to purge this post?", "load_categories": "Načítání kategorií", - "disabled_categories_note": "Vypnuté (disabled) kategorie jsou šedé.", "confirm_move": "Přesunout", "confirm_fork": "Rozdělit", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Přesunout příspěvek", "post_moved": "Příspěvek přesunut!", "fork_topic": "Rozdělit příspěvek", - "topic_will_be_moved_to": "Toto téma bude přesunuto do kategorie", "fork_topic_instruction": "Vyber příspěvky, které chceš oddělit", "fork_no_pids": "Žádné příspěvky nebyly vybrány!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/da/admin/manage/categories.json b/public/language/da/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/da/admin/manage/categories.json +++ b/public/language/da/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/da/global.json b/public/language/da/global.json index 211aa200bd..311cbe9705 100644 --- a/public/language/da/global.json +++ b/public/language/da/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/da/topic.json b/public/language/da/topic.json index 463a34eeb9..de6b087b5d 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Lås tråd op", "thread_tools.move": "Flyt tråd", "thread_tools.move_all": "Flyt alt", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Fraskil tråd", "thread_tools.delete": "Slet tråd", "thread_tools.delete-posts": "Slet Indlæg", @@ -72,7 +73,6 @@ "post_restore_confirm": "Er du sikker på at du vil gendanne dette indlæg?", "post_purge_confirm": "Er du sikker på at du vil udradere dette indlæg?", "load_categories": "Indlæser kategorier", - "disabled_categories_note": "Deaktiverede kategorier er nedtonede", "confirm_move": "Flyt", "confirm_fork": "Fraskil", "bookmark": "Bogmærke", @@ -84,7 +84,6 @@ "move_post": "Flyt indlæg", "post_moved": "Indlæg flyttet!", "fork_topic": "Fraskil tråd", - "topic_will_be_moved_to": "Denne tråd vil blive flyttet til katagorien", "fork_topic_instruction": "Klik på indlæg du ønsker at fraskille", "fork_no_pids": "Ingen indlæg valgt", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/de/admin/manage/categories.json b/public/language/de/admin/manage/categories.json index 0bc48e206c..8b45ca4b3a 100644 --- a/public/language/de/admin/manage/categories.json +++ b/public/language/de/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Benutzderdefinierte Klasse", "num-recent-replies": "Anzahl neuer Antworten", "ext-link": "Externer Link", + "is-section": "Treat this category as a section", "upload-image": "Bild hochladen", "delete-image": "Entfernen", "category-image": "Kategoriebild", diff --git a/public/language/de/global.json b/public/language/de/global.json index 98a65c6687..d97a50031f 100644 --- a/public/language/de/global.json +++ b/public/language/de/global.json @@ -103,5 +103,7 @@ "cookies.message": "Diese Website verwendet Cookies, um sicherzustellen, dass du die besten Erfahrungen auf unserer Website machst.", "cookies.accept": "Verstanden!", "cookies.learn_more": "Erfahre mehr", - "edited": "Bearbeitet" + "edited": "Bearbeitet", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 24334afd81..3f948c38aa 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Thema öffnen", "thread_tools.move": "Thema verschieben", "thread_tools.move_all": "Alle verschieben", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Thema aufspalten", "thread_tools.delete": "Thema löschen", "thread_tools.delete-posts": "Beiträge entfernen", @@ -72,7 +73,6 @@ "post_restore_confirm": "Sind Sie sicher, dass Sie diesen Beitrag wiederherstellen möchten?", "post_purge_confirm": "Sind Sie sicher, das Sie diesen Beitrag bereinigen möchten?", "load_categories": "Kategorien laden", - "disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.", "confirm_move": "Verschieben", "confirm_fork": "Aufspalten", "bookmark": "Lesezeichen", @@ -84,7 +84,6 @@ "move_post": "Beitrag verschieben", "post_moved": "Beitrag wurde verschoben!", "fork_topic": "Thema aufspalten", - "topic_will_be_moved_to": "Dieses Thema wird verschoben nach", "fork_topic_instruction": "Klicke auf die Beiträge, die aufgespaltet werden sollen", "fork_no_pids": "Keine Beiträge ausgewählt!", "fork_pid_count": "%1 Beiträge ausgewählt", diff --git a/public/language/el/admin/manage/categories.json b/public/language/el/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/el/admin/manage/categories.json +++ b/public/language/el/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/el/global.json b/public/language/el/global.json index 3a98632abf..2a8d6f7ee3 100644 --- a/public/language/el/global.json +++ b/public/language/el/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Μάθε Περισσότερα", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/el/topic.json b/public/language/el/topic.json index e7ae540d04..b2e35c7484 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Ξεκλείδωμα Θέματος", "thread_tools.move": "Μετακίνηση Θέματος", "thread_tools.move_all": "Μετακίνηση Όλων", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Διαχωρισμός Θέματος", "thread_tools.delete": "Διαγραφή Θέματος", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Είσαι σίγουρος/η πως θέλεις να επαναφέρεις αυτή την δημοσίευση;", "post_purge_confirm": "Είσαι σίγουρος/η πως θέλεις να εκκαθαρίσεις αυτή την δημοσίευση;", "load_categories": "Οι Κατηγορίες Φορτώνουν", - "disabled_categories_note": "Οι απενεργοποιημένες κατηγορίες είναι γκριζαρισμένες", "confirm_move": "Μετακίνηση", "confirm_fork": "Διαχωρισμός", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Μετακίνηση Δημοσίευσης", "post_moved": "Η δημοσίευση μετακινήθηκε!", "fork_topic": "Διαχωρισμός Θέματος", - "topic_will_be_moved_to": "Το θέμα θα μετακινηθεί στην κατηγορία", "fork_topic_instruction": "Κάνε κλικ στις δημοσιεύσεις που θέλεις να διαχωρίσεις", "fork_no_pids": "Δεν έχουν επιλεχθεί δημοσιεύσεις!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/en-US/admin/manage/categories.json b/public/language/en-US/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/en-US/admin/manage/categories.json +++ b/public/language/en-US/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/en-US/global.json b/public/language/en-US/global.json index c3522f80ac..d9255ae0f5 100644 --- a/public/language/en-US/global.json +++ b/public/language/en-US/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json index c880249b60..9c41963d50 100644 --- a/public/language/en-US/topic.json +++ b/public/language/en-US/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Unlock Topic", "thread_tools.move": "Move Topic", "thread_tools.move_all": "Move All", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Fork Topic", "thread_tools.delete": "Delete Topic", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Are you sure you want to restore this post?", "post_purge_confirm": "Are you sure you want to purge this post?", "load_categories": "Loading Categories", - "disabled_categories_note": "Disabled Categories are greyed out", "confirm_move": "Move", "confirm_fork": "Fork", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Move Post", "post_moved": "Post moved!", "fork_topic": "Fork Topic", - "topic_will_be_moved_to": "This topic will be moved to the category", "fork_topic_instruction": "Click the posts you want to fork", "fork_no_pids": "No posts selected!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/en-x-pirate/admin/manage/categories.json b/public/language/en-x-pirate/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/en-x-pirate/admin/manage/categories.json +++ b/public/language/en-x-pirate/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/en-x-pirate/global.json b/public/language/en-x-pirate/global.json index c5dcf3a819..b3856a69b1 100644 --- a/public/language/en-x-pirate/global.json +++ b/public/language/en-x-pirate/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index c880249b60..9c41963d50 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Unlock Topic", "thread_tools.move": "Move Topic", "thread_tools.move_all": "Move All", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Fork Topic", "thread_tools.delete": "Delete Topic", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Are you sure you want to restore this post?", "post_purge_confirm": "Are you sure you want to purge this post?", "load_categories": "Loading Categories", - "disabled_categories_note": "Disabled Categories are greyed out", "confirm_move": "Move", "confirm_fork": "Fork", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Move Post", "post_moved": "Post moved!", "fork_topic": "Fork Topic", - "topic_will_be_moved_to": "This topic will be moved to the category", "fork_topic_instruction": "Click the posts you want to fork", "fork_no_pids": "No posts selected!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/es/admin/manage/categories.json b/public/language/es/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/es/admin/manage/categories.json +++ b/public/language/es/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/es/global.json b/public/language/es/global.json index 37608b7c42..17c8273ea3 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -103,5 +103,7 @@ "cookies.message": "Esta web usa cookies para asegurar que usted recibe la mejor experiencia de navegación.", "cookies.accept": "De Acuerdo!", "cookies.learn_more": "Quiero saber más", - "edited": "Editado" + "edited": "Editado", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index fc5e984756..482b548c18 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Reabrir tema", "thread_tools.move": "Mover tema", "thread_tools.move_all": "Mover todo", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Dividir tema", "thread_tools.delete": "Borrar tema", "thread_tools.delete-posts": "Eliminar publicaciones", @@ -72,7 +73,6 @@ "post_restore_confirm": "¿Estás seguro de que quieres restaurar esta respuesta?", "post_purge_confirm": "¡Estás seguro de que quieres purgar esta publicación?", "load_categories": "Cargando categorías", - "disabled_categories_note": "Las categorías deshabilitadas están en gris", "confirm_move": "Mover", "confirm_fork": "Dividir", "bookmark": "Marcador", @@ -84,7 +84,6 @@ "move_post": "Mover mensaje", "post_moved": "¡Publicación movida correctamente!", "fork_topic": "Dividir tema", - "topic_will_be_moved_to": "Este tema será movido a la categoría", "fork_topic_instruction": "Pulsa en los mensajes que quieres dividir", "fork_no_pids": "¡No has seleccionado ningún mensaje!", "fork_pid_count": "%1 mensaje(s) seleccionados", diff --git a/public/language/et/admin/manage/categories.json b/public/language/et/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/et/admin/manage/categories.json +++ b/public/language/et/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/et/global.json b/public/language/et/global.json index 9fa7a44815..553419cdee 100644 --- a/public/language/et/global.json +++ b/public/language/et/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/et/topic.json b/public/language/et/topic.json index b540c97188..ce17ec70e0 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Taasava teema", "thread_tools.move": "Liiguta teema", "thread_tools.move_all": "Liiguta kõik", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Fork Topic", "thread_tools.delete": "Kustuta teema", "thread_tools.delete-posts": "Kustuta Postitusi", @@ -72,7 +73,6 @@ "post_restore_confirm": "Oled kindel, et soovid taastada antud postituse?", "post_purge_confirm": "Oled kindel, et soovid täielikult selle teema kustutada?", "load_categories": "Laen kategooriaid", - "disabled_categories_note": "Kinnised kategooriad on hallid", "confirm_move": "Liiguta", "confirm_fork": "Fork", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Liiguta postitust", "post_moved": "Postitus liigutatud!", "fork_topic": "Fork Topic", - "topic_will_be_moved_to": "See teema liigutatakse antud kategooriasse", "fork_topic_instruction": "Vajuta postitustele, mida soovid forkida", "fork_no_pids": "Sa ei ole postitusi valinud!", "fork_pid_count": "%1 postitus(t) valitud", diff --git a/public/language/fa-IR/admin/manage/categories.json b/public/language/fa-IR/admin/manage/categories.json index f9d9255e17..6b021ca095 100644 --- a/public/language/fa-IR/admin/manage/categories.json +++ b/public/language/fa-IR/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/fa-IR/global.json b/public/language/fa-IR/global.json index a1c4034065..6494a06de6 100644 --- a/public/language/fa-IR/global.json +++ b/public/language/fa-IR/global.json @@ -103,5 +103,7 @@ "cookies.message": "این وب‌سایت از کوکی شما برای اطمینان و تجربه استفاده بهتر از وب‌سایت ما استفاده می‌کند.", "cookies.accept": "فهمیدم!", "cookies.learn_more": "بیشتر بدانید", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index 348bc8eeaa..647c7bb79a 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "باز کردن موضوع", "thread_tools.move": "جابجا کردن موضوع", "thread_tools.move_all": "جابجایی همه", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "شاخه ساختن از موضوع", "thread_tools.delete": "پاک کردن موضوع", "thread_tools.delete-posts": "حذف پست ها", @@ -72,7 +73,6 @@ "post_restore_confirm": "آیا از بازگردانی این پست اطمینان دارید؟", "post_purge_confirm": "آیا از پاک کردن این پست اطمینان دارید؟", "load_categories": "بارگذاری دسته‌ها", - "disabled_categories_note": "دسته‌های از کار افتاده به رنگ خاکستری در می‌آیند", "confirm_move": "جابه‌جا کردن", "confirm_fork": "شاخه ساختن", "bookmark": "نشانک", @@ -84,7 +84,6 @@ "move_post": "جابه‌جایی موضوع", "post_moved": "پست جابه‌جا شد!", "fork_topic": "شاخه ساختن از موضوع", - "topic_will_be_moved_to": "این موضوع جابه‌جا خواهد شد به دستهٔ", "fork_topic_instruction": "پست‌هایی را که می‌خواهید به موضوع تازه ببرید، انتخاب کنید", "fork_no_pids": "هیچ پستی انتخاب نشده!", "fork_pid_count": "%1 پست (ها) انتخاب شده اند", diff --git a/public/language/fi/admin/manage/categories.json b/public/language/fi/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/fi/admin/manage/categories.json +++ b/public/language/fi/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/fi/global.json b/public/language/fi/global.json index 690bde168b..721a489bfa 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index a79a071204..84b298c455 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Poista aiheen lukitus", "thread_tools.move": "Siirrä aihe", "thread_tools.move_all": "Siirrä kaikki", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Haaroita aihe", "thread_tools.delete": "Poista aihe", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Haluatko varmasti palauttaa tämän viestin?", "post_purge_confirm": "Are you sure you want to purge this post?", "load_categories": "Ladataan aihealueita", - "disabled_categories_note": "Käytöstä poistetut aihealueet ovat harmaina", "confirm_move": "Siirrä", "confirm_fork": "Haaroita", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Siirrä viesti", "post_moved": "Post moved!", "fork_topic": "Haaroita keskustelu", - "topic_will_be_moved_to": "Tämä keskustelu siirretään aihealueelle", "fork_topic_instruction": "Napsauta viestejä, jotka haluat haaroittaa", "fork_no_pids": "Ei valittuja viestejä!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/fr/admin/manage/categories.json b/public/language/fr/admin/manage/categories.json index ab807c22af..0d6ace6124 100644 --- a/public/language/fr/admin/manage/categories.json +++ b/public/language/fr/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Class personnalisée", "num-recent-replies": "# de réponses récentes", "ext-link": "Lien externe", + "is-section": "Traiter cette catégorie comme une section", "upload-image": "Envoyer une image", "delete-image": "Enlever", "category-image": "Image de la catégorie", diff --git a/public/language/fr/global.json b/public/language/fr/global.json index 51a1ba5f49..299221c150 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -103,5 +103,7 @@ "cookies.message": "Ce site utilise des cookies pour vous permettre d'avoir la meilleure expérience possible.", "cookies.accept": "Compris !", "cookies.learn_more": "En savoir plus", - "edited": "Modifié" + "edited": "Modifié", + "disabled": "Désactivé", + "select": "Sélectionner" } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index c55cbcf8a4..1c59ccba72 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Déverouiller le sujet", "thread_tools.move": "Déplacer le sujet", "thread_tools.move_all": "Déplacer tout", + "thread_tools.select_category": "Sélectionner une catégorie", "thread_tools.fork": "Scinder le sujet", "thread_tools.delete": "Supprimer le sujet", "thread_tools.delete-posts": "Supprimer les messages", @@ -72,7 +73,6 @@ "post_restore_confirm": "Êtes-vous sûr de bien vouloir restaurer ce message ?", "post_purge_confirm": "Êtes-vous sûr de bien vouloir supprimer définitivement ce sujet ?", "load_categories": "Chargement des catégories en cours", - "disabled_categories_note": "Les catégories désactivées sont grisées", "confirm_move": "Déplacer", "confirm_fork": "Scinder", "bookmark": "Marque-page", @@ -84,7 +84,6 @@ "move_post": "Déplacer", "post_moved": "Message déplacé !", "fork_topic": "Scinder le sujet", - "topic_will_be_moved_to": "Ce sujet sera déplacé vers la catégorie", "fork_topic_instruction": "Cliquez sur les postes à scinder", "fork_no_pids": "Aucun post sélectionné !", "fork_pid_count": "%1 message(s) sélectionné(s)", diff --git a/public/language/gl/admin/manage/categories.json b/public/language/gl/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/gl/admin/manage/categories.json +++ b/public/language/gl/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/gl/global.json b/public/language/gl/global.json index 58f0d18694..50a2e6015d 100644 --- a/public/language/gl/global.json +++ b/public/language/gl/global.json @@ -103,5 +103,7 @@ "cookies.message": "Esta web emprega cookies para asegurar que recibes unha mellor experiencia de navegación.", "cookies.accept": "De Acordo!", "cookies.learn_more": "Saber máis", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index 27165403dd..ace8074655 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Reabrir Tema", "thread_tools.move": "Mover Tema", "thread_tools.move_all": "Mover todo", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Dividir Tema", "thread_tools.delete": "Borrar Tema", "thread_tools.delete-posts": "Eliminar publicacións", @@ -72,7 +73,6 @@ "post_restore_confirm": "Estás seguro de que desexas restaurar esta publicación?", "post_purge_confirm": "Estás seguro de que desexas purgar esta publicación??", "load_categories": "Cargando categorías", - "disabled_categories_note": "As categorías deshabilitadas están en gris", "confirm_move": "Mover", "confirm_fork": "Dividir", "bookmark": "Marcador", @@ -84,7 +84,6 @@ "move_post": "Mover publicación", "post_moved": "Publicación movida correctamente!", "fork_topic": "Dividir Tema", - "topic_will_be_moved_to": "Este tema será movido á categoría", "fork_topic_instruction": "Fai clic nas publicacións que queiras dividir", "fork_no_pids": "Non seleccionaches ninguna publicación!", "fork_pid_count": "%1 mensaxe(s) seleccionada(s)", diff --git a/public/language/he/admin/manage/categories.json b/public/language/he/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/he/admin/manage/categories.json +++ b/public/language/he/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/he/global.json b/public/language/he/global.json index 5f8f51f4b0..681c097cd3 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "למד עוד", - "edited": "נערך" + "edited": "נערך", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index f8ba9132fb..e457ea82e1 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "הסר נעילה", "thread_tools.move": "הזז נושא", "thread_tools.move_all": "הזז הכל", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "שכפל נושא", "thread_tools.delete": "מחק נושא", "thread_tools.delete-posts": "מחק פוסטים", @@ -72,7 +73,6 @@ "post_restore_confirm": "אתה בטוח שאתה רוצה לשחזר את הפוסט הזה?", "post_purge_confirm": "אתה בטוח שאתה רוצה למחוק את הפוסט הזה?", "load_categories": "טוען קטגוריות", - "disabled_categories_note": "קטגוריות מבוטלות צבועות באפור", "confirm_move": "הזז", "confirm_fork": "שכפל", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "הזז פוסט", "post_moved": "הפוסט הועבר!", "fork_topic": "שכפל נושא", - "topic_will_be_moved_to": "נושא זה יועבר לקטגוריה", "fork_topic_instruction": "לחץ על הפוסטים שברצונך לשכפל", "fork_no_pids": "לא בחרת אף פוסט!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/hr/admin/manage/categories.json b/public/language/hr/admin/manage/categories.json index f87dfb28f8..69ca196181 100644 --- a/public/language/hr/admin/manage/categories.json +++ b/public/language/hr/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Obična klasa", "num-recent-replies": "# nedavnih objava", "ext-link": "Vanjska poveznica", + "is-section": "Treat this category as a section", "upload-image": "Učitaj sliku", "delete-image": "Ukloni", "category-image": "Slika kategorije", diff --git a/public/language/hr/global.json b/public/language/hr/global.json index 8d02d5bc58..7a79b3deb3 100644 --- a/public/language/hr/global.json +++ b/public/language/hr/global.json @@ -103,5 +103,7 @@ "cookies.message": "Ova stranica koristi kolačiće kako bi osigurala najbolje korisničko iskustvo.", "cookies.accept": "Shvaćam!", "cookies.learn_more": "Saznaj više", - "edited": "Uređeno" + "edited": "Uređeno", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index 39315c4255..98a6210428 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Odključaj temu", "thread_tools.move": "Premjesti temu", "thread_tools.move_all": "Premjesti sve", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Dupliraj temu", "thread_tools.delete": "Obriši temu", "thread_tools.delete-posts": "Obriši objavu", @@ -72,7 +73,6 @@ "post_restore_confirm": "Sigurni ste da želite povratiti ovu objavu?", "post_purge_confirm": "Sigurni ste da želite odbaciti ovu objavu?", "load_categories": "Učitavam kategorije", - "disabled_categories_note": "Onemogućene kategorije su izbljeđene", "confirm_move": "Pomakni", "confirm_fork": "Dupliraj", "bookmark": "Zabilježi", @@ -84,7 +84,6 @@ "move_post": "Pomakni objavu", "post_moved": "Objava pomaknuta!", "fork_topic": "Dupliraj temu", - "topic_will_be_moved_to": "Ova tem će biti pomaknuta u kategoriju", "fork_topic_instruction": "Označi objave koje želite duplirati", "fork_no_pids": "Objave nisu odabrane!", "fork_pid_count": "%1 objava odabrana", diff --git a/public/language/hu/admin/manage/categories.json b/public/language/hu/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/hu/admin/manage/categories.json +++ b/public/language/hu/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/hu/global.json b/public/language/hu/global.json index c05367f938..8ccd973fbe 100644 --- a/public/language/hu/global.json +++ b/public/language/hu/global.json @@ -103,5 +103,7 @@ "cookies.message": "A weboldal sütiket használ, a legjobb weboldalas élmény érdekében.", "cookies.accept": "Értem!", "cookies.learn_more": "Tudnivalók", - "edited": "Szerkesztett" + "edited": "Szerkesztett", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 277bcc8354..2643558f3d 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Topik feloldása", "thread_tools.move": "Topik mozgatása", "thread_tools.move_all": "Move All", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Topik szétszedése", "thread_tools.delete": "Topik törlése", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Are you sure you want to restore this post?", "post_purge_confirm": "Are you sure you want to purge this post?", "load_categories": "Kategóriák betöltése", - "disabled_categories_note": "Kikapcsolt kategóriák kiszürkülve", "confirm_move": "Áthelyezés", "confirm_fork": "Szétszedés", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Hozzászólás áthelyezése", "post_moved": "Post moved!", "fork_topic": "Topik szétszedése", - "topic_will_be_moved_to": "Ez a téma ebbe a kategóriába lesz mozgatva", "fork_topic_instruction": "Klikkelj azokra a hozzászólásokra, amiket szét akarsz szedni", "fork_no_pids": "Nincs hozzászólás kiválasztva!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/id/admin/manage/categories.json b/public/language/id/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/id/admin/manage/categories.json +++ b/public/language/id/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/id/global.json b/public/language/id/global.json index a2169ab30c..6301423f5f 100644 --- a/public/language/id/global.json +++ b/public/language/id/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 08a39598d6..745de176bf 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Lepas Topik", "thread_tools.move": "Pindah Topik", "thread_tools.move_all": "Pindah Semua", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Cabangkan Topik", "thread_tools.delete": "Hapus Topik", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Kamu yakin ingin mengembalikan posting ini?", "post_purge_confirm": "Kamu yakin ingin memusnahkan posting ini?", "load_categories": "Memuat Kategori", - "disabled_categories_note": "Indikator Kategori yang Ditiadakan keabu-abuan", "confirm_move": "Pindah", "confirm_fork": "Cabangkan", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Pindahkan Posting", "post_moved": "Posting dipindahkan!", "fork_topic": "Cabangkan Topik", - "topic_will_be_moved_to": "Topik ini akan dipindahkan ke kategori", "fork_topic_instruction": "Klik posting yang kamu ingin cabangkan", "fork_no_pids": "Tidak ada posting yang dipilih!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/it/admin/manage/categories.json b/public/language/it/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/it/admin/manage/categories.json +++ b/public/language/it/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/it/global.json b/public/language/it/global.json index b0599c51d0..7325219082 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -103,5 +103,7 @@ "cookies.message": "Questo sito utilizza i cookie per garantirti la miglior esperienza di navigazione possibile", "cookies.accept": "Ho capito!", "cookies.learn_more": "Scopri di più", - "edited": "Modificato" + "edited": "Modificato", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 6ff3d989eb..e9540a5b89 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Sblocca Discussione", "thread_tools.move": "Sposta Discussione", "thread_tools.move_all": "Sposta Tutto", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Dividi Discussione", "thread_tools.delete": "Elimina Discussione", "thread_tools.delete-posts": "Cancella post", @@ -72,7 +73,6 @@ "post_restore_confirm": "Sei sicuro di voler ripristinare questo post?", "post_purge_confirm": "Sei sicuro di voler svuotare questo post?", "load_categories": "Caricamento Categorie", - "disabled_categories_note": "Le Categorie disabilitate sono in grigio", "confirm_move": "Sposta", "confirm_fork": "Dividi", "bookmark": "Favorito", @@ -84,7 +84,6 @@ "move_post": "Sposta Post", "post_moved": "Post spostato!", "fork_topic": "Dividi Discussione", - "topic_will_be_moved_to": "Questa discussione verrà spostata nella categoria", "fork_topic_instruction": "Clicca sui post che vuoi dividere", "fork_no_pids": "Nessun post selezionato!", "fork_pid_count": "%1 post selezionati", diff --git a/public/language/ja/admin/manage/categories.json b/public/language/ja/admin/manage/categories.json index d045070a3c..2d4f6ddab1 100644 --- a/public/language/ja/admin/manage/categories.json +++ b/public/language/ja/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "カスタムClass", "num-recent-replies": "# 最近の返信数", "ext-link": "外部リンク", + "is-section": "Treat this category as a section", "upload-image": "画像をアップロード", "delete-image": "削除", "category-image": "カテゴリ画像", diff --git a/public/language/ja/global.json b/public/language/ja/global.json index 68b963f55c..89b71b1856 100644 --- a/public/language/ja/global.json +++ b/public/language/ja/global.json @@ -103,5 +103,7 @@ "cookies.message": "このWEBサイトは、心地良くご使用頂くためにクッキーを使用しています。", "cookies.accept": "了解!", "cookies.learn_more": "もっと詳しく", - "edited": "編集されました" + "edited": "編集されました", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 274d43ec55..0e255db706 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "スレッドをアンロック", "thread_tools.move": "スレッドを移動", "thread_tools.move_all": "すべてを移動", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "スレッドをフォーク", "thread_tools.delete": "スレッドを削除", "thread_tools.delete-posts": "投稿を削除します", @@ -72,7 +73,6 @@ "post_restore_confirm": "本当にこの投稿を元に戻しますか？", "post_purge_confirm": "本当にこの投稿を切り離しますか？", "load_categories": "板をローディング中...", - "disabled_categories_note": "使用不可の板はグレーに表示されます。", "confirm_move": "移動", "confirm_fork": "フォーク", "bookmark": "ブックマーク", @@ -84,7 +84,6 @@ "move_post": "投稿を移動", "post_moved": "投稿を移動しました！", "fork_topic": "スレッドをフォーク", - "topic_will_be_moved_to": "スレッドはこちらのカテゴリへ移動", "fork_topic_instruction": "フォークしたい投稿をクリックして", "fork_no_pids": "投稿が選択されていません！", "fork_pid_count": "%1 投稿(s)が選択されました", diff --git a/public/language/ko/admin/manage/categories.json b/public/language/ko/admin/manage/categories.json index ede245b57b..c8e4cfe0b3 100644 --- a/public/language/ko/admin/manage/categories.json +++ b/public/language/ko/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "사용자 정의 클래스", "num-recent-replies": "최근 답장 갯수", "ext-link": "외부 링크", + "is-section": "Treat this category as a section", "upload-image": "이미지 업로드", "delete-image": "삭제", "category-image": "게시판 이미지", diff --git a/public/language/ko/global.json b/public/language/ko/global.json index 67c23301ef..a874615582 100644 --- a/public/language/ko/global.json +++ b/public/language/ko/global.json @@ -103,5 +103,7 @@ "cookies.message": "이 웹사이트는 최적의 사용환경을 위해 쿠키를 활용합니다.", "cookies.accept": "알겠습니다!", "cookies.learn_more": "더 보기", - "edited": "수정 되었습니다." + "edited": "수정 되었습니다.", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index 11884b0118..e00d743911 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "잠금 해제", "thread_tools.move": "이동", "thread_tools.move_all": "모두 이동", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "주제 분리", "thread_tools.delete": "삭제", "thread_tools.delete-posts": "포스트 삭제", @@ -72,7 +73,6 @@ "post_restore_confirm": "이 포스트를 복원 하시겠습니까?", "post_purge_confirm": "이 포스트를 폐기 하시겠습니까?", "load_categories": "게시판들을 읽어오는 중입니다.", - "disabled_categories_note": "비활성화된 게시판은 회색으로 표시됩니다.", "confirm_move": "이동", "confirm_fork": "분리", "bookmark": "즐겨찾기", @@ -84,7 +84,6 @@ "move_post": "포스트 이동", "post_moved": "포스트가 이동되었습니다.", "fork_topic": "게시물 분리", - "topic_will_be_moved_to": "이 게시물이 지정한 게시판으로 이동합니다.", "fork_topic_instruction": "분리할 포스트를 선택하세요.", "fork_no_pids": "선택된 포스트가 없습니다.", "fork_pid_count": "%1 개의 포스트(들)이 선택되었습니다", diff --git a/public/language/lt/admin/manage/categories.json b/public/language/lt/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/lt/admin/manage/categories.json +++ b/public/language/lt/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/lt/global.json b/public/language/lt/global.json index a884569fb3..08bdcf1e87 100644 --- a/public/language/lt/global.json +++ b/public/language/lt/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index 1e7f273486..406d1062b9 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Atrakinti temą", "thread_tools.move": "Perkelti temą", "thread_tools.move_all": "Perkelti visus", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Išskaidyti temą", "thread_tools.delete": "Ištrinti temą", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Ar jūs tikrai norite atkurti šį įrašą?", "post_purge_confirm": "Ar tikrai norite išvalyti šį pranešimą?", "load_categories": "Įkeliamos kategorijos", - "disabled_categories_note": "Neaktyvios kategorijos pažymėtos pilkai", "confirm_move": "Perkelti", "confirm_fork": "Išskaidyti", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Perkelti įrašą", "post_moved": "Pranešimas perkeltas!", "fork_topic": "Išskaidyti temą", - "topic_will_be_moved_to": "Ši tema bus perkelta į kategoriją", "fork_topic_instruction": "Pažymėkite ant įrašų, kuriuos norite perkelti į naują temą", "fork_no_pids": "Nepasirinktas joks įrašas!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/ms/admin/manage/categories.json b/public/language/ms/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/ms/admin/manage/categories.json +++ b/public/language/ms/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/ms/global.json b/public/language/ms/global.json index e00d937eaa..ce75b91718 100644 --- a/public/language/ms/global.json +++ b/public/language/ms/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index 5cc6a65eda..3f8737d458 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Buka kekunci topik", "thread_tools.move": "Pindahkan topik", "thread_tools.move_all": "Pindahkan Semua", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Fork topik", "thread_tools.delete": "Padamkan topik", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Adakah anda pasti untuk memulihkan kiriman ini?", "post_purge_confirm": "Adakah anda pasti untuk singkirkan kiriman ini?", "load_categories": "Memuatkan kategori", - "disabled_categories_note": "Kategori yang disekat diwarnakan kelabu", "confirm_move": "Pindahkan", "confirm_fork": "Salin", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Pindahkan kiriman", "post_moved": "Kiriman dipindahkan", "fork_topic": "Salin topik", - "topic_will_be_moved_to": "Topik ini akan dipindahkan kepada kategori", "fork_topic_instruction": "Klik kiriman yang anda hendak salin", "fork_no_pids": "Tiada kiriman yang dipilih", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/nb/admin/manage/categories.json b/public/language/nb/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/nb/admin/manage/categories.json +++ b/public/language/nb/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/nb/global.json b/public/language/nb/global.json index 5c57f2f251..86fb8d7bfe 100644 --- a/public/language/nb/global.json +++ b/public/language/nb/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index a8707253c6..031f366c51 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Lås opp tråd", "thread_tools.move": "Flytt tråd", "thread_tools.move_all": "Flytt alle", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Forgren tråd", "thread_tools.delete": "Slett tråd", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Er du sikker på at du vil gjenopprette dette innlegget?", "post_purge_confirm": "Er du sikker på at du vil renske dette innlegget?", "load_categories": "Laster kategorier", - "disabled_categories_note": "Deaktiverte kategorier er grået ut", "confirm_move": "Flytt", "confirm_fork": "Forgren", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Flytt innlegg", "post_moved": "Innlegg flyttet!", "fork_topic": "Forgren Emne", - "topic_will_be_moved_to": "Dette emnet vil bli flyttet til kategorien", "fork_topic_instruction": "Trykk på innleggene du vil forgrene", "fork_no_pids": "Ingen innlegg valgt!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/nl/admin/manage/categories.json b/public/language/nl/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/nl/admin/manage/categories.json +++ b/public/language/nl/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/nl/global.json b/public/language/nl/global.json index f18dccae8d..c4e2d0e596 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -103,5 +103,7 @@ "cookies.message": "Deze website gebruikt cookies om je ervan te verzekeren dat je de beste ervaring krijgt tijdens het gebruik van onze website.", "cookies.accept": "Begrepen", "cookies.learn_more": "Meer", - "edited": "Bewerkt" + "edited": "Bewerkt", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index ee1d8b77db..06b2e7f58a 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Onderwerp openen", "thread_tools.move": "Onderwerp verplaatsen", "thread_tools.move_all": "Verplaats alles", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Onderwerp afsplitsen", "thread_tools.delete": "Onderwerp verwijderen", "thread_tools.delete-posts": "Verwijder berichten", @@ -72,7 +73,6 @@ "post_restore_confirm": "Is het de bedoeling dit bericht te herstellen?", "post_purge_confirm": "Is het absoluut zeker dat dit bericht volledig verwijderd kan worden?", "load_categories": "Categorieën laden", - "disabled_categories_note": "Uitgeschakelde Categorieën zijn grijs", "confirm_move": "Verplaatsen", "confirm_fork": "Splits", "bookmark": "Favoriet", @@ -84,7 +84,6 @@ "move_post": "Bericht verplaatsen", "post_moved": "Bericht verplaatst!", "fork_topic": "Afgesplitst onderwerp ", - "topic_will_be_moved_to": "Dit onderwerp zal naar de categorie verplaatst worden", "fork_topic_instruction": "Klik op de berichten die afgesplitst moeten worden", "fork_no_pids": "Geen berichten geselecteerd!", "fork_pid_count": "%1 bericht(en) geselecteerd", diff --git a/public/language/pl/admin/manage/categories.json b/public/language/pl/admin/manage/categories.json index 4eb8a57259..00699d30ac 100644 --- a/public/language/pl/admin/manage/categories.json +++ b/public/language/pl/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Niestandardowa klasa", "num-recent-replies": "# z Ostatnich Odpowiedzi", "ext-link": "Zewnętrzny Link", + "is-section": "Treat this category as a section", "upload-image": "Prześlij Obrazek", "delete-image": "Usunąć", "category-image": "Obrazek Kategorii", diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 0117c61c94..14dc633e53 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -103,5 +103,7 @@ "cookies.message": "Ta strona używa plików cookies, by zapewnić Ci najlepsze działanie naszej strony.", "cookies.accept": "Mam to!", "cookies.learn_more": "Dowiedz się więcej", - "edited": "Edytowany" + "edited": "Edytowany", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index e8800ba31c..515231700d 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Odblokuj Temat", "thread_tools.move": "Przenieś Temat", "thread_tools.move_all": "Przenieś wszystko", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Skopiuj Temat", "thread_tools.delete": "Usuń Temat", "thread_tools.delete-posts": "Usuń posty", @@ -72,7 +73,6 @@ "post_restore_confirm": "Na pewno chcesz przywrócić ten post?", "post_purge_confirm": "Jesteś pewien, że chcesz wyczyścić ten post?", "load_categories": "Ładowanie kategorii", - "disabled_categories_note": "Zablokowane kategorie zostały wyszarzone.", "confirm_move": "Przenieś", "confirm_fork": "Skopiuj", "bookmark": "Zakładka", @@ -84,7 +84,6 @@ "move_post": "Przenieś post", "post_moved": "Post przeniesiony!", "fork_topic": "Skopiuj Temat", - "topic_will_be_moved_to": "Ten temat zostanie przeniesiony do kategorii", "fork_topic_instruction": "Zaznacz posty, które chcesz sklonować", "fork_no_pids": "Nie zaznaczyłeś żadnych postów!", "fork_pid_count": "wybrano %1 post(-ów)", diff --git a/public/language/pt-BR/admin/manage/categories.json b/public/language/pt-BR/admin/manage/categories.json index 65d0e5bc81..f2f06cf835 100644 --- a/public/language/pt-BR/admin/manage/categories.json +++ b/public/language/pt-BR/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Classe Personalizada", "num-recent-replies": "# de Respostas Recentes", "ext-link": "Link Externo", + "is-section": "Treat this category as a section", "upload-image": "Fazer upload de Imagem", "delete-image": "Remover", "category-image": "Imagem da Categoria", diff --git a/public/language/pt-BR/global.json b/public/language/pt-BR/global.json index 914a11e049..f173968642 100644 --- a/public/language/pt-BR/global.json +++ b/public/language/pt-BR/global.json @@ -103,5 +103,7 @@ "cookies.message": "Este website utiliza cookies para assegrar que você tenha a melhor experiência em nosso site.", "cookies.accept": "Entendi!", "cookies.learn_more": "Saber Mais", - "edited": "Editado" + "edited": "Editado", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 116057d638..8e6ed0aa7e 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Destrancar Tópico", "thread_tools.move": "Mover Tópico", "thread_tools.move_all": "Mover Tudo", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Ramificar Tópico", "thread_tools.delete": "Deletar Tópico", "thread_tools.delete-posts": "Deletar Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Tem certeza que deseja restaurar este post?", "post_purge_confirm": "Tem certeza que deseja expurgar este post?", "load_categories": "Carregando Categorias", - "disabled_categories_note": "Categorias desabilitadas estão em cinza", "confirm_move": "Mover", "confirm_fork": "Ramificar", "bookmark": "Favorito", @@ -84,7 +84,6 @@ "move_post": "Mover Post", "post_moved": "Post movido!", "fork_topic": "Ramificar Tópico", - "topic_will_be_moved_to": "Este tópico será movido para a categoria", "fork_topic_instruction": "Clique nos posts que você quer ramificar", "fork_no_pids": "Nenhum post selecionado!", "fork_pid_count": "%1 post(s) selecionado(s)", diff --git a/public/language/pt-PT/admin/manage/categories.json b/public/language/pt-PT/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/pt-PT/admin/manage/categories.json +++ b/public/language/pt-PT/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/pt-PT/global.json b/public/language/pt-PT/global.json index 42e887b6aa..8a40b20a00 100644 --- a/public/language/pt-PT/global.json +++ b/public/language/pt-PT/global.json @@ -103,5 +103,7 @@ "cookies.message": "Este website utiliza cookies para assegurar que tens a melhor experiência no nosso website.", "cookies.accept": "Apontado!", "cookies.learn_more": "Aprende mais", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index f5084825c0..9647b731c5 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Desbloquear tópico", "thread_tools.move": "Mover tópico", "thread_tools.move_all": "Mover todos", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Clonar tópico", "thread_tools.delete": "Eliminar tópico", "thread_tools.delete-posts": "Apagar publicações", @@ -72,7 +73,6 @@ "post_restore_confirm": "Tens a certeza que desejas restaurar esta publicação?", "post_purge_confirm": "Tens a certeza que desejas purgar esta publicação?", "load_categories": "Carregando Categorias", - "disabled_categories_note": "Desativar Categorias que estão a cinzento", "confirm_move": "Mover", "confirm_fork": "Clonar", "bookmark": "Marcador", @@ -84,7 +84,6 @@ "move_post": "Mover publicação", "post_moved": "Publicação movida!", "fork_topic": "Clonar tópico", - "topic_will_be_moved_to": "Este tópico será movido para a categoria", "fork_topic_instruction": "Carrega nas publicações que queres clonar", "fork_no_pids": "Sem publicações selecionadas!", "fork_pid_count": "%1 publicação(ões) selecionada(s)", diff --git a/public/language/ro/admin/manage/categories.json b/public/language/ro/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/ro/admin/manage/categories.json +++ b/public/language/ro/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/ro/global.json b/public/language/ro/global.json index a7af755c6b..f4b463beb1 100644 --- a/public/language/ro/global.json +++ b/public/language/ro/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 076bf3bcf1..36ed0ffb0f 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Deschide Subiect", "thread_tools.move": "Mută Subiect", "thread_tools.move_all": "Mută-le pe toate", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Bifurcă Subiect", "thread_tools.delete": "Șterge Subiect", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Esti sigur că vrei să restaurezi acest mesaj?", "post_purge_confirm": "Ești sigur că vrei să cureți acest mesaj?", "load_categories": "Se Încarcă Categoriile", - "disabled_categories_note": "Categoriile dezactivate sunt decolorate cu gri", "confirm_move": "Mută", "confirm_fork": "Bifurcă", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Mută Mesaj", "post_moved": "Mesaj mutat!", "fork_topic": "Bifurcă Subiect", - "topic_will_be_moved_to": "Acest subiect va fi mutat în categoria", "fork_topic_instruction": "Apasă pe mesajele care vrei sa le bifurci", "fork_no_pids": "Nu a fost selectat nici un mesaj!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/ru/admin/manage/categories.json b/public/language/ru/admin/manage/categories.json index 78519ee4f5..c88a402511 100644 --- a/public/language/ru/admin/manage/categories.json +++ b/public/language/ru/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Свой класс", "num-recent-replies": "# of Recent Replies", "ext-link": "Внешняя ссылка", + "is-section": "Treat this category as a section", "upload-image": "Загрузить изображение", "delete-image": "Удалить", "category-image": "Изображение категории", diff --git a/public/language/ru/global.json b/public/language/ru/global.json index bafb1db8e2..5812ee446d 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -103,5 +103,7 @@ "cookies.message": "Этот сайт использует cookies для более удобного взаимодействия.", "cookies.accept": "Понял", "cookies.learn_more": "Подробнее", - "edited": "Отредактированный" + "edited": "Отредактированный", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 06e341357a..9851358016 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Открыть тему", "thread_tools.move": "Переместить тему", "thread_tools.move_all": "Переместить всё", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Создать дополнительную ветвь дискуссии", "thread_tools.delete": "Удалить тему", "thread_tools.delete-posts": "Удалить записи", @@ -72,7 +73,6 @@ "post_restore_confirm": "Вы уверены, что хотите восстановить эту запись?", "post_purge_confirm": "Вы уверены, что хотите стереть эту запись?", "load_categories": "Загружаем сообщества", - "disabled_categories_note": "Отключённые сообщества затемнены", "confirm_move": "Перенести", "confirm_fork": "Создать дополнительную ветвь", "bookmark": "Добавить в закладки", @@ -84,7 +84,6 @@ "move_post": "Перенести запись", "post_moved": "Запись перенесена", "fork_topic": "Создать дополнительную ветвь дискуссии", - "topic_will_be_moved_to": "Эта тема будет перенесена в сообщество", "fork_topic_instruction": "Отметьте одну или несколько записей для создания дополнительной ветви дискуссии", "fork_no_pids": "Записи не отмечены", "fork_pid_count": "Отмечено %1 сообщений", diff --git a/public/language/rw/admin/manage/categories.json b/public/language/rw/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/rw/admin/manage/categories.json +++ b/public/language/rw/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/rw/global.json b/public/language/rw/global.json index e35b278c53..fcba501d31 100644 --- a/public/language/rw/global.json +++ b/public/language/rw/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index d4f9477ff9..dfe0130e0f 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Fungurira Ikiganiro", "thread_tools.move": "Imura Ikiganiro", "thread_tools.move_all": "Byimure Byose", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Gabanyaho ku Kiganiro", "thread_tools.delete": "Kuraho Ikiganiro", "thread_tools.delete-posts": "Siba Icyashizweho", @@ -72,7 +73,6 @@ "post_restore_confirm": "Wiringiye neza ko ushaka kugarura iki kiganiro? ", "post_purge_confirm": "Wiringiye neza ko ushaka gusibangaya iki kiganiro?", "load_categories": "Ibyiciro Biraje", - "disabled_categories_note": "Ibyiciro bitagaragazwa birasa n'ibipfutse", "confirm_move": "Imura", "confirm_fork": "Gabanyaho", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Imura Icyashyizweho", "post_moved": "Icyashizweho kirimuwe!", "fork_topic": "Gabanyaho ku Kiganiro", - "topic_will_be_moved_to": "Iki kiganiro kirimurirwa mu cyiciro", "fork_topic_instruction": "Kanda ku byashizweho ushaka kugabanyaho", "fork_no_pids": "Nta kintu wahisemo!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/sc/admin/manage/categories.json b/public/language/sc/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/sc/admin/manage/categories.json +++ b/public/language/sc/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/sc/global.json b/public/language/sc/global.json index cd3d534dbd..26e9d5382a 100644 --- a/public/language/sc/global.json +++ b/public/language/sc/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index 8ab46f4eaa..f5e4b1b376 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Isbloca Arresonada", "thread_tools.move": "Move Arresonada", "thread_tools.move_all": "Move All", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Partzi Arresonada", "thread_tools.delete": "Cantzella Arresonada", "thread_tools.delete-posts": "Delete Posts", @@ -72,7 +73,6 @@ "post_restore_confirm": "Are you sure you want to restore this post?", "post_purge_confirm": "Are you sure you want to purge this post?", "load_categories": "Carrighende Crezes", - "disabled_categories_note": "Is Crezes Disativadas sunt postas in colore de chìghine", "confirm_move": "Move", "confirm_fork": "Partzi", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Move Arresonu", "post_moved": "Post moved!", "fork_topic": "Partzi Arresonada", - "topic_will_be_moved_to": "Custa arresonada at a èssere mòvida in sa creze", "fork_topic_instruction": "Sèbera is arresonos chi boles partzire", "fork_no_pids": "Perunu arresonu seberadu!", "fork_pid_count": "%1 post(s) selected", diff --git a/public/language/sk/admin/manage/categories.json b/public/language/sk/admin/manage/categories.json index a76dd051f4..9d5330d930 100644 --- a/public/language/sk/admin/manage/categories.json +++ b/public/language/sk/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/sk/global.json b/public/language/sk/global.json index 3d3705597c..9e19412427 100644 --- a/public/language/sk/global.json +++ b/public/language/sk/global.json @@ -103,5 +103,7 @@ "cookies.message": "Táto webová stránka používa cookies k tomu, aby bolo zaistené, že dostanete najlepší pôžitok s návštevy na našich webových stránkach.", "cookies.accept": "Mám to!", "cookies.learn_more": "Zistit viac", - "edited": "Zmenené" + "edited": "Zmenené", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index a626bd2777..d8662c3bf3 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Odomknúť tému", "thread_tools.move": "Presunúť tému", "thread_tools.move_all": "Presunúť všetko", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Rozvetviť tému", "thread_tools.delete": "Odstrániť tému", "thread_tools.delete-posts": "Odstrániť príspevky", @@ -72,7 +73,6 @@ "post_restore_confirm": "Ste si istí, že chcete obnoviť tento príspevok?", "post_purge_confirm": "Ste si istý že chcete naozaj vyčistiť tento príspevok?", "load_categories": "Načítanie kategórií", - "disabled_categories_note": "Zablokované kategórie sú sivé", "confirm_move": "Presunúť", "confirm_fork": "Rozdeliť", "bookmark": "Záložka", @@ -84,7 +84,6 @@ "move_post": "Presunúť príspevok", "post_moved": "Príspevok presunutý!", "fork_topic": "Rozdeliť príspevok", - "topic_will_be_moved_to": "Táto téma bude presunutá do kategórie", "fork_topic_instruction": "Vyber príspevky, ktoré chceš oddeliť", "fork_no_pids": "Žiadne príspevky neboli vybraté!", "fork_pid_count": "%1 príspevky(ov) vybraté", diff --git a/public/language/sl/admin/manage/categories.json b/public/language/sl/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/sl/admin/manage/categories.json +++ b/public/language/sl/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/sl/global.json b/public/language/sl/global.json index 63c5fc210f..193a4780a7 100644 --- a/public/language/sl/global.json +++ b/public/language/sl/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index a5371bab1e..cc539f3f40 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Odkleni temo", "thread_tools.move": "Premakni temo", "thread_tools.move_all": "Premakni vse", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Razcepi temo", "thread_tools.delete": "Izbriši temo", "thread_tools.delete-posts": "Izbriši objave", @@ -72,7 +73,6 @@ "post_restore_confirm": "Ste prepričani, da želite razveljaviti to objavo?", "post_purge_confirm": "Ste prepričani, da želite očistiti to objavo?", "load_categories": "Nalagam kategorije", - "disabled_categories_note": "Onemogočene kategorije so obarvane sivo", "confirm_move": "Premakni", "confirm_fork": "Razcepi", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Premakni objavo", "post_moved": "Objava premaknjena!", "fork_topic": "Razcepi temo", - "topic_will_be_moved_to": "Ta tema bo premaknjena v to kategorijo", "fork_topic_instruction": "Klikni na objavo, ki o želiš odcepiti", "fork_no_pids": "Ni izbranih objav!", "fork_pid_count": "Izbranih objav: %1 ", diff --git a/public/language/sr/admin/manage/categories.json b/public/language/sr/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/sr/admin/manage/categories.json +++ b/public/language/sr/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/sr/global.json b/public/language/sr/global.json index a66b424eef..1339145a86 100644 --- a/public/language/sr/global.json +++ b/public/language/sr/global.json @@ -103,5 +103,7 @@ "cookies.message": "Овај веб сајт користи колачиће да би вам обезбедили најбољи доживљај на нашем сајту.", "cookies.accept": "Схватам!", "cookies.learn_more": "Сазнајте више", - "edited": "Уређено" + "edited": "Уређено", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index 675f529a32..fe4ddf1676 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Откључај тему", "thread_tools.move": "Премести тему", "thread_tools.move_all": "Премести све", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Рачвај тему", "thread_tools.delete": "Избриши тему", "thread_tools.delete-posts": "Избриши поруку", @@ -72,7 +73,6 @@ "post_restore_confirm": "Да ли сте сигурни да желите да обновите ову поруку?", "post_purge_confirm": "Да ли сте сигурни да желите да очистите овај пост?", "load_categories": "Учитавање категорија", - "disabled_categories_note": "Онемогућене категорије су недоступне", "confirm_move": "Премести", "confirm_fork": "Рачвај", "bookmark": "Обележивач", @@ -84,7 +84,6 @@ "move_post": "Премести поруку", "post_moved": "Порука је премештена!", "fork_topic": "Рачвај тему", - "topic_will_be_moved_to": "Ова тема ће бити премештена у категорију", "fork_topic_instruction": "Кликните на поруке које желите да рачвате", "fork_no_pids": "Нема одабраних порука!", "fork_pid_count": "Одабрано порука: %1", diff --git a/public/language/sv/admin/manage/categories.json b/public/language/sv/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/sv/admin/manage/categories.json +++ b/public/language/sv/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/sv/global.json b/public/language/sv/global.json index 6fcfe965df..f24cdffb00 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index f0d4f5f853..bf51d85095 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Lås upp ämne", "thread_tools.move": "Flytta ämne", "thread_tools.move_all": "Flytta alla", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Grena ämne", "thread_tools.delete": "Ta bort ämne", "thread_tools.delete-posts": "Radera inlägg", @@ -72,7 +73,6 @@ "post_restore_confirm": "Är du säker på att du vill återställa det här inlägget?", "post_purge_confirm": "Är du säker att du vill rensa bort det här inlägget?", "load_categories": "Laddar kategorier", - "disabled_categories_note": "Inaktiverade kategorier är utgråade", "confirm_move": "Flytta", "confirm_fork": "Grena", "bookmark": "Bokmärke", @@ -84,7 +84,6 @@ "move_post": "Flytta inlägg", "post_moved": "Inlägget flyttades.", "fork_topic": "Grena ämne", - "topic_will_be_moved_to": "Detta ämne kommer att flyttas till kategorin", "fork_topic_instruction": "Klicka på de inlägg du vill grena", "fork_no_pids": "Inga inlägg valda!", "fork_pid_count": "%1 inlägg vald(a)", diff --git a/public/language/th/admin/manage/categories.json b/public/language/th/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/th/admin/manage/categories.json +++ b/public/language/th/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/th/global.json b/public/language/th/global.json index 17b15b538c..ac6b834e34 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -103,5 +103,7 @@ "cookies.message": "เว็บไวต์นี้ใช้คุกกี้เพื่อที่จะทำให้แน่ใจว่า คุณได้รับประสบการณ์ที่เยี่ยมยอดที่สุดในการเข้าใช้เว็บไซต์ของเรา", "cookies.accept": "เข้าใจแล้ว!!! ", "cookies.learn_more": "เรียนรู้เพิ่มเติม", - "edited": "ถูกแก้ไขแล้ว" + "edited": "ถูกแก้ไขแล้ว", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/th/topic.json b/public/language/th/topic.json index 922f949440..82108b7a0f 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "ปลดล็อคกระทู้", "thread_tools.move": "ย้ายกระทู้", "thread_tools.move_all": "ย้ายทั้งหมด", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "แยกกระทู้", "thread_tools.delete": "ลบกระทู้", "thread_tools.delete-posts": "ลบโพสต์", @@ -72,7 +73,6 @@ "post_restore_confirm": "คุณแน่ใจแล้วใช้ไหมว่าต้องการกู้คืนโพสต์นี้", "post_purge_confirm": "คุณแน่ใจแล้วใช่ไหมว่าต้องการล้างโพสต์นี้", "load_categories": "กำลังโหลดหมวดหมู่", - "disabled_categories_note": "หมวดหมู่ที่ปิดใช้งานจะเป็นสีเทา", "confirm_move": "ย้าย", "confirm_fork": "แยก", "bookmark": "บุ๊กมาร์ก", @@ -84,7 +84,6 @@ "move_post": "ย้ายโพส", "post_moved": "โพสต์ถูกย้ายแล้ว!", "fork_topic": "แยกกระทู้", - "topic_will_be_moved_to": "กระทู้นี้จะถูกย้ายไปที่หมวดหมู่", "fork_topic_instruction": "คลิกที่โพสที่คุณต้องการที่จะแยก", "fork_no_pids": "ไม่มีโพสต์ที่เลือก!", "fork_pid_count": " %1 โพสต์(s) ที่เลือก", diff --git a/public/language/tr/admin/manage/categories.json b/public/language/tr/admin/manage/categories.json index 728669b92e..eb68238a46 100644 --- a/public/language/tr/admin/manage/categories.json +++ b/public/language/tr/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Özel Sınıf", "num-recent-replies": "# of Recent Replies", "ext-link": "Harici Bağlantı", + "is-section": "Treat this category as a section", "upload-image": "Görsel Yükle", "delete-image": "Sil", "category-image": "Kategori Görseli", diff --git a/public/language/tr/global.json b/public/language/tr/global.json index b1b6a2f06e..128ab3bbc8 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -103,5 +103,7 @@ "cookies.message": "Bu web sitesi en iyi deneyimi elde etmeniz amacıyla çerezlerden yararlanır.", "cookies.accept": "Anladım!", "cookies.learn_more": "Daha Fazla", - "edited": "Düzenlendi" + "edited": "Düzenlendi", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index 770dd68107..e27c02e855 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Başlığı Aç", "thread_tools.move": "Başlığı Taşı", "thread_tools.move_all": "Hepsini Taşı", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Başlığı Ayır", "thread_tools.delete": "Başlığı Sil", "thread_tools.delete-posts": "İletileri Sil", @@ -72,7 +73,6 @@ "post_restore_confirm": "Bu iletiyi gerçekten geri getirmek istiyor musun?", "post_purge_confirm": "Bu iletiyi temizlemek istediğinize eminmisiniz?", "load_categories": "Kategoriler Yükleniyor", - "disabled_categories_note": "Etkin Olmayan Kategoriler soluklaştırılır", "confirm_move": "Taşı", "confirm_fork": "Ayır", "bookmark": "Yer imi", @@ -84,7 +84,6 @@ "move_post": "İletiyi Taşı", "post_moved": "İleti taşındı!", "fork_topic": "Başlığı Ayır", - "topic_will_be_moved_to": "Bu konu kategorisine taşınacak", "fork_topic_instruction": "Ayırmak istediğiniz iletileri tıklayın", "fork_no_pids": "Hiç bir ileti seçilmedi!", "fork_pid_count": "%1 ileti(ler) seçildi", diff --git a/public/language/uk/admin/manage/categories.json b/public/language/uk/admin/manage/categories.json index d03162d48f..8b9831ec27 100644 --- a/public/language/uk/admin/manage/categories.json +++ b/public/language/uk/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Користувацький клас", "num-recent-replies": "Кількість свіжих відповідей", "ext-link": "Зовнішнє посилання", + "is-section": "Treat this category as a section", "upload-image": "Завантажити зображення", "delete-image": "Видалити", "category-image": "Зображення категорії", diff --git a/public/language/uk/global.json b/public/language/uk/global.json index bab1461cc6..dbe083bac7 100644 --- a/public/language/uk/global.json +++ b/public/language/uk/global.json @@ -103,5 +103,7 @@ "cookies.message": "Цей сайт використовує куки, щоб ви отримали найкращий досвід при роботі з сайтом.", "cookies.accept": "Зрозуміло!", "cookies.learn_more": "Дізнатися більше", - "edited": "Відредаговано" + "edited": "Відредаговано", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index ad17502811..5bfa66be4d 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Розблокувати тему", "thread_tools.move": "Перемістити тему", "thread_tools.move_all": "Перемістити всі", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Відгалужити тему", "thread_tools.delete": "Видалити тему", "thread_tools.delete-posts": "Видалити пости", @@ -72,7 +73,6 @@ "post_restore_confirm": "Ви точно бажаєте відновити цей пост?", "post_purge_confirm": "Ви точно бажаєте стерти цей пост?", "load_categories": "Завантаження категорій", - "disabled_categories_note": "Вимкнені категорії фарбуються в сірий", "confirm_move": "Перемістити", "confirm_fork": "Відгалужити", "bookmark": "Закладка", @@ -84,7 +84,6 @@ "move_post": "Перемістити пост", "post_moved": "Пост переміщено!", "fork_topic": "Відгалужити тему", - "topic_will_be_moved_to": "Цю тему буде переміщено в категорію", "fork_topic_instruction": "Тисніть пости які ви бажаєте відгалужити", "fork_no_pids": "Не вибрано жодного поста!", "fork_pid_count": "вибрано %1 пост(ів) ", diff --git a/public/language/vi/admin/manage/categories.json b/public/language/vi/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/vi/admin/manage/categories.json +++ b/public/language/vi/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/vi/global.json b/public/language/vi/global.json index 65db660c60..bca009cd8c 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -103,5 +103,7 @@ "cookies.message": "Trang web này sử dụng cookie để đảm bảo trải nghiệm tốt nhất cho người dùng", "cookies.accept": "Đã rõ!", "cookies.learn_more": "Xem thêm", - "edited": "Đã cập nhật" + "edited": "Đã cập nhật", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index 899685fe0c..d3379b29fd 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "Mở khóa chủ đề", "thread_tools.move": "Chuyển chủ đề", "thread_tools.move_all": "Chuyển tất cả", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "Tạo bản sao chủ đề", "thread_tools.delete": "Xóa chủ đề", "thread_tools.delete-posts": "Xoá bài viết", @@ -72,7 +73,6 @@ "post_restore_confirm": "Bạn có chắc là muốn phục hồi bài gửi này không?", "post_purge_confirm": "Bạn có chắc muốn xóa hẳn bài này?", "load_categories": "Đang tải các phần mục", - "disabled_categories_note": "Các phần mục bị khóa đã được đánh xám", "confirm_move": "Di chuyển", "confirm_fork": "Tạo bảo sao", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "Chuyển bài gửi", "post_moved": "Đã chuyển bài gửi!", "fork_topic": "Tạo bản sao chủ đề", - "topic_will_be_moved_to": "Chủ đề này sẽ được chuyển tới phần mục", "fork_topic_instruction": "Chọn vào bài gửi mà bạn muốn fork", "fork_no_pids": "Chưa chọn bài gửi nào!", "fork_pid_count": "%1 bài viết(s) đã được gửi", diff --git a/public/language/zh-CN/admin/manage/categories.json b/public/language/zh-CN/admin/manage/categories.json index 77aa93ec68..77f2249fc8 100644 --- a/public/language/zh-CN/admin/manage/categories.json +++ b/public/language/zh-CN/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "自定义 Class", "num-recent-replies": "最近回复数", "ext-link": "外部链接", + "is-section": "Treat this category as a section", "upload-image": "上传图片", "delete-image": "移除", "category-image": "版块图片", diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json index 6555431231..8cc6f51c61 100644 --- a/public/language/zh-CN/global.json +++ b/public/language/zh-CN/global.json @@ -103,5 +103,7 @@ "cookies.message": "此网站使用 Cookies 以保障您在我们网站的最佳体验。", "cookies.accept": "知道了！", "cookies.learn_more": "了解更多", - "edited": "已编辑" + "edited": "已编辑", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index b4a3dc0934..84cfc9924f 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "解锁主题", "thread_tools.move": "移动主题", "thread_tools.move_all": "移动全部", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "分割主题", "thread_tools.delete": "删除主题", "thread_tools.delete-posts": "删除这些帖子", @@ -72,7 +73,6 @@ "post_restore_confirm": "确定恢复此帖吗？", "post_purge_confirm": "确认清除此回帖吗？", "load_categories": "正在载入版块", - "disabled_categories_note": "停用的版块为灰色", "confirm_move": "移动", "confirm_fork": "分割", "bookmark": "书签", @@ -84,7 +84,6 @@ "move_post": "移动帖子", "post_moved": "帖子已移走！", "fork_topic": "分割主题", - "topic_will_be_moved_to": "此主题将被移动到版块", "fork_topic_instruction": "点击将分割的帖子", "fork_no_pids": "未选中帖子！", "fork_pid_count": "选择了 %1 个帖子", diff --git a/public/language/zh-TW/admin/manage/categories.json b/public/language/zh-TW/admin/manage/categories.json index 7e2a5ce12e..871affe560 100644 --- a/public/language/zh-TW/admin/manage/categories.json +++ b/public/language/zh-TW/admin/manage/categories.json @@ -10,6 +10,7 @@ "custom-class": "Custom Class", "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", + "is-section": "Treat this category as a section", "upload-image": "Upload Image", "delete-image": "Remove", "category-image": "Category Image", diff --git a/public/language/zh-TW/global.json b/public/language/zh-TW/global.json index b6f8f5d7d2..b1a7fbd6c3 100644 --- a/public/language/zh-TW/global.json +++ b/public/language/zh-TW/global.json @@ -103,5 +103,7 @@ "cookies.message": "This website uses cookies to ensure you get the best experience on our website.", "cookies.accept": "Got it!", "cookies.learn_more": "Learn More", - "edited": "Edited" + "edited": "Edited", + "disabled": "Disabled", + "select": "Select" } \ No newline at end of file diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index f11b6f3806..07b37ee21e 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -59,6 +59,7 @@ "thread_tools.unlock": "解除主題鎖定", "thread_tools.move": "移動主題", "thread_tools.move_all": "移動全部", + "thread_tools.select_category": "Select Category", "thread_tools.fork": "分叉主題", "thread_tools.delete": "刪除主題", "thread_tools.delete-posts": "刪除張貼", @@ -72,7 +73,6 @@ "post_restore_confirm": "你確定要還原這文章嗎？", "post_purge_confirm": "你確定要清除這個帖子嗎？", "load_categories": "版面載入中", - "disabled_categories_note": "停用的版面為灰色", "confirm_move": "移動", "confirm_fork": "作為主題", "bookmark": "Bookmark", @@ -84,7 +84,6 @@ "move_post": "移動文章", "post_moved": "文章已移動！", "fork_topic": "作為主題", - "topic_will_be_moved_to": "這個主題將會被移動到類別", "fork_topic_instruction": "點擊要作為主題的文章", "fork_no_pids": "尚未選擇文章！", "fork_pid_count": "%1 張貼已選定", From d117c658931b107099193c51adfa918903d6ee17 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 23 Jun 2017 10:26:51 -0400 Subject: [PATCH 04/16] oops :shipit: --- src/webserver.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/webserver.js b/src/webserver.js index 828aa7b3da..867a2c8826 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -231,7 +231,6 @@ function setupAutoLocale(app, callback) { function listen(callback) { callback = callback || function () { }; - console.log('derp', nconf.get('port')); var port = parseInt(nconf.get('port'), 10); var isSocket = isNaN(port); var socketPath = isSocket ? nconf.get('port') : ''; From eb9f6145d99db0dd5040671322a44d303a142bdd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 23 Jun 2017 11:03:54 -0400 Subject: [PATCH 05/16] fixes #5770 --- src/user/digest.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/user/digest.js b/src/user/digest.js index 6226a2234a..ba867c69c3 100644 --- a/src/user/digest.js +++ b/src/user/digest.js @@ -72,6 +72,33 @@ Digest.getSubscribers = function (interval, callback) { function (next) { db.getSortedSetRange('digest:' + interval + ':uids', 0, -1, next); }, + function (subscribers, next) { + // If ACP default digest frequency is set, add all users who are not in any of the explicit subscription sorted sets + if (!meta.config.dailyDigestFreq || meta.configs.dailyDigestFreq === 'off') { + return setImmediate(next, null, subscribers); + } + + var digestSets = ['digest:day:uids', 'digest:week:uids', 'digest:month:uids']; + db.getSortedSetsMembers(digestSets.concat('users:joindate'), function (err, sets) { + if (err) { + return next(err); + } + + var allUids = sets.pop(); + // Append those uids from the joindate zset who are not in digest sets + allUids.forEach(function (uid) { + var append = sets.every(function (set) { + return set.indexOf(uid) === -1; + }); + + if (append) { + subscribers.push(uid); + } + }); + + next(null, subscribers); + }); + }, function (subscribers, next) { plugins.fireHook('filter:digest.subscribers', { interval: interval, From 2e1528942c0f6924ab1930e5a2d7d0ed16f79d49 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 23 Jun 2017 12:41:40 -0400 Subject: [PATCH 06/16] fixed #5770 --- src/user/digest.js | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/user/digest.js b/src/user/digest.js index ba867c69c3..6a05e57e52 100644 --- a/src/user/digest.js +++ b/src/user/digest.js @@ -5,6 +5,7 @@ var winston = require('winston'); var nconf = require('nconf'); var db = require('../database'); +var batch = require('../batch'); var meta = require('../meta'); var user = require('../user'); var topics = require('../topics'); @@ -70,33 +71,20 @@ Digest.execute = function (payload, callback) { Digest.getSubscribers = function (interval, callback) { async.waterfall([ function (next) { - db.getSortedSetRange('digest:' + interval + ':uids', 0, -1, next); - }, - function (subscribers, next) { - // If ACP default digest frequency is set, add all users who are not in any of the explicit subscription sorted sets - if (!meta.config.dailyDigestFreq || meta.configs.dailyDigestFreq === 'off') { - return setImmediate(next, null, subscribers); - } - - var digestSets = ['digest:day:uids', 'digest:week:uids', 'digest:month:uids']; - db.getSortedSetsMembers(digestSets.concat('users:joindate'), function (err, sets) { - if (err) { - return next(err); - } + var subs = []; - var allUids = sets.pop(); - // Append those uids from the joindate zset who are not in digest sets - allUids.forEach(function (uid) { - var append = sets.every(function (set) { - return set.indexOf(uid) === -1; + batch.processSortedSet('users:joindate', function (uids, next) { + user.getMultipleUserSettings(uids, function (err, settings) { + settings.forEach(function (hash) { + if (hash.dailyDigestFreq === interval) { + subs.push(hash.uid); + } }); - if (append) { - subscribers.push(uid); - } + next(); }); - - next(null, subscribers); + }, { interval: 1000 }, function () { + next(null, subs); }); }, function (subscribers, next) { From 9b5cdae856726c258ef126ac6a6ebb49b13d2550 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 23 Jun 2017 12:52:08 -0400 Subject: [PATCH 07/16] up composer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a0b28dd14..c20c76e847 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "morgan": "^1.3.2", "mousetrap": "^1.5.3", "nconf": "~0.8.2", - "nodebb-plugin-composer-default": "4.4.15", + "nodebb-plugin-composer-default": "4.4.16", "nodebb-plugin-dbsearch": "2.0.4", "nodebb-plugin-emoji-extended": "1.1.1", "nodebb-plugin-emoji-one": "1.2.1", From 3cc528dc02e7b8398c85784e6097db97c5b20170 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 23 Jun 2017 13:08:15 -0400 Subject: [PATCH 08/16] linting --- src/user/digest.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/user/digest.js b/src/user/digest.js index 6a05e57e52..8d515cf734 100644 --- a/src/user/digest.js +++ b/src/user/digest.js @@ -4,7 +4,6 @@ var async = require('async'); var winston = require('winston'); var nconf = require('nconf'); -var db = require('../database'); var batch = require('../batch'); var meta = require('../meta'); var user = require('../user'); @@ -75,6 +74,10 @@ Digest.getSubscribers = function (interval, callback) { batch.processSortedSet('users:joindate', function (uids, next) { user.getMultipleUserSettings(uids, function (err, settings) { + if (err) { + return next(err); + } + settings.forEach(function (hash) { if (hash.dailyDigestFreq === interval) { subs.push(hash.uid); From a8e4981d30a145d71c48218d62c4421c88ba0e3d Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 23 Jun 2017 13:57:38 -0400 Subject: [PATCH 09/16] up persona --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c20c76e847..02a85458c1 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "nodebb-plugin-spam-be-gone": "0.5.0", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "4.0.1", - "nodebb-theme-persona": "5.0.8", + "nodebb-theme-persona": "5.0.9", "nodebb-theme-slick": "1.1.0", "nodebb-theme-vanilla": "6.0.6", "nodebb-widget-essentials": "3.0.0", From 1f5b3ba6362ed54f6c46d95b4ba3ea49966a1fb0 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 23 Jun 2017 15:57:23 -0400 Subject: [PATCH 10/16] closes #5771 --- public/src/client/search.js | 7 +++---- src/controllers/search.js | 4 +++- src/search.js | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index e6691e626e..515f7030b5 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -7,8 +7,6 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo Search.init = function () { var searchQuery = $('#results').attr('data-search-query'); - $('#search-input').val(searchQuery); - var searchIn = $('#search-in'); searchIn.on('change', function () { @@ -62,12 +60,13 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo function fillOutForm() { var params = utils.params(); + var searchData = searchModule.getSearchPreferences(); var formData = utils.merge(searchData, params); if (formData) { - if (params.term) { - $('#search-input').val(params.term); + if (ajaxify.data.term) { + $('#search-input').val(ajaxify.data.term); } if (formData.in) { diff --git a/src/controllers/search.js b/src/controllers/search.js index 309f77f557..f02a61dc31 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -2,6 +2,7 @@ 'use strict'; var async = require('async'); +var validator = require('validator'); var meta = require('../meta'); var plugins = require('../plugins'); @@ -68,7 +69,8 @@ searchController.search = function (req, res, next) { searchData.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[global:search]]' }]); searchData.expandSearch = !req.query.term; searchData.searchDefaultSortBy = meta.config.searchDefaultSortBy || ''; - + searchData.search_query = validator.escape(String(req.query.term || '')); + searchData.term = req.query.term; res.render('search', searchData); }); }; diff --git a/src/search.js b/src/search.js index 3ed7f4ef35..599bd66c09 100644 --- a/src/search.js +++ b/src/search.js @@ -1,7 +1,6 @@ 'use strict'; var async = require('async'); -var validator = require('validator'); var db = require('./database'); var posts = require('./posts'); @@ -31,7 +30,6 @@ search.search = function (data, callback) { } }, function (result, next) { - result.search_query = validator.escape(String(data.query || '')); result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2); next(null, result); }, From b4b68498cde658f6e6a4537f4732a786b0c01ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 23 Jun 2017 17:17:27 -0400 Subject: [PATCH 11/16] added interval option to processSortedSet --- src/batch.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/batch.js b/src/batch.js index 9a0271f29b..204ae79940 100644 --- a/src/batch.js +++ b/src/batch.js @@ -63,7 +63,11 @@ exports.processSortedSet = function (setKey, process, options, callback) { start += utils.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : batch + 1; stop = start + batch; - next(); + if (options.interval) { + setTimeout(next, options.interval); + } else { + next(); + } }); }); }, From 3d85992757e924a474f6dfaa1f4843f0f00678c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 23 Jun 2017 18:18:34 -0400 Subject: [PATCH 12/16] modify db.processSortedSet so it works with intervals --- src/batch.js | 11 ++++++----- src/database/mongo/sorted.js | 15 +++++++++++---- src/user/digest.js | 30 +++++++++++++++--------------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/batch.js b/src/batch.js index 204ae79940..fac78cd021 100644 --- a/src/batch.js +++ b/src/batch.js @@ -30,17 +30,18 @@ exports.processSortedSet = function (setKey, process, options, callback) { }); } + options.batch = options.batch || DEFAULT_BATCH_SIZE; + // use the fast path if possible if (db.processSortedSet && typeof options.doneIf !== 'function' && !utils.isNumber(options.alwaysStartAt)) { - return db.processSortedSet(setKey, process, options.batch || DEFAULT_BATCH_SIZE, callback); + return db.processSortedSet(setKey, process, options, callback); } // custom done condition options.doneIf = typeof options.doneIf === 'function' ? options.doneIf : function () {}; - var batch = options.batch || DEFAULT_BATCH_SIZE; var start = 0; - var stop = batch; + var stop = options.batch; var done = false; async.whilst( @@ -60,8 +61,8 @@ exports.processSortedSet = function (setKey, process, options, callback) { if (err) { return next(err); } - start += utils.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : batch + 1; - stop = start + batch; + start += utils.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : options.batch + 1; + stop = start + options.batch; if (options.interval) { setTimeout(next, options.interval); diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js index 4168199bb5..5d461043fe 100644 --- a/src/database/mongo/sorted.js +++ b/src/database/mongo/sorted.js @@ -467,13 +467,13 @@ module.exports = function (db, module) { } } - module.processSortedSet = function (setKey, process, batch, callback) { + module.processSortedSet = function (setKey, process, options, callback) { var done = false; var ids = []; var cursor = db.collection('objects').find({ _key: setKey }) .sort({ score: 1 }) .project({ _id: 0, value: 1 }) - .batchSize(batch); + .batchSize(options.batch); async.whilst( function () { @@ -490,13 +490,20 @@ module.exports = function (db, module) { ids.push(item.value); } - if (ids.length < batch && (!done || ids.length === 0)) { + if (ids.length < options.batch && (!done || ids.length === 0)) { return next(null); } process(ids, function (err) { + if (err) { + return next(err); + } ids = []; - return next(err); + if (options.interval) { + setTimeout(next, options.interval); + } else { + next(); + } }); }); }, diff --git a/src/user/digest.js b/src/user/digest.js index 8d515cf734..b9cb689622 100644 --- a/src/user/digest.js +++ b/src/user/digest.js @@ -73,21 +73,21 @@ Digest.getSubscribers = function (interval, callback) { var subs = []; batch.processSortedSet('users:joindate', function (uids, next) { - user.getMultipleUserSettings(uids, function (err, settings) { - if (err) { - return next(err); - } - - settings.forEach(function (hash) { - if (hash.dailyDigestFreq === interval) { - subs.push(hash.uid); - } - }); - - next(); - }); - }, { interval: 1000 }, function () { - next(null, subs); + async.waterfall([ + function (next) { + user.getMultipleUserSettings(uids, next); + }, + function (settings, next) { + settings.forEach(function (hash) { + if (hash.dailyDigestFreq === interval) { + subs.push(hash.uid); + } + }); + next(); + }, + ], next); + }, { interval: 1000 }, function (err) { + next(err, subs); }); }, function (subscribers, next) { From 631e9aea14df0f329522313ccb639ffd468a9a52 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sat, 24 Jun 2017 09:25:01 +0000 Subject: [PATCH 13/16] Latest translations and fallbacks --- public/language/fr/admin/appearance/themes.json | 2 +- public/language/it/email.json | 2 +- public/language/sr/global.json | 4 ++-- public/language/sr/topic.json | 2 +- public/language/sr/user.json | 2 +- public/language/tr/global.json | 4 ++-- public/language/tr/topic.json | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/language/fr/admin/appearance/themes.json b/public/language/fr/admin/appearance/themes.json index bc9ca500e4..975c3d99ba 100644 --- a/public/language/fr/admin/appearance/themes.json +++ b/public/language/fr/admin/appearance/themes.json @@ -1,7 +1,7 @@ { "checking-for-installed": "Vérification des thèmes installés…", "homepage": "Page d'accueil", - "select-theme": "Choisir un thème", + "select-theme": "Sélectionner ce thème", "current-theme": "Thème actuel", "no-themes": "Aucun thème installé", "revert-confirm": "Êtes-vous sûr de vouloir restaurer le thème NodeBB par défaut ?", diff --git a/public/language/it/email.json b/public/language/it/email.json index 1cf2f5ad7b..48dbc3fd50 100644 --- a/public/language/it/email.json +++ b/public/language/it/email.json @@ -6,7 +6,7 @@ "greeting_with_name": "Ciao %1", "welcome.text1": "Grazie per esserti registrato su %1!", "welcome.text2": "Per attivare completamente il tuo account dobbiamo verificare che sei il proprietario dell'indirizzo email con cui ti sei registrato.", - "welcome.text3": "Un Amministratora ha accettato la tua registrazione. Adesso puoi collegarti con il tuo nome utente/ password.", + "welcome.text3": "Un amministratore ha accettato la tua registrazione. Adesso puoi collegarti con il tuo nome utente/password.", "welcome.cta": "Clicca qui per confermare il tuo indirizzo email", "invitation.text1": "%1 ti ha invitato a entrare in %2", "invitation.ctr": "Clicca qui per creare il tuo account.", diff --git a/public/language/sr/global.json b/public/language/sr/global.json index 1339145a86..62e689cf71 100644 --- a/public/language/sr/global.json +++ b/public/language/sr/global.json @@ -104,6 +104,6 @@ "cookies.accept": "Схватам!", "cookies.learn_more": "Сазнајте више", "edited": "Уређено", - "disabled": "Disabled", - "select": "Select" + "disabled": "Онемогућено", + "select": "Изабери" } \ No newline at end of file diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index fe4ddf1676..e104832976 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -59,7 +59,7 @@ "thread_tools.unlock": "Откључај тему", "thread_tools.move": "Премести тему", "thread_tools.move_all": "Премести све", - "thread_tools.select_category": "Select Category", + "thread_tools.select_category": "Изаберите категорију", "thread_tools.fork": "Рачвај тему", "thread_tools.delete": "Избриши тему", "thread_tools.delete-posts": "Избриши поруку", diff --git a/public/language/sr/user.json b/public/language/sr/user.json index 3949589e7b..7b7442001e 100644 --- a/public/language/sr/user.json +++ b/public/language/sr/user.json @@ -67,7 +67,7 @@ "upload_cover_picture": "Отпреми насловну слику", "remove_cover_picture_confirm": "Да ли сте сигурни да желите да уклоните насловну слику?", "crop_picture": "Изрежи слику", - "upload_cropped_picture": "Изрежи и опреми", + "upload_cropped_picture": "Изрежи и отпреми", "settings": "Подешавања", "show_email": "Прикажи моју лозинку", "show_fullname": "Прикажи моје пуно име", diff --git a/public/language/tr/global.json b/public/language/tr/global.json index 128ab3bbc8..747f0ca087 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -104,6 +104,6 @@ "cookies.accept": "Anladım!", "cookies.learn_more": "Daha Fazla", "edited": "Düzenlendi", - "disabled": "Disabled", - "select": "Select" + "disabled": "Devredışı", + "select": "Seç" } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index e27c02e855..104e10c766 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -59,7 +59,7 @@ "thread_tools.unlock": "Başlığı Aç", "thread_tools.move": "Başlığı Taşı", "thread_tools.move_all": "Hepsini Taşı", - "thread_tools.select_category": "Select Category", + "thread_tools.select_category": "Kategori Seç", "thread_tools.fork": "Başlığı Ayır", "thread_tools.delete": "Başlığı Sil", "thread_tools.delete-posts": "İletileri Sil", From fd43f38e4247d54194fb9b9f108311e63d17336a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 25 Jun 2017 14:39:42 -0400 Subject: [PATCH 14/16] closes #5773 --- public/src/client/login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/login.js b/public/src/client/login.js index d78f70a85f..0ee61e48f7 100644 --- a/public/src/client/login.js +++ b/public/src/client/login.js @@ -54,7 +54,7 @@ define('forum/login', [], function () { app.flags._sessionRefresh = false; // Select the entire password if that field has focus - if ($('#password:focus').size()) { + if ($('#password:focus').length) { $('#password').select(); } } From c36f25f7616cf0bc08acfb33176b102b7142a42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 25 Jun 2017 19:05:13 -0400 Subject: [PATCH 15/16] switch .filter to uniq --- src/notifications.js | 4 +--- src/privileges/categories.js | 8 +++----- src/privileges/topics.js | 34 ++++++++++++++-------------------- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/src/notifications.js b/src/notifications.js index 3004a68fc7..58ccf2e8fa 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -160,9 +160,7 @@ Notifications.push = function (notification, uids, callback) { uids = [uids]; } - uids = uids.filter(function (uid, index, array) { - return parseInt(uid, 10) && array.indexOf(uid) === index; - }); + uids = _.uniq(uids); if (!uids.length) { return callback(); diff --git a/src/privileges/categories.js b/src/privileges/categories.js index 604c2c5ac7..f01971b591 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -273,9 +273,7 @@ module.exports = function (privileges) { return callback(null, []); } - uids = uids.filter(function (uid, index, array) { - return array.indexOf(uid) === index; - }); + uids = _.uniq(uids); async.waterfall([ function (next) { @@ -286,14 +284,14 @@ module.exports = function (privileges) { isModerators: function (next) { user.isModerator(uids, cid, next); }, - isAdmin: function (next) { + isAdmins: function (next) { user.isAdministrator(uids, next); }, }, next); }, function (results, next) { uids = uids.filter(function (uid, index) { - return results.allowedTo[index] || results.isModerators[index] || results.isAdmin[index]; + return results.allowedTo[index] || results.isModerators[index] || results.isAdmins[index]; }); next(null, uids); }, diff --git a/src/privileges/topics.js b/src/privileges/topics.js index ac602cc25a..84e34954e5 100644 --- a/src/privileges/topics.js +++ b/src/privileges/topics.js @@ -82,11 +82,9 @@ module.exports = function (privileges) { }, function (_topicsData, next) { topicsData = _topicsData; - cids = topicsData.map(function (topic) { + cids = _.uniq(topicsData.map(function (topic) { return topic.cid; - }).filter(function (cid, index, array) { - return cid && array.indexOf(cid) === index; - }); + })); privileges.categories.getBase(privilege, cids, uid, next); }, @@ -121,15 +119,14 @@ module.exports = function (privileges) { return callback(null, []); } - uids = uids.filter(function (uid, index, array) { - return array.indexOf(uid) === index; - }); - + uids = _.uniq(uids); + var topicData; async.waterfall([ function (next) { topics.getTopicFields(tid, ['tid', 'cid', 'deleted'], next); }, - function (topicData, next) { + function (_topicData, next) { + topicData = _topicData; async.parallel({ disabled: function (next) { categories.getCategoryField(topicData.cid, 'disabled', next); @@ -143,18 +140,15 @@ module.exports = function (privileges) { isAdmins: function (next) { user.isAdministrator(uids, next); }, - }, function (err, results) { - if (err) { - return next(err); - } - - uids = uids.filter(function (uid, index) { - return parseInt(results.disabled, 10) !== 1 && - ((results.allowedTo[index] && parseInt(topicData.deleted, 10) !== 1) || results.isAdmins[index] || results.isModerators[index]); - }); - - next(null, uids); + }, next); + }, + function (results, next) { + uids = uids.filter(function (uid, index) { + return parseInt(results.disabled, 10) !== 1 && + ((results.allowedTo[index] && parseInt(topicData.deleted, 10) !== 1) || results.isAdmins[index] || results.isModerators[index]); }); + + next(null, uids); }, ], callback); }; From 38af651072008e24f2db8866130f3be60494dbe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 25 Jun 2017 20:00:05 -0400 Subject: [PATCH 16/16] use _.uniq --- src/posts/category.js | 8 +++----- src/privileges/categories.js | 4 +--- src/privileges/posts.js | 10 ++++++---- src/privileges/users.js | 5 ++--- src/search.js | 10 ++++------ src/topics.js | 8 ++++---- src/topics/suggested.js | 4 ++-- src/topics/tags.js | 7 ++++--- src/topics/teaser.js | 7 +++---- src/topics/unread.js | 15 ++++++++------- src/user.js | 4 +--- src/user/delete.js | 5 ++--- 12 files changed, 40 insertions(+), 47 deletions(-) diff --git a/src/posts/category.js b/src/posts/category.js index 42319fd6ed..d1de31850e 100644 --- a/src/posts/category.js +++ b/src/posts/category.js @@ -28,11 +28,9 @@ module.exports = function (Posts) { }, function (_postData, next) { postData = _postData; - tids = postData.map(function (post) { - return post.tid; - }).filter(function (tid, index, array) { - return tid && array.indexOf(tid) === index; - }); + tids = _.uniq(postData.map(function (post) { + return post && post.tid; + }).filter(Boolean)); topics.getTopicsFields(tids, ['cid'], next); }, diff --git a/src/privileges/categories.js b/src/privileges/categories.js index f01971b591..97889c2b2e 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -232,9 +232,7 @@ module.exports = function (privileges) { return callback(null, []); } - cids = cids.filter(function (cid, index, array) { - return array.indexOf(cid) === index; - }); + cids = _.uniq(cids); async.waterfall([ function (next) { diff --git a/src/privileges/posts.js b/src/privileges/posts.js index 1855098927..89ef1e0f48 100644 --- a/src/privileges/posts.js +++ b/src/privileges/posts.js @@ -2,6 +2,7 @@ 'use strict'; var async = require('async'); +var _ = require('lodash'); var meta = require('../meta'); var posts = require('../posts'); @@ -72,17 +73,18 @@ module.exports = function (privileges) { var tids; var tidToTopic = {}; + pids = _.uniq(pids); + async.waterfall([ function (next) { posts.getPostsFields(pids, ['uid', 'tid', 'deleted'], next); }, function (_posts, next) { postData = _posts; - tids = _posts.map(function (post) { + tids = _.uniq(_posts.map(function (post) { return post && post.tid; - }).filter(function (tid, index, array) { - return tid && array.indexOf(tid) === index; - }); + }).filter(Boolean)); + topics.getTopicsFields(tids, ['deleted', 'cid'], next); }, function (topicData, next) { diff --git a/src/privileges/users.js b/src/privileges/users.js index 4b04b3ccd2..5e48750dc9 100644 --- a/src/privileges/users.js +++ b/src/privileges/users.js @@ -2,6 +2,7 @@ 'use strict'; var async = require('async'); +var _ = require('lodash'); var user = require('../user'); var groups = require('../groups'); @@ -51,9 +52,7 @@ module.exports = function (privileges) { return filterIsModerator(cids, uid, cids.map(function () { return true; }), callback); } - uniqueCids = cids.filter(function (cid, index, array) { - return array.indexOf(cid) === index; - }); + uniqueCids = _.uniq(cids); helpers.isUserAllowedTo('moderate', uid, uniqueCids, next); }, diff --git a/src/search.js b/src/search.js index 599bd66c09..58b93c8a5a 100644 --- a/src/search.js +++ b/src/search.js @@ -1,6 +1,7 @@ 'use strict'; var async = require('async'); +var _ = require('lodash'); var db = require('./database'); var posts = require('./posts'); @@ -79,9 +80,7 @@ function searchInContent(data, callback) { function (mainPids, next) { pids = mainPids.concat(pids).map(function (pid) { return pid && pid.toString(); - }).filter(function (pid, index, array) { - return pid && array.indexOf(pid) === index; - }); + }).filter(Boolean); privileges.posts.filter('read', pids, data.uid, next); }, @@ -392,9 +391,8 @@ function getSearchCids(data, callback) { }, next); }, function (results, next) { - var cids = results.watchedCids.concat(results.childrenCids).concat(data.categories).filter(function (cid, index, array) { - return cid && array.indexOf(cid) === index; - }); + var cids = results.watchedCids.concat(results.childrenCids).concat(data.categories).filter(Boolean); + cids = _.uniq(cids); next(null, cids); }, ], callback); diff --git a/src/topics.js b/src/topics.js index 575199d400..3952f7b402 100644 --- a/src/topics.js +++ b/src/topics.js @@ -101,14 +101,14 @@ Topics.getTopicsByTids = function (tids, uid, callback) { function mapFilter(array, field) { return array.map(function (topic) { return topic && topic[field] && topic[field].toString(); - }).filter(function (value, index, array) { - return utils.isNumber(value) && array.indexOf(value) === index; + }).filter(function (value) { + return utils.isNumber(value); }); } topics = _topics; - uids = mapFilter(topics, 'uid'); - cids = mapFilter(topics, 'cid'); + uids = _.uniq(mapFilter(topics, 'uid')); + cids = _.uniq(mapFilter(topics, 'cid')); async.parallel({ users: function (next) { diff --git a/src/topics/suggested.js b/src/topics/suggested.js index 33153a580c..e2b965fd4e 100644 --- a/src/topics/suggested.js +++ b/src/topics/suggested.js @@ -25,8 +25,8 @@ module.exports = function (Topics) { }, function (results, next) { var tids = results.tagTids.concat(results.searchTids).concat(results.categoryTids); - tids = tids.filter(function (_tid, index, array) { - return parseInt(_tid, 10) !== parseInt(tid, 10) && array.indexOf(_tid) === index; + tids = _.uniq(tids).filter(function (_tid) { + return parseInt(_tid, 10) !== parseInt(tid, 10); }); if (stop === -1) { diff --git a/src/topics/tags.js b/src/topics/tags.js index dbfb092cc1..f936d7da4a 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -23,11 +23,12 @@ module.exports = function (Topics) { plugins.fireHook('filter:tags.filter', { tags: tags, tid: tid }, next); }, function (data, next) { - tags = data.tags.slice(0, meta.config.maximumTagsPerTopic || 5); + tags = _.uniq(data.tags); + tags = tags.slice(0, meta.config.maximumTagsPerTopic || 5); tags = tags.map(function (tag) { return utils.cleanUpTag(tag, meta.config.maximumTagLength); - }).filter(function (tag, index, array) { - return tag && tag.length >= (meta.config.minimumTagLength || 3) && array.indexOf(tag) === index; + }).filter(function (tag) { + return tag && tag.length >= (meta.config.minimumTagLength || 3); }); filterCategoryTags(tags, tid, next); diff --git a/src/topics/teaser.js b/src/topics/teaser.js index d62dc2fe72..09d4d048ae 100644 --- a/src/topics/teaser.js +++ b/src/topics/teaser.js @@ -2,6 +2,7 @@ 'use strict'; var async = require('async'); +var _ = require('lodash'); var S = require('string'); var winston = require('winston'); @@ -57,11 +58,9 @@ module.exports = function (Topics) { }, function (_postData, next) { postData = _postData; - var uids = postData.map(function (post) { + var uids = _.uniq(postData.map(function (post) { return post.uid; - }).filter(function (uid, index, array) { - return array.indexOf(uid) === index; - }); + })); user.getUsersFields(uids, ['uid', 'username', 'userslug', 'picture'], next); }, diff --git a/src/topics/unread.js b/src/topics/unread.js index 073a680358..4a46e4c0c9 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -2,6 +2,7 @@ 'use strict'; var async = require('async'); +var _ = require('lodash'); var db = require('../database'); var user = require('../user'); @@ -118,10 +119,10 @@ module.exports = function (Topics) { } }).map(function (topic) { return topic.value; - }).filter(function (tid, index, array) { - return array.indexOf(tid) === index; }); + tids = _.uniq(tids); + if (params.filter === 'watched') { Topics.filterWatchedTids(tids, uid, next); } else { @@ -222,8 +223,8 @@ module.exports = function (Topics) { return setImmediate(callback, null, false); } - tids = tids.filter(function (tid, index, array) { - return tid && utils.isNumber(tid) && array.indexOf(tid) === index; + tids = _.uniq(tids).filter(function (tid) { + return tid && utils.isNumber(tid); }); if (!tids.length) { @@ -260,9 +261,9 @@ module.exports = function (Topics) { function (results, next) { var cids = results.topicData.map(function (topic) { return topic && topic.cid; - }).filter(function (topic, index, array) { - return topic && array.indexOf(topic) === index; - }); + }).filter(Boolean); + + cids = _.uniq(cids); categories.markAsRead(cids, uid, next); }, diff --git a/src/user.js b/src/user.js index e4ad24283c..db8f9774ed 100644 --- a/src/user.js +++ b/src/user.js @@ -64,9 +64,7 @@ User.getUsersWithFields = function (uids, fields, uid, callback) { plugins.fireHook('filter:users.addFields', { fields: fields }, next); }, function (data, next) { - data.fields = data.fields.filter(function (field, index, array) { - return array.indexOf(field) === index; - }); + data.fields = _.uniq(data.fields); async.parallel({ userData: function (next) { diff --git a/src/user/delete.js b/src/user/delete.js index 7392192c8b..92fd8f27b9 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -1,6 +1,7 @@ 'use strict'; var async = require('async'); +var _ = require('lodash'); var db = require('../database'); var posts = require('../posts'); @@ -152,9 +153,7 @@ module.exports = function (User) { }, next); }, function (pids, next) { - pids = pids.upvotedPids.concat(pids.downvotedPids).filter(function (pid, index, array) { - return pid && array.indexOf(pid) === index; - }); + pids = _.uniq(pids.upvotedPids.concat(pids.downvotedPids).filter(Boolean)); async.eachSeries(pids, function (pid, next) { posts.unvote(pid, uid, next);