nodebb-plugin-poll 4.0.14 → 4.0.15

package/languages/tr/poll.json

@@ -1,47 +1,47 @@
-{
-  "poll": "Anket",
-  "toggles": "Değişiklikler",
-  "allow_guests": "Ziyaretçilerin anket sonucunu görmelerine izin ver",
-  "limits": "Sınırlamalar",
-  "max_options": "Anketlerdeki maksimum seçenek sayısı",
-  "defaults": "Varsayılanlar",
-  "default_title": "Varsayılan Anket Başlığı",
-  "max_votes": "Kişi başı maksimum oy sayısı",
-  "disallow_vote_update": "Kişilerin oylarını değiştirmelerine izin verme",
-  "info_choices": "1'den büyük bir sayı çoktan seçmeli anket oluşturacak.",
-  "settings": "Ayarlar",
-  "save": "Kaydet",
-  "reset": "Sıfırla",
-
-  "creator_title": "Anket Oluştur",
-  "poll_title": "Anket Başlığı",
-  "poll_title_placeholder": "Anket başlığını buraya girin",
-  "options_title": "Seçenekler",
-  "options_add": "Seçenek ekle",
-  "max_votes_placeholder": "Bir sayı girin",
-  "auto_end_title": "Anketi otomatik olarak bitir",
-  "auto_end_placeholder": "Tarih ve saat bilgisini buraya girin",
-  "auto_end_help": "Burayı boş bırakırsanız anket hiç sonlanmayacak.",
-
-  "error.max_options": "Sadece %d seçenek oluşturabilirsiniz.",
-  "error.no_options": "En az bir seçenek oluşturmalısınız",
-  "error.valid_date": "Lütfen geçerli bir tarih girin",
-
-  "error.not_main": "Anketi sadece ilk iletiye ekleyebilirsiniz.",
-  "error.privilege.create": "Anket oluşturmaya yetkiniz yok",
-
-  "warning.redactor": "Redactor kullanıyorsunuz. Markup'ı manuel olarak <strong>değiştirmeyin</strong>. Bunun yerine anket oluşturucuyu yeniden açın.",
-
-  "vote": "Oy ver",
-  "update_vote": "Oyu güncelle",
-  "remove_vote": "Oyu kaldır",
-  "to_voting": "Seçeneklere geri dön",
-  "to_results": "Sonuçlar",
-  "voting_unavailable_title": "Oy vermek artık mümkün değil",
-  "voting_unavailable_message": "Bu anket bitti veya silindi. Sonuçları hala görmeniz mümkün",
-  "voting_update_disallowed_message": "Daha önce oy verdiniz. Bu anket için oyunuzu değiştiremezsiniz",
-  "vote_is_final": "Bu ankette oy değiştirmeniz mümkün değildir, o nedenle seçiminiz son karardır",
-
-  "vote_count": "kişi bu seçenek için oy kullandı",
-  "votes": "oy"
-}
+{
+  "poll": "Anket",
+  "toggles": "Değişiklikler",
+  "allow_guests": "Ziyaretçilerin anket sonucunu görmelerine izin ver",
+  "limits": "Sınırlamalar",
+  "max_options": "Anketlerdeki maksimum seçenek sayısı",
+  "defaults": "Varsayılanlar",
+  "default_title": "Varsayılan Anket Başlığı",
+  "max_votes": "Kişi başı maksimum oy sayısı",
+  "disallow_vote_update": "Kişilerin oylarını değiştirmelerine izin verme",
+  "info_choices": "1'den büyük bir sayı çoktan seçmeli anket oluşturacak.",
+  "settings": "Ayarlar",
+  "save": "Kaydet",
+  "reset": "Sıfırla",
+
+  "creator_title": "Anket Oluştur",
+  "poll_title": "Anket Başlığı",
+  "poll_title_placeholder": "Anket başlığını buraya girin",
+  "options_title": "Seçenekler",
+  "options_add": "Seçenek ekle",
+  "max_votes_placeholder": "Bir sayı girin",
+  "auto_end_title": "Anketi otomatik olarak bitir",
+  "auto_end_placeholder": "Tarih ve saat bilgisini buraya girin",
+  "auto_end_help": "Burayı boş bırakırsanız anket hiç sonlanmayacak.",
+
+  "error.max_options": "Sadece %1 seçenek oluşturabilirsiniz.",
+  "error.no_options": "En az bir seçenek oluşturmalısınız",
+  "error.valid_date": "Lütfen geçerli bir tarih girin",
+
+  "error.not_main": "Anketi sadece ilk iletiye ekleyebilirsiniz.",
+  "error.privilege.create": "Anket oluşturmaya yetkiniz yok",
+
+  "warning.redactor": "Redactor kullanıyorsunuz. Markup'ı manuel olarak <strong>değiştirmeyin</strong>. Bunun yerine anket oluşturucuyu yeniden açın.",
+
+  "vote": "Oy ver",
+  "update_vote": "Oyu güncelle",
+  "remove_vote": "Oyu kaldır",
+  "to_voting": "Seçeneklere geri dön",
+  "to_results": "Sonuçlar",
+  "voting_unavailable_title": "Oy vermek artık mümkün değil",
+  "voting_unavailable_message": "Bu anket bitti veya silindi. Sonuçları hala görmeniz mümkün",
+  "voting_update_disallowed_message": "Daha önce oy verdiniz. Bu anket için oyunuzu değiştiremezsiniz",
+  "vote_is_final": "Bu ankette oy değiştirmeniz mümkün değildir, o nedenle seçiminiz son karardır",
+
+  "vote_count": "kişi bu seçenek için oy kullandı",
+  "votes": "oy"
+}

package/lib/config.js

@@ -28,9 +28,20 @@ Config.defaults = {
 
 Config.getSettings = async function () {
 	const settings = await meta.settings.get(Config.plugin.id);
-	return {
+	const merged = {
 		...Config.defaults,
 		...settings,
 	};
+	// NodeBB's settings helper stores checkboxes as 'on'/'off'; normalize to a boolean
+	// so parseInt(...) === 1 checks don't silently fail.
+	merged.allowGuestsToViewResults = ['1', 1, 'on', true].includes(merged.allowGuestsToViewResults);
+	// NodeBB's settings helper stores blank number fields as ''; fall back to defaults
+	// so an empty ACP field doesn't override the configured default.
+	merged.maxOptions = parseInt(merged.maxOptions, 10) || Config.defaults.maxOptions;
+	merged.maximumVotesPerUser = parseInt(merged.maximumVotesPerUser, 10) || Config.defaults.maximumVotesPerUser;
+	// NodeBB's settings helper stores blank text fields as ''; fall back to the
+	// configured default so an empty ACP field doesn't override the built-in default.
+	merged.defaultTitle = merged.defaultTitle || Config.defaults.defaultTitle;
+	return merged;
 };
 

package/lib/hooks.js

@@ -44,7 +44,6 @@ Hooks.filter.postCreate = async function (hookData) {
 	// post is going to be saved to db, data is what is submitted by user
 	const { post, data } = hookData;
 	if (Array.isArray(data?.polls) && data.polls.length) {
-		await checkMaxOptions(data.polls);
 		const savedPolls = await Poll.add(post, data.polls);
 		if (savedPolls.length) {
 			post.pollIds = JSON.stringify(savedPolls.map(p => String(p.pollId)));
@@ -74,7 +73,6 @@ Hooks.filter.postEdit = async function (hookData) {
 		return hookData;
 	}
 	const pollData = hookData.data.polls || [];
-	await checkMaxOptions(pollData);
 	const toAdd = pollData.filter(p => !currentPollIds.includes(String(p.pollId)));
 
 	if (toAdd.length) {
@@ -136,15 +134,3 @@ async function canCreate(cid, uid) {
 	}
 }
 
-async function checkMaxOptions(polls) {
-	if (!Array.isArray(polls) || !polls.length) {
-		return;
-	}
-	const { maxOptions } = await Config.getSettings();
-	polls.forEach((poll) => {
-		if (poll && poll.options.length > maxOptions) {
-			throw new Error(`[[poll:error.max_options, ${maxOptions}]]`);
-		}
-	});
-}
-

package/lib/poll.js

@@ -3,6 +3,7 @@
 const db = nodebb.require('./src/database');
 const privileges = nodebb.require('./src/privileges');
 
+const Config = require('./config');
 const Vote = require('./vote');
 
 const Poll = exports;
@@ -10,6 +11,7 @@ const Poll = exports;
 Poll.add = async function (postData, polls) {
 	// postData is what is being saved to db
 	// polls is submited by user
+	await validateMaxOptions(polls);
 	const savePolls = [];
 	for (const pollData of polls) {
 		// eslint-disable-next-line no-await-in-loop
@@ -75,6 +77,9 @@ Poll.edit = async function (postData, newPolls) {
 	const toDelete = currentPollIds.filter(pollId => !newPollIds.includes(String(pollId)));
 	const currentPolls = await db.getObjects(currentPollIds.map(pollId => `poll:${pollId}`));
 
+	await validateMaxOptions(toAdd);
+	await validateMaxOptionsForEdit(toUpdate, currentPolls);
+
 	await Poll.deletePolls(toDelete);
 
 	const savedPolls = await Poll.add(postData, toAdd);
@@ -245,6 +250,46 @@ function tryParseOptions(optionsJson) {
 	}
 }
 
+async function validateMaxOptions(polls) {
+	if (!Array.isArray(polls) || !polls.length) {
+		return;
+	}
+	const settings = await Config.getSettings();
+	const { maxOptions } = settings;
+	polls.forEach((poll) => {
+		if (!poll) {
+			return;
+		}
+		const optionCount = Array.isArray(poll.options) ? poll.options.length : 0;
+		if (optionCount > maxOptions) {
+			throw new Error(`[[poll:error.max_options, ${maxOptions}]]`);
+		}
+	});
+}
+
+async function validateMaxOptionsForEdit(updatedPolls, currentPolls) {
+	if (!Array.isArray(updatedPolls) || !updatedPolls.length) {
+		return;
+	}
+	const settings = await Config.getSettings();
+	const { maxOptions } = settings;
+	updatedPolls.forEach((poll) => {
+		if (!poll) {
+			return;
+		}
+		const newOptionCount = Array.isArray(poll.options) ? poll.options.length : 0;
+		if (newOptionCount <= maxOptions) {
+			return;
+		}
+		const currentPoll = currentPolls.find(p => p && String(p.pollId) === String(poll.pollId));
+		const currentOptions = currentPoll ? tryParseOptions(currentPoll.options) : [];
+		const currentOptionCount = Array.isArray(currentOptions) ? currentOptions.length : 0;
+		if (newOptionCount > currentOptionCount) {
+			throw new Error(`[[poll:error.max_options, ${maxOptions}]]`);
+		}
+	});
+}
+
 Poll.getOption = async function (pollId, option, withVotes = false) {
 	const [optionsJson, votes, voteCount] = await Promise.all([
 		db.getObjectField(`poll:${pollId}`, 'options'),

package/lib/sockets.js

@@ -15,7 +15,7 @@ const Sockets = exports;
 
 Sockets.get = async function (socket, data) {
 	const settings = await Config.getSettings();
-	const allowAnon = settings.allowGuestsToViewResults === 'on';
+	const allowAnon = !!settings.allowGuestsToViewResults;
 
 	if (!data) {
 		throw new Error('Invalid request, request data is not defined');
@@ -27,13 +27,13 @@ Sockets.get = async function (socket, data) {
 		return [];
 	}
 	return await Promise.all(data.pollIds.map(async (pollId) => {
-		const withVotes = allowAnon || socket.uid > 0;
+		const withVotes = !!socket.uid;
 		const pollData = await Poll.get(pollId, socket.uid, withVotes);
 		if (!pollData) {
 			return null;
 		}
 
-		if (parseInt(pollData.info.allowAnonVoting, 10) === 1) {
+		if (withVotes && parseInt(pollData.info.allowAnonVoting, 10) === 1) {
 			await anonymizeVoters(socket.uid, pollId, pollData.options);
 		}
 
@@ -145,20 +145,18 @@ Sockets.removeVote = async function (socket, data) {
 };
 
 Sockets.getOptionDetails = async function (socket, data) {
-	if (!data || isNaN(parseInt(data.pollId, 10)) || isNaN(parseInt(data.optionId, 10))) {
+	if (!socket.uid || !data || isNaN(parseInt(data.pollId, 10)) || isNaN(parseInt(data.optionId, 10))) {
 		throw new Error('Invalid request');
 	}
-	const [poll, option, settings] = await Promise.all([
+	const [poll, option] = await Promise.all([
 		Poll.getInfo(data.pollId),
 		Poll.getOption(data.pollId, data.optionId, true),
-		Config.getSettings(),
 	]);
 	if (!poll) {
 		throw new Error('[[error:invalid-data]]');
 	}
-	const allowAnon = settings.allowGuestsToViewResults === 'on';
 	const canRead = await privileges.posts.can('topics:read', poll.pid, socket.uid);
-	if (!canRead || (!allowAnon && socket.uid <= 0)) {
+	if (!canRead) {
 		throw new Error('[[error:no-privileges]]');
 	}
 	if (!option || !option.votes || !option.votes.length) {
@@ -170,7 +168,7 @@ Sockets.getOptionDetails = async function (socket, data) {
 	}
 
 	const userData = await NodeBB.User.getUsersFields(option.votes, [
-		'uid', 'username', 'userslug', 'picture',
+		'uid', 'username', 'userslug', 'picture', 'displayname', 'icon:text', 'icon:bgColor',
 	]);
 	option.votes = userData;
 
@@ -205,7 +203,7 @@ async function anonymizeVoters(callerUid, pollId, options) {
 	}
 	const uidToIsAnon = _.zipObject(uids, isAnon);
 	options.forEach((opt) => {
-		opt.votes = opt.votes.map(
+		opt.votes = (opt.votes || []).map(
 			uid => (uidToIsAnon[uid] && String(callerUid) !== uid ? 0 : uid)
 		);
 	});

package/library.js

@@ -92,7 +92,7 @@ Plugin.renderPollWidget = async function (widget) {
 	const Poll = require('./lib/poll');
 
 	const settings = await Config.getSettings();
-	const allowAnon = settings.allowGuestsToViewResults === 'on';
+	const allowAnon = !!settings.allowGuestsToViewResults;
 
 	if (!widget.uid && !allowAnon) {
 		return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-poll",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "description": "NodeBB Poll Plugin",
   "main": "library.js",
   "scripts": {

package/public/js/poll/creator.js

@@ -46,7 +46,6 @@
 		const html = await Benchpress.render('poll/manage', { post: postData });
 
 		if (modal) {
-			// modal.find('.bootbox-body').html(html[0].outerHTML);
 			modal.find('.bootbox-body').html(html);
 			handleSort({ modal, polls: postData.polls });
 		} else {
@@ -158,7 +157,16 @@
 	Creator.show = function (modalTitle, poll, config) {
 		return new Promise((resolve) => {
 			app.require(['benchpressjs', 'modals']).then(([Benchpress, modals]) => {
-				Benchpress.render('poll/creator', { poll, config }).then(async function (html) {
+				const pollForTemplate = { ...poll };
+				const end = parseInt(pollForTemplate.end, 10);
+				if (end > 0) {
+					const d = new Date(end);
+					const pad = n => String(n).padStart(2, '0');
+					pollForTemplate.end = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`;
+				} else {
+					pollForTemplate.end = '';
+				}
+				Benchpress.render('poll/creator', { poll: pollForTemplate, config }).then(async function (html) {
 					const modal = await modals.dialog({
 						title: modalTitle,
 						message: html,
@@ -190,14 +198,15 @@
 						},
 					});
 
+					setTimezoneLabel(modal);
 					handleOptionSort({ modal });
 
 					// Add option adder
 					modal.find('#pollAddOption')
 						.off('click')
 						.on('click', async function () {
-							const optionEls = modal.find('[component="post/poll/option/item"]');
-							if (config.maxOptions <= optionEls.length) {
+							const optionCount = modal.find('#poll-options-container [component="post/poll/option/item"]').length;
+							if (config.maxOptions <= optionCount) {
 								clearErrors();
 								error(`[[poll:error.max_options, ${config.maxOptions}]]`);
 								return false;
@@ -230,6 +239,14 @@
 		});
 	}
 
+	function setTimezoneLabel(modal) {
+		const offsetMinutes = -new Date().getTimezoneOffset();
+		const sign = offsetMinutes >= 0 ? '+' : '-';
+		const hours = String(Math.floor(Math.abs(offsetMinutes) / 60)).padStart(2, '0');
+		const minutes = String(Math.abs(offsetMinutes) % 60).padStart(2, '0');
+		modal.find('[data-timezone-label]').text(`(UTC${sign}${hours}:${minutes})`);
+	}
+
 	async function error(message) {
 		const errorBox = $('#pollErrorBox');
 		const translator = await app.require('translator');

package/public/js/poll/main.js

@@ -71,16 +71,27 @@ $(document).ready(function () {
 	});
 
 	function getPollByPost(post) {
-		if (!post || !post.hasOwnProperty('pollIds') || !post.pollIds) return;
-		let pollIds;
-		try {
-			pollIds = JSON.parse(post.pollIds || '[]');
-		} catch (err) {
-			pollIds = [];
+		if (!post) return;
+		let pollIds = [];
+		if (post.pollIds) {
+			try {
+				pollIds = JSON.parse(post.pollIds);
+			} catch (err) {
+				pollIds = [];
+			}
 		}
+		const postEl = $(`[component="post"][data-pid="${post.pid}"]`);
+		const container = postEl.find('[component="post/content"]');
+		const validPollIdSet = new Set((pollIds || []).map(id => String(id)));
+		container.find('[data-poll-id]').each(function () {
+			const existingPollId = $(this).attr('data-poll-id');
+			if (!validPollIdSet.has(existingPollId)) {
+				$(this).remove();
+				delete Poll.view.polls[existingPollId];
+			}
+		});
 		if (pollIds.length) {
-			const postEl = $(`[component="post"][data-pid="${post.pid}"]`);
-			getPolls(pollIds, postEl.find('[component="post/content"]'));
+			getPolls(pollIds, container);
 		}
 	}
 

package/public/js/poll/view.js

@@ -129,6 +129,9 @@
 		{
 			// Option details
 			register: function (view) {
+				if (!app.user.uid) {
+					return;
+				}
 				const self = this;
 				view.dom.resultsPanel.off('click').on('click', '.poll-result-votecount', function (e) {
 					self.handle(view, e);
@@ -201,7 +204,7 @@
 	};
 
 	View.prototype.voteUpdateAllowed = function () {
-		return parseInt(this.pollData.disallowVoteUpdate, 10) !== 1;
+		return parseInt(this.pollData.info.disallowVoteUpdate, 10) !== 1;
 	};
 
 	View.prototype.pollEndedOrDeleted = function () {
@@ -257,20 +260,26 @@
 		this.dom.messages.addClass('hidden');
 	};
 
-	View.prototype.showOptionDetails = function (details) {
-		require(['benchpress', 'modals'], function (benchpress, modals) {
-			benchpress.render('poll/view/details', details).then(function (html) {
-				modals.dialog({
-					title: `[[poll:x-users-voted-for-this-option, ${details.voteCount}]]`,
-					message: html,
-					backdrop: true,
-					buttons: {
-						close: {
-							label: 'Close',
-						},
-					},
-				});
-			});
+	View.prototype.showOptionDetails = async function (details) {
+		const [modals, Benchpress] = await app.require(['modals', 'benchpressjs']);
+		if (details.votes) {
+			const translator = await app.require('translator');
+			await Promise.all(details.votes.map(async (voter) => {
+				if (!parseInt(voter.uid, 10) && voter.displayname) {
+					voter.displayname = await translator.translate(voter.displayname);
+				}
+			}));
+		}
+		const html = await Benchpress.render('poll/view/details', details);
+		await modals.dialog({
+			title: `[[poll:x-users-voted-for-this-option, ${details.voteCount}]]`,
+			message: html,
+			backdrop: true,
+			buttons: {
+				close: {
+					label: '[[global:close]]',
+				},
+			},
 		});
 	};
 
@@ -301,7 +310,7 @@
 			}
 		} else {
 			this.showVoteButton();
-			if (this.pollData?.info?.allowAnonVoting) {
+			if (this.pollData.info.allowAnonVoting) {
 				this.showVoteAnonButton();
 			}
 		}

package/templates/admin/plugins/poll.tpl

@@ -4,7 +4,7 @@
 			<h4 class="fw-bold tracking-tight mb-0">{title}</h4>
 		</div>
 		<div class="col-12 col-md-4 px-0 px-md-3 text-end">
-			<button id="save" class="btn btn-primary btn-sm fw-semibold ff-secondary text-center text-nowrap">[[admin/admin:save-changes]]</button>
+			<button id="save" class="btn btn-primary btn-sm fw-semibold ff-secondary text-center text-nowrap">{{tx("admin/admin:save-changes")}}</button>
 		</div>
 	</div>
 
@@ -15,10 +15,10 @@
 					<thead>
 						<tr class="text-sm">
 							<th>ID</th>
-							<th class="text-nowrap">[[poll:poll_title]]</th>
-							<th class="text-nowrap">[[poll:created-time]]</th>
-							<th class="text-nowrap">[[poll:end-time]]</th>
-							<th class="text-end text-nowrap text-capitalize">[[poll:votes]]</th>
+							<th class="text-nowrap">{{tx("poll:poll_title")}}</th>
+							<th class="text-nowrap">{{tx("poll:created-time")}}</th>
+							<th class="text-nowrap">{{tx("poll:end-time")}}</th>
+							<th class="text-end text-nowrap text-capitalize">{{tx("poll:votes")}}</th>
 						</tr>
 					</thead>
 					<tbody class="text-xs text-tabular">
@@ -47,27 +47,26 @@
 		<div id="spy-container" class="col-12 col-lg-3" tabindex="0">
 			<form class="form poll-settings">
 				<div class="form-check mb-3">
-					<label class="form-check-label" for="allowGuestsToViewResults">[[poll:allow_guests]]</label>
+					<label class="form-check-label" for="allowGuestsToViewResults">{{tx("poll:allow_guests")}}</label>
 					<input class="form-check-input" type="checkbox" id="allowGuestsToViewResults" name="allowGuestsToViewResults">
 				</div>
 
 				<div class="mb-3">
-					<label class="form-label" for="maxOptions">[[poll:max_options]]</label>
+					<label class="form-label" for="maxOptions">{{tx("poll:max_options")}}</label>
 					<input type="number" class="form-control" id="maxOptions" placeholder="10" min="1" max="100" name="maxOptions">
 				</div>
 
 				<div class="mb-3">
-					<label class="form-label" for="defaultTitle">[[poll:default_title]]</label>
+					<label class="form-label" for="defaultTitle">{{tx("poll:default_title")}}</label>
 					<input type="text" class="form-control" id="defaultTitle" placeholder="Poll" name="defaultTitle">
 				</div>
 				<div>
-					<label class="form-label" for="maximumVotesPerUser">[[poll:max_votes]]</label>
+					<label class="form-label" for="maximumVotesPerUser">{{tx("poll:max_votes")}}</label>
 					<input type="number" class="form-control" id="maximumVotesPerUser" placeholder="1" min="1" max="100" name="maximumVotesPerUser">
-					<p class="form-text">[[poll:info_choices]]</p>
+					<p class="form-text">{{tx("poll:info_choices")}}</p>
 				</div>
 			</form>
 		</div>
 	</div>
 </div>
 
-

package/templates/poll/creator.tpl

@@ -4,12 +4,12 @@
     <input type="hidden" name="pollId" value="{poll.pollId}">
 
     <div class="mb-3">
-        <label class="form-label" for="pollInputTitle">[[poll:poll_title]]</label>
-        <input type="text" name="title" id="pollInputTitle" value="{poll.title}" placeholder="[[poll:poll_title_placeholder]]" class="form-control">
+        <label class="form-label" for="pollInputTitle">{{tx("poll:poll_title")}}</label>
+        <input type="text" name="title" id="pollInputTitle" value="{poll.title}" placeholder="{{tx("poll:poll_title_placeholder")}}" class="form-control">
     </div>
 
     <div class="mb-3 d-flex flex-column gap-1">
-        <label class="form-label" for="pollInputOptions">[[poll:options_title]]</label>
+        <label class="form-label" for="pollInputOptions">{{tx("poll:options_title")}}</label>
         <div id="poll-options-container" class="d-flex flex-column gap-1">
         {{{ if poll.options.length }}}
         {{{ each poll.options }}}
@@ -17,32 +17,33 @@
         {{{ end }}}
         {{{ end }}}
         </div>
-        <button type="button" id="pollAddOption" class="btn btn-primary btn-sm btn-block mt-2">[[poll:options_add]]</button>
+        <button type="button" id="pollAddOption" class="btn btn-primary btn-sm btn-block mt-2">{{tx("poll:options_add")}}</button>
     </div>
 
     <hr>
 
     <div class="mb-3">
-        <label class="form-label" for="pollInputAmount">[[poll:max_votes]]</label>
-        <input type="number" name="maximumVotesPerUser" id="pollInputAmount" value="{poll.maximumVotesPerUser}" min="1" max="10" step="1" placeholder="[[poll:max_votes_placeholder]]" class="form-control">
-        <p class="form-text">[[poll:info_choices]]</p>
+        <label class="form-label" for="pollInputAmount">{{tx("poll:max_votes")}}</label>
+        <input type="number" name="maximumVotesPerUser" id="pollInputAmount" value="{poll.maximumVotesPerUser}" min="1" max="10" step="1" placeholder="{{tx("poll:max_votes_placeholder")}}" class="form-control">
+        <p class="form-text">{{tx("poll:info_choices")}}</p>
     </div>
 
     <div class="form-check mb-3">
-        <label class="form-check-label" for="pollDisallowVoteUpdate">[[poll:disallow_vote_update]]</label>
+        <label class="form-check-label" for="pollDisallowVoteUpdate">{{tx("poll:disallow_vote_update")}}</label>
         <input class="form-check-input" type="checkbox" name="disallowVoteUpdate" id="pollDisallowVoteUpdate" {{{if poll.disallowVoteUpdate}}}checked{{{end}}}>
     </div>
 
     <div class="form-check mb-3">
-        <label class="form-check-label" for="allowAnonVoting">[[poll:allow_anon_voting]]</label>
+        <label class="form-check-label" for="allowAnonVoting">{{tx("poll:allow_anon_voting")}}</label>
         <input class="form-check-input" type="checkbox" name="allowAnonVoting" id="allowAnonVoting" {{{if poll.allowAnonVoting}}}checked{{{end}}}>
     </div>
 
     <div class="mb-3">
-        <label class="form-label" for="pollInputEnd">[[poll:auto_end_title]]</label>
+        <label class="form-label" for="pollInputEnd">{{tx("poll:auto_end_title")}}</label>
         <div class="input-group date">
-            <input id="pollInputEnd" placeholder="[[poll:auto_end_placeholder]]" name="end" class="form-control" value="{poll.end}" type="datetime-local">
+            <input id="pollInputEnd" placeholder="{{tx("poll:auto_end_placeholder")}}" name="end" class="form-control" value="{poll.end}" type="datetime-local">
+            <span class="input-group-text poll-timezone-label" data-timezone-label></span>
         </div>
-        <p class="form-text">[[poll:auto_end_help]]</p>
+        <p class="form-text">{{tx("poll:auto_end_help")}}</p>
     </div>
 </form>

package/templates/poll/manage.tpl

@@ -1,6 +1,6 @@
 <div class="topic-poll-modal">
 	{{{ if !post.polls.length }}}
-	<div class="alert alert-info">[[poll:no-polls]]</div>
+	<div class="alert alert-info">{{tx("poll:no-polls")}}</div>
 	{{{ end }}}
 	{{{ each post.polls }}}
 	<div component="post/poll/item" data-poll-id="{./pollId}" class="bg-body d-flex align-items-center justify-content-between mb-3 p-1 border rounded-1">

package/templates/poll/view/messages.tpl

@@ -1,3 +1,3 @@
-<h5>{title}</h5>
-<p>{content}</p>
+<h5>{{tx(title)}}</h5>
+<p>{{tx(content)}}</p>
 <hr>

package/templates/poll/view/results.tpl

@@ -1,10 +1,16 @@
-<!-- BEGIN poll.options -->
+{{{ each poll.options }}}
 <div class="poll-result" data-poll-option-id="{poll.options.id}">
     <div class="d-flex justify-content-between mb-1">
         <strong>{poll.options.title}</strong>
+        {{{ if config.loggedIn }}}
         <a class="poll-result-votecount small" href="#">
-            <span>[[poll:x-votes, {poll.options.voteCount}]]</span>
+            <span>{{tx("poll:x-votes", poll.options.voteCount)}}</span>
         </a>
+        {{{ else }}}
+        <span class="poll-result-votecount small">
+            <span>{{tx("poll:x-votes", poll.options.voteCount)}}</span>
+        </span>
+        {{{ end }}}
     </div>
     <div class="progress">
         <div class="progress-bar poll-result-progressbar" role="progressbar" aria-valuenow="{poll.options.percentage}" aria-valuemin="0" aria-valuemax="100" style="width: {poll.options.percentage}%;">
@@ -12,4 +18,4 @@
         </div>
     </div>
 </div>
-<!-- END poll.options -->
+{{{ end }}}