Merge remote-tracking branch 'origin/master' into develop
Julian Lam
7 years ago
commit
ec07247854
@ -1,64 +1,64 @@
|
|||||||
{
|
{
|
||||||
"state": "State",
|
"state": "Status",
|
||||||
"reporter": "Reporter",
|
"reporter": "Rapporteur",
|
||||||
"reported-at": "Reported At",
|
"reported-at": "Gerapporteerd op",
|
||||||
"description": "Description",
|
"description": "Beschrijving",
|
||||||
"no-flags": "Hooray! No flags found.",
|
"no-flags": "Hooray! No flags found.",
|
||||||
"assignee": "Assignee",
|
"assignee": "Toegekend aan",
|
||||||
"update": "Update",
|
"update": "Bijwerken",
|
||||||
"updated": "Updated",
|
"updated": "Bijgewerkt",
|
||||||
"target-purged": "The content this flag referred to has been purged and is no longer available.",
|
"target-purged": "The content this flag referred to has been purged and is no longer available.",
|
||||||
|
|
||||||
"quick-filters": "Quick Filters",
|
"quick-filters": "Quick Filters",
|
||||||
"filter-active": "There are one or more filters active in this list of flags",
|
"filter-active": "Er zijn een of meer filters actief in deze lijst van markeringen",
|
||||||
"filter-reset": "Remove Filters",
|
"filter-reset": "Filters verwijderen",
|
||||||
"filters": "Filter Options",
|
"filters": "Filter opties",
|
||||||
"filter-reporterId": "Reporter UID",
|
"filter-reporterId": "Rapporteur UID",
|
||||||
"filter-targetUid": "Flagged UID",
|
"filter-targetUid": "Flagged UID",
|
||||||
"filter-type": "Flag Type",
|
"filter-type": "Flag Type",
|
||||||
"filter-type-all": "All Content",
|
"filter-type-all": "Alle inhoud",
|
||||||
"filter-type-post": "Post",
|
"filter-type-post": "Bericht",
|
||||||
"filter-state": "State",
|
"filter-state": "Status",
|
||||||
"filter-assignee": "Assignee UID",
|
"filter-assignee": "Assignee UID",
|
||||||
"filter-cid": "Category",
|
"filter-cid": "Categorie",
|
||||||
"filter-quick-mine": "Assigned to me",
|
"filter-quick-mine": "Toegewezen aan mij",
|
||||||
"filter-cid-all": "All categories",
|
"filter-cid-all": "Alle categorieën",
|
||||||
"apply-filters": "Apply Filters",
|
"apply-filters": "Filters toepassen",
|
||||||
|
|
||||||
"quick-links": "Quick Links",
|
"quick-links": "Quick Links",
|
||||||
"flagged-user": "Flagged User",
|
"flagged-user": "Flagged User",
|
||||||
"view-profile": "View Profile",
|
"view-profile": "Profiel bekijken",
|
||||||
"start-new-chat": "Start New Chat",
|
"start-new-chat": "Begin een nieuwe chat",
|
||||||
"go-to-target": "View Flag Target",
|
"go-to-target": "View Flag Target",
|
||||||
|
|
||||||
"user-view": "View Profile",
|
"user-view": "Profiel bekijken",
|
||||||
"user-edit": "Edit Profile",
|
"user-edit": "Profiel wijzigen",
|
||||||
|
|
||||||
"notes": "Flag Notes",
|
"notes": "Flag Notes",
|
||||||
"add-note": "Add Note",
|
"add-note": "Notitie toevoegen",
|
||||||
"no-notes": "No shared notes.",
|
"no-notes": "Geen gedeelde notities",
|
||||||
|
|
||||||
"history": "Flag History",
|
"history": "Flag History",
|
||||||
"back": "Back to Flags List",
|
"back": "Back to Flags List",
|
||||||
"no-history": "No flag history.",
|
"no-history": "No flag history.",
|
||||||
|
|
||||||
"state-all": "All states",
|
"state-all": "Alle statussen",
|
||||||
"state-open": "New/Open",
|
"state-open": "Nieuw/Open",
|
||||||
"state-wip": "Work in Progress",
|
"state-wip": "Wordt aan gewerkt",
|
||||||
"state-resolved": "Resolved",
|
"state-resolved": "Opgelost",
|
||||||
"state-rejected": "Rejected",
|
"state-rejected": "Afgewezen",
|
||||||
"no-assignee": "Not Assigned",
|
"no-assignee": "Niet toegewezen",
|
||||||
"note-added": "Note Added",
|
"note-added": "Notitie toegevoegd",
|
||||||
|
|
||||||
"modal-title": "Report Inappropriate Content",
|
"modal-title": "Rapporteer ongepaste content",
|
||||||
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
|
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
|
||||||
"modal-reason-spam": "Spam",
|
"modal-reason-spam": "Spam",
|
||||||
"modal-reason-offensive": "Offensive",
|
"modal-reason-offensive": "Aanstootgevend",
|
||||||
"modal-reason-other": "Other (specify below)",
|
"modal-reason-other": "Anders (specificeer onder)",
|
||||||
"modal-reason-custom": "Reason for reporting this content...",
|
"modal-reason-custom": "Reden voor het rapporteren van deze content...",
|
||||||
"modal-submit": "Submit Report",
|
"modal-submit": "Rapport verzenden",
|
||||||
"modal-submit-success": "Content has been flagged for moderation.",
|
"modal-submit-success": "Content has been flagged for moderation.",
|
||||||
"modal-submit-confirm": "Confirm Submission",
|
"modal-submit-confirm": "Bevestig verzending",
|
||||||
"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
|
"modal-submit-confirm-text": "U hebt al een aangepaste reden gegegeven. Weet u zeker dat u een wilt verzenden via quick-report?",
|
||||||
"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined."
|
"modal-submit-confirm-text-help": "Verzenden van een quick-report overschrijft reeds gedefinieerde aangepaste redenen."
|
||||||
}
|
}
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
var async = require('async');
|
||||||
|
var batch = require('../../batch');
|
||||||
|
var db = require('../../database');
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
name: 'Fix sort by votes for moved topics',
|
||||||
|
timestamp: Date.UTC(2018, 0, 8),
|
||||||
|
method: function (callback) {
|
||||||
|
var progress = this.progress;
|
||||||
|
|
||||||
|
batch.processSortedSet('topics:tid', function (tids, next) {
|
||||||
|
async.eachLimit(tids, 500, function (tid, _next) {
|
||||||
|
progress.incr();
|
||||||
|
var topicData;
|
||||||
|
async.waterfall([
|
||||||
|
function (next) {
|
||||||
|
db.getObjectFields('topic:' + tid, ['cid', 'oldCid', 'upvotes', 'downvotes', 'pinned'], next);
|
||||||
|
},
|
||||||
|
function (_topicData, next) {
|
||||||
|
topicData = _topicData;
|
||||||
|
if (!topicData.cid || !topicData.oldCid) {
|
||||||
|
return _next();
|
||||||
|
}
|
||||||
|
|
||||||
|
var upvotes = parseInt(topicData.upvotes, 10) || 0;
|
||||||
|
var downvotes = parseInt(topicData.downvotes, 10) || 0;
|
||||||
|
var votes = upvotes - downvotes;
|
||||||
|
|
||||||
|
async.series([
|
||||||
|
function (next) {
|
||||||
|
db.sortedSetRemove('cid:' + topicData.oldCid + ':tids:votes', tid, next);
|
||||||
|
},
|
||||||
|
function (next) {
|
||||||
|
if (parseInt(topicData.pinned, 10) !== 1) {
|
||||||
|
db.sortedSetAdd('cid:' + topicData.cid + ':tids:votes', votes, tid, next);
|
||||||
|
} else {
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
], function (err) {
|
||||||
|
next(err);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
], _next);
|
||||||
|
}, next);
|
||||||
|
}, {
|
||||||
|
progress: progress,
|
||||||
|
batch: 500,
|
||||||
|
}, callback);
|
||||||
|
},
|
||||||
|
};
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
|
||||||
|
var async = require('async');
|
||||||
|
|
||||||
|
var privileges = require('../../privileges');
|
||||||
|
var db = require('../../database');
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
name: 'Give vote privilege to registered-users on all categories',
|
||||||
|
timestamp: Date.UTC(2018, 0, 9),
|
||||||
|
method: function (callback) {
|
||||||
|
db.getSortedSetRange('categories:cid', 0, -1, function (err, cids) {
|
||||||
|
if (err) {
|
||||||
|
return callback(err);
|
||||||
|
}
|
||||||
|
async.eachSeries(cids, function (cid, next) {
|
||||||
|
privileges.categories.give(['posts:upvote', 'posts:downvote'], cid, 'registered-users', next);
|
||||||
|
}, callback);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
};
|
||||||
Loading…
Reference in New Issue