From 285e40acab9fcdf696994f372c73934a8a72d6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 23 May 2024 16:53:42 -0400 Subject: [PATCH 01/18] Revert "fix: handle unhandled exception at handleErrors" This reverts commit 598c10c6a95dcada045478617cd937f10ebd9fb3. --- src/controllers/errors.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/controllers/errors.js b/src/controllers/errors.js index df00b81d47..35e2617bb1 100644 --- a/src/controllers/errors.js +++ b/src/controllers/errors.js @@ -101,12 +101,10 @@ exports.handleErrors = async function handleErrors(err, req, res, next) { // esl try { if (data.cases.hasOwnProperty(err.code)) { data.cases[err.code](err, req, res, defaultHandler); - } else if (err.message) { - if (err.message.startsWith('[[error:no-') && err.message !== '[[error:no-privileges]]') { - notFoundHandler(); - } else if (err.message.startsWith('Failed to lookup view')) { - notBuiltHandler(); - } + } else if (err.message.startsWith('[[error:no-') && err.message !== '[[error:no-privileges]]') { + notFoundHandler(); + } else if (err.message.startsWith('Failed to lookup view')) { + notBuiltHandler(); } else { await defaultHandler(); } From 56ef2bdd67c0e0f6015db804140c3ee3c58e5c32 Mon Sep 17 00:00:00 2001 From: Opliko Date: Thu, 23 May 2024 23:52:33 +0200 Subject: [PATCH 02/18] fix: reduce docker image size again and speed up build it really was just order of operations... resolves #12582 --- Dockerfile | 11 ++++++----- dev.Dockerfile | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9778513430..f3b76ab35b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,15 +46,16 @@ ENV NODE_ENV=production \ WORKDIR /usr/src/app/ -COPY --from=build --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/install/docker/setup.json /usr/src/app/ -COPY --from=build --chown=${USER}:${USER} /usr/bin/tini /usr/src/app/install/docker/entrypoint.sh /usr/local/bin/ - RUN corepack enable \ && groupadd --gid ${GID} ${USER} \ && useradd --uid ${UID} --gid ${GID} --home-dir /usr/src/app/ --shell /bin/bash ${USER} \ && mkdir -p /usr/src/app/logs/ /opt/config/ \ - && chown -R ${USER}:${USER} /usr/src/app/ /opt/config/ \ - && chmod +x /usr/local/bin/entrypoint.sh \ + && chown -R ${USER}:${USER} /usr/src/app/ /opt/config/ + +COPY --from=build --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/install/docker/setup.json /usr/src/app/ +COPY --from=build --chown=${USER}:${USER} /usr/bin/tini /usr/src/app/install/docker/entrypoint.sh /usr/local/bin/ + +RUN chmod +x /usr/local/bin/entrypoint.sh \ && chmod +x /usr/local/bin/tini # TODO: Have docker-compose use environment variables to create files like setup.json and config.json. diff --git a/dev.Dockerfile b/dev.Dockerfile index a2b3867ed5..bab7d800c5 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -51,17 +51,18 @@ ENV NODE_ENV=development \ WORKDIR /usr/src/app/ +RUN corepack enable \ + && groupadd --gid ${GID} ${USER} \ + && useradd --uid ${UID} --gid ${GID} --home-dir /usr/src/app/ --shell /bin/bash ${USER} \ + && mkdir -p /usr/src/app/logs/ /opt/config/ \ + && chown -R ${USER}:${USER} /usr/src/app/ /opt/config/ + COPY --from=build --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/install/docker/setup.json /usr/src/app/ COPY --from=build --chown=${USER}:${USER} /usr/bin/tini /usr/src/app/install/docker/entrypoint.sh /usr/local/bin/ COPY --from=node_modules_touch --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/ COPY --from=git --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/ -RUN corepack enable \ - && groupadd --gid ${GID} ${USER} \ - && useradd --uid ${UID} --gid ${GID} --home-dir /usr/src/app/ --shell /bin/bash ${USER} \ - && mkdir -p /usr/src/app/logs/ /opt/config/ \ - && chown -R ${USER}:${USER} /usr/src/app/ /opt/config/ \ - && chmod +x /usr/local/bin/entrypoint.sh \ +RUN chmod +x /usr/local/bin/entrypoint.sh \ && chmod +x /usr/local/bin/tini # TODO: Have docker-compose use environment variables to create files like setup.json and config.json. From 0b004b4b8c1e8d8cbd8479f19685204f22813d0e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 12:41:06 -0400 Subject: [PATCH 03/18] chore(deps): update dependency lint-staged to v15.2.4 (#12592) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 6418aa663e..bf4cd642dc 100644 --- a/install/package.json +++ b/install/package.json @@ -164,7 +164,7 @@ "grunt-contrib-watch": "1.1.0", "husky": "8.0.3", "jsdom": "24.0.0", - "lint-staged": "15.2.2", + "lint-staged": "15.2.4", "mocha": "10.4.0", "mocha-lcov-reporter": "1.3.0", "mockdate": "3.0.5", From 7a6b70f00da7fcb19ac4f1e329a0693df7f82b6d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 12:42:22 -0400 Subject: [PATCH 04/18] fix(deps): update dependency ace-builds to v1.34.1 (#12591) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bf4cd642dc..9584eb0f83 100644 --- a/install/package.json +++ b/install/package.json @@ -34,7 +34,7 @@ "@fortawesome/fontawesome-free": "6.5.2", "@isaacs/ttlcache": "1.4.1", "@popperjs/core": "2.11.8", - "ace-builds": "1.33.2", + "ace-builds": "1.34.1", "archiver": "7.0.1", "async": "3.2.5", "autoprefixer": "10.4.19", From 333ebd9be7246d4c4d584368fd50539e8d114371 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 12:43:16 -0400 Subject: [PATCH 05/18] fix(deps): update dependency nodebb-plugin-markdown to v12.2.7 (#12590) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 9584eb0f83..551f698f54 100644 --- a/install/package.json +++ b/install/package.json @@ -98,7 +98,7 @@ "nodebb-plugin-dbsearch": "6.2.3", "nodebb-plugin-emoji": "5.1.15", "nodebb-plugin-emoji-android": "4.0.0", - "nodebb-plugin-markdown": "12.2.6", + "nodebb-plugin-markdown": "12.2.7", "nodebb-plugin-mentions": "4.4.3", "nodebb-plugin-ntfy": "1.7.4", "nodebb-plugin-spam-be-gone": "2.2.2", From e0515080a087b453289a76f5c1ae40d19063d889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 24 May 2024 17:12:44 -0400 Subject: [PATCH 06/18] feat: convert "All Votes Are Public" toggle to vote visibility closes #12597 --- install/data/defaults.json | 2 +- .../en-GB/admin/settings/reputation.json | 5 ++++- src/socket.io/posts/votes.js | 9 ++++++++- src/upgrades/3.8.2/vote-visibility-config.js | 16 ++++++++++++++++ src/views/admin/settings/reputation.tpl | 10 +++++++--- 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 src/upgrades/3.8.2/vote-visibility-config.js diff --git a/install/data/defaults.json b/install/data/defaults.json index 6884f351b5..076a1435d0 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -137,7 +137,7 @@ "sitemapTopics": 500, "maintenanceMode": 0, "maintenanceModeStatus": 503, - "votesArePublic": 0, + "voteVisibility": "privileged", "maximumInvites": 0, "username:disableEdit": 0, "email:disableEdit": 0, diff --git a/public/language/en-GB/admin/settings/reputation.json b/public/language/en-GB/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/en-GB/admin/settings/reputation.json +++ b/public/language/en-GB/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/src/socket.io/posts/votes.js b/src/socket.io/posts/votes.js index 05e2ce5198..cd0b6f3b9b 100644 --- a/src/socket.io/posts/votes.js +++ b/src/socket.io/posts/votes.js @@ -91,7 +91,14 @@ module.exports = function (SocketPosts) { ]); const cidToAllowed = _.zipObject(uniqCids, canRead); const checks = cids.map( - (cid, index) => isAdmin || isMod[index] || (cidToAllowed[cid] && !!meta.config.votesArePublic) + (cid, index) => isAdmin || isMod[index] || + ( + cidToAllowed[cid] && + ( + meta.config.voteVisibility === 'all' || + (meta.config.voteVisibility === 'loggedin' && parseInt(uid, 10) > 0) + ) + ) ); return isArray ? checks : checks[0]; } diff --git a/src/upgrades/3.8.2/vote-visibility-config.js b/src/upgrades/3.8.2/vote-visibility-config.js new file mode 100644 index 0000000000..e39b8738fa --- /dev/null +++ b/src/upgrades/3.8.2/vote-visibility-config.js @@ -0,0 +1,16 @@ +/* eslint-disable no-await-in-loop */ + +'use strict'; + +const db = require('../../database'); + +module.exports = { + name: 'Add vote visibility config field', + timestamp: Date.UTC(2024, 4, 24), + method: async function () { + const current = await db.getObjectField('config', 'votesArePublic'); + const isPublic = parseInt(current, 10) === 1; + await db.setObjectField('config', 'voteVisibility', isPublic ? 'all' : 'privileged'); + await db.deleteObjectField('config', 'votesArePublic'); + }, +}; diff --git a/src/views/admin/settings/reputation.tpl b/src/views/admin/settings/reputation.tpl index 1786596c30..b086439498 100644 --- a/src/views/admin/settings/reputation.tpl +++ b/src/views/admin/settings/reputation.tpl @@ -14,9 +14,13 @@ -
- - +
+ +
From c8429d8bb036f01449001990eec0fcf6d655caac Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sat, 25 May 2024 09:18:41 +0000 Subject: [PATCH 07/18] Latest translations and fallbacks --- public/language/fa-IR/admin/dashboard.json | 68 +++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/public/language/fa-IR/admin/dashboard.json b/public/language/fa-IR/admin/dashboard.json index 86b668d99a..77ff6d56e8 100644 --- a/public/language/fa-IR/admin/dashboard.json +++ b/public/language/fa-IR/admin/dashboard.json @@ -25,19 +25,19 @@ "updates": "بروزرسانی‌ها", "running-version": "شما در حال اجراء NodeBB v 1% هستید.", - "keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.", - "up-to-date": "You are up-to-date ", - "upgrade-available": "A new version (v%1) has been released. Consider upgrading your NodeBB.", - "prerelease-upgrade-available": "This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider upgrading your NodeBB.", - "prerelease-warning": "This is a pre-release version of NodeBB. Unintended bugs may occur. ", - "fallback-emailer-not-found": "Fallback emailer not found!", - "running-in-development": "Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator", - "latest-lookup-failed": "Failed to look up latest available version of NodeBB", + "keep-updated": "برای آخرین وصله های امنیتی و رفع باگ ها همیشه مطمئن شوید که NodeBB شما به روز است.", + "up-to-date": "شما بروز هستید", + "upgrade-available": "نسخه جدید (v%1) منتشر شده است. ارتقا NodeBB خود را در نظر بگیرید.", + "prerelease-upgrade-available": "این یک نسخه پیش از انتشار قدیمی NodeBB است. نسخه جدید (v%1) منتشر شده است. ارتقا NodeBB خود را در نظر بگیرید. ", + "prerelease-warning": "این یک نسخه پیش از انتشار NodeBB است. ممکن است اشکالات ناخواسته رخ دهد.", + "fallback-emailer-not-found": "ایمیل بازگشتی پیدا نشد!", + "running-in-development": "انجمن در حالت توسعه (development mode) در حال اجرا است. انجمن ممکن است برای اسیب پذیری های بالقوه باز باشد؛ لطفا با مدیر سیستم خود تماس بگیرید", + "latest-lookup-failed": "جستجو در اخرین نسخه موجود NodeBB شکست خورد", - "notices": "Notices", - "restart-not-required": "Restart not required", - "restart-required": "Restart required", - "search-plugin-installed": "Search Plugin installed", + "notices": "اطلاعیه ها", + "restart-not-required": "راه اندازی مجدد لازم نیست", + "restart-required": "راه‌اندازی مجدد لازم است", + "search-plugin-installed": "افزونه جستجو نصب شد", "search-plugin-not-installed": "Search Plugin not installed", "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", @@ -74,28 +74,28 @@ "graphs.page-views": "Page Views", "graphs.page-views-registered": "Page Views Registered", "graphs.page-views-guest": "Page Views Guest", - "graphs.page-views-bot": "Page Views Bot", - "graphs.unique-visitors": "Unique Visitors", - "graphs.registered-users": "Registered Users", - "graphs.guest-users": "Guest Users", - "last-restarted-by": "Last restarted by", - "no-users-browsing": "No users browsing", + "graphs.page-views-bot": "ربات بازدید از صفحه", + "graphs.unique-visitors": "بازدیدکنندگان منحصر به فرد", + "graphs.registered-users": "کاربران ثبت نام شده", + "graphs.guest-users": "کاربران مهمان", + "last-restarted-by": "آخرین راه‌اندازی توسط", + "no-users-browsing": "هیچ کاربری در حال مرور نیست", - "back-to-dashboard": "Back to Dashboard", - "details.no-users": "No users have joined within the selected timeframe", - "details.no-topics": "No topics have been posted within the selected timeframe", - "details.no-searches": "No searches have been made within the selected timeframe", - "details.no-logins": "No logins have been recorded within the selected timeframe", - "details.logins-static": "NodeBB only saves session data for %1 days, and so this table below will only show the most recently active sessions", - "details.logins-login-time": "Login Time", - "start": "Start", - "end": "End", - "filter": "Filter", - "view-as-json": "View as JSON", + "back-to-dashboard": "بازگشت به پیش‌خوان", + "details.no-users": "هیچ کاربر جدیدی در بازه زمانی انتخابی عضو نشده است", + "details.no-topics": "هیچ موضوعی در بازه زمانی انتخاب شده ارسال نشده است", + "details.no-searches": "هیچ جستجویی در بازه زمانی انتخاب شده انجام نشده است", + "details.no-logins": "هیچ ورودی در بازه زمانی انتخاب شده ثبت نشده است", + "details.logins-static": "NodeBB فقط داده‌های جلسه را برای %1 روز ذخیره می‌کند، بنابراین این جدول زیر فقط آخرین جلسات فعال را نشان می‌دهد", + "details.logins-login-time": "زمان ورود", + "start": "شروع", + "end": "پایان", + "filter": "فیلتر کردن", + "view-as-json": "نمایش با JSON", "expand-analytics": "Expand analytics", - "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?", - "search-term": "Term", - "search-count": "Count", - "view-all": "View all" + "clear-search-history": "پاک کردن تاریخچه‌ی جستوجو", + "clear-search-history-confirm": "آیا مطمئن هستید که می خواهید کل سابقه جستجو را پاک کنید؟", + "search-term": "مدت", + "search-count": "تعداد", + "view-all": "نمایش همه" } From 29dbe92d6efdf946f42dcae9f015c0d170ec792b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 25 May 2024 12:28:39 -0400 Subject: [PATCH 08/18] feat: show ignored/watched topics in topic list, closes #10974 --- install/package.json | 4 ++-- public/openapi/components/schemas/TopicObject.yaml | 2 ++ public/openapi/read/unread.yaml | 2 ++ src/topics/index.js | 9 +++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/install/package.json b/install/package.json index 926c7532e3..fcfa3e1668 100644 --- a/install/package.json +++ b/install/package.json @@ -103,10 +103,10 @@ "nodebb-plugin-ntfy": "1.7.4", "nodebb-plugin-spam-be-gone": "2.2.2", "nodebb-rewards-essentials": "1.0.0", - "nodebb-theme-harmony": "1.2.56", + "nodebb-theme-harmony": "1.2.57", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.5", - "nodebb-theme-persona": "13.3.19", + "nodebb-theme-persona": "13.3.20", "nodebb-widget-essentials": "7.0.16", "nodemailer": "6.9.13", "nprogress": "0.2.0", diff --git a/public/openapi/components/schemas/TopicObject.yaml b/public/openapi/components/schemas/TopicObject.yaml index ad337379f7..ee34558ffc 100644 --- a/public/openapi/components/schemas/TopicObject.yaml +++ b/public/openapi/components/schemas/TopicObject.yaml @@ -156,6 +156,8 @@ TopicObject: type: boolean ignored: type: boolean + followed: + type: boolean unread: type: boolean bookmark: diff --git a/public/openapi/read/unread.yaml b/public/openapi/read/unread.yaml index e63242729c..307a85b3b6 100644 --- a/public/openapi/read/unread.yaml +++ b/public/openapi/read/unread.yaml @@ -176,6 +176,8 @@ get: type: boolean ignored: type: boolean + followed: + type: boolean unread: type: boolean bookmark: diff --git a/src/topics/index.js b/src/topics/index.js index 3d313d08e6..59e731affe 100644 --- a/src/topics/index.js +++ b/src/topics/index.js @@ -116,10 +116,10 @@ Topics.getTopicsByTids = async function (tids, options) { }; } - const [result, hasRead, isIgnored, bookmarks, callerSettings] = await Promise.all([ + const [result, hasRead, followData, bookmarks, callerSettings] = await Promise.all([ loadTopics(), Topics.hasReadTopics(tids, uid), - Topics.isIgnoring(tids, uid), + Topics.getFollowData(tids, uid), Topics.getUserBookmarks(tids, uid), user.getSettings(uid), ]); @@ -136,8 +136,9 @@ Topics.getTopicsByTids = async function (tids, options) { } topic.teaser = result.teasers[i] || null; topic.isOwner = topic.uid === parseInt(uid, 10); - topic.ignored = isIgnored[i]; - topic.unread = parseInt(uid, 10) <= 0 || (!hasRead[i] && !isIgnored[i]); + topic.ignored = followData[i].ignoring; + topic.followed = followData[i].following; + topic.unread = parseInt(uid, 10) <= 0 || (!hasRead[i] && !topic.ignored[i]); topic.bookmark = bookmarks[i] && (sortNewToOld ? Math.max(1, topic.postcount + 2 - bookmarks[i]) : Math.min(topic.postcount, bookmarks[i] + 1)); From 1bb472803aa390ee00d9a28c16f82374ff68a4e8 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sat, 25 May 2024 16:29:17 +0000 Subject: [PATCH 09/18] chore(i18n): fallback strings for new resources: nodebb.admin-settings-reputation --- public/language/ar/admin/settings/reputation.json | 5 ++++- public/language/bg/admin/settings/reputation.json | 5 ++++- public/language/bn/admin/settings/reputation.json | 5 ++++- public/language/cs/admin/settings/reputation.json | 5 ++++- public/language/da/admin/settings/reputation.json | 5 ++++- public/language/de/admin/settings/reputation.json | 5 ++++- public/language/el/admin/settings/reputation.json | 5 ++++- public/language/en-US/admin/settings/reputation.json | 5 ++++- public/language/en-x-pirate/admin/settings/reputation.json | 5 ++++- public/language/es/admin/settings/reputation.json | 5 ++++- public/language/et/admin/settings/reputation.json | 5 ++++- public/language/fa-IR/admin/settings/reputation.json | 5 ++++- public/language/fi/admin/settings/reputation.json | 5 ++++- public/language/fr/admin/settings/reputation.json | 5 ++++- public/language/gl/admin/settings/reputation.json | 5 ++++- public/language/he/admin/settings/reputation.json | 5 ++++- public/language/hr/admin/settings/reputation.json | 5 ++++- public/language/hu/admin/settings/reputation.json | 5 ++++- public/language/hy/admin/settings/reputation.json | 5 ++++- public/language/id/admin/settings/reputation.json | 5 ++++- public/language/it/admin/settings/reputation.json | 5 ++++- public/language/ja/admin/settings/reputation.json | 5 ++++- public/language/ko/admin/settings/reputation.json | 5 ++++- public/language/lt/admin/settings/reputation.json | 5 ++++- public/language/lv/admin/settings/reputation.json | 5 ++++- public/language/ms/admin/settings/reputation.json | 5 ++++- public/language/nb/admin/settings/reputation.json | 5 ++++- public/language/nl/admin/settings/reputation.json | 5 ++++- public/language/pl/admin/settings/reputation.json | 5 ++++- public/language/pt-BR/admin/settings/reputation.json | 5 ++++- public/language/pt-PT/admin/settings/reputation.json | 5 ++++- public/language/ro/admin/settings/reputation.json | 5 ++++- public/language/ru/admin/settings/reputation.json | 5 ++++- public/language/rw/admin/settings/reputation.json | 5 ++++- public/language/sc/admin/settings/reputation.json | 5 ++++- public/language/sk/admin/settings/reputation.json | 5 ++++- public/language/sl/admin/settings/reputation.json | 5 ++++- public/language/sq-AL/admin/settings/reputation.json | 5 ++++- public/language/sr/admin/settings/reputation.json | 5 ++++- public/language/sv/admin/settings/reputation.json | 5 ++++- public/language/th/admin/settings/reputation.json | 5 ++++- public/language/tr/admin/settings/reputation.json | 5 ++++- public/language/uk/admin/settings/reputation.json | 5 ++++- public/language/vi/admin/settings/reputation.json | 5 ++++- public/language/zh-CN/admin/settings/reputation.json | 5 ++++- public/language/zh-TW/admin/settings/reputation.json | 5 ++++- 46 files changed, 184 insertions(+), 46 deletions(-) diff --git a/public/language/ar/admin/settings/reputation.json b/public/language/ar/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/ar/admin/settings/reputation.json +++ b/public/language/ar/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/bg/admin/settings/reputation.json b/public/language/bg/admin/settings/reputation.json index 7a288c6f04..89f89f0f4a 100644 --- a/public/language/bg/admin/settings/reputation.json +++ b/public/language/bg/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Настройки за репутацията", "disable": "Изключване на системата за репутация", "disable-down-voting": "Забрана на отрицателното гласуване", - "votes-are-public": "Всички гласувания са публични", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Ограничения на дейността", "min-rep-upvote": "Минимална репутация, необходима за положително гласуване за публикации", "upvotes-per-day": "Положителни гласувания за ден (задайте 0 за неограничен брой)", diff --git a/public/language/bn/admin/settings/reputation.json b/public/language/bn/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/bn/admin/settings/reputation.json +++ b/public/language/bn/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/cs/admin/settings/reputation.json b/public/language/cs/admin/settings/reputation.json index c982a8ac2b..6b49cbed58 100644 --- a/public/language/cs/admin/settings/reputation.json +++ b/public/language/cs/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Nastavení reputace", "disable": "Zakázat systém reputace", "disable-down-voting": "Zakázat hlasování", - "votes-are-public": "Všechna hlasování jsou veřejná", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Omezení aktivity", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/da/admin/settings/reputation.json b/public/language/da/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/da/admin/settings/reputation.json +++ b/public/language/da/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/de/admin/settings/reputation.json b/public/language/de/admin/settings/reputation.json index 96c048a963..92445caca7 100644 --- a/public/language/de/admin/settings/reputation.json +++ b/public/language/de/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Ansehenseinstellungen", "disable": "Ansehenssystem deaktivieren", "disable-down-voting": "Negative Bewertungen deaktivieren", - "votes-are-public": "Alle Bewertungen sind öffentlich", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Aktivitätsschwelle", "min-rep-upvote": "Mindestreputation, um Beiträge hochzustimmen", "upvotes-per-day": "Upvotes pro Tag (für unbegrenzte Upvotes auf 0 setzen)", diff --git a/public/language/el/admin/settings/reputation.json b/public/language/el/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/el/admin/settings/reputation.json +++ b/public/language/el/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/en-US/admin/settings/reputation.json b/public/language/en-US/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/en-US/admin/settings/reputation.json +++ b/public/language/en-US/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/en-x-pirate/admin/settings/reputation.json b/public/language/en-x-pirate/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/en-x-pirate/admin/settings/reputation.json +++ b/public/language/en-x-pirate/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/es/admin/settings/reputation.json b/public/language/es/admin/settings/reputation.json index f327695a35..beff56b36d 100644 --- a/public/language/es/admin/settings/reputation.json +++ b/public/language/es/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Configuración de Reputación", "disable": "Desactivar Sistema de Reputación", "disable-down-voting": "Desactivar Votos Negativos", - "votes-are-public": "Todos los Votos son Públicos", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Umbrales de Actividad", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/et/admin/settings/reputation.json b/public/language/et/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/et/admin/settings/reputation.json +++ b/public/language/et/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/fa-IR/admin/settings/reputation.json b/public/language/fa-IR/admin/settings/reputation.json index 7e6aabd62d..45977c8b6d 100644 --- a/public/language/fa-IR/admin/settings/reputation.json +++ b/public/language/fa-IR/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/fi/admin/settings/reputation.json b/public/language/fi/admin/settings/reputation.json index d419597bee..73edfd4a29 100644 --- a/public/language/fi/admin/settings/reputation.json +++ b/public/language/fi/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/fr/admin/settings/reputation.json b/public/language/fr/admin/settings/reputation.json index 876c9a48e7..ff9950d65c 100644 --- a/public/language/fr/admin/settings/reputation.json +++ b/public/language/fr/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Paramètres de réputation", "disable": "Désactiver le système de réputation", "disable-down-voting": "Désactiver les votes négatifs", - "votes-are-public": "Tous les votes sont publics", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Seuils d'activité", "min-rep-upvote": "Réputation minimale pour voter pour les publications", "upvotes-per-day": "Votes positifs par jour (0 = illimité)", diff --git a/public/language/gl/admin/settings/reputation.json b/public/language/gl/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/gl/admin/settings/reputation.json +++ b/public/language/gl/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/he/admin/settings/reputation.json b/public/language/he/admin/settings/reputation.json index f103a053ea..f908ba562f 100644 --- a/public/language/he/admin/settings/reputation.json +++ b/public/language/he/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "הגדרות מוניטין", "disable": "השבת מערכת המוניטין", "disable-down-voting": "השבת דיסלייק", - "votes-are-public": "כל ההצבעות פומביות", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "סף פעילות", "min-rep-upvote": "מוניטין מינימלי כדי להצביע בעד", "upvotes-per-day": "כמה פעמים ביום משתמש יוכל להצביע למעלה (הגדר ל-0 כדי לאפשר ללא הגבלה)", diff --git a/public/language/hr/admin/settings/reputation.json b/public/language/hr/admin/settings/reputation.json index 5802ad12cb..7d3d2f7dd3 100644 --- a/public/language/hr/admin/settings/reputation.json +++ b/public/language/hr/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Postavke reputacije", "disable": "Onemogući reputacije", "disable-down-voting": "Onemogući oduzimanje glasova", - "votes-are-public": "Svi glasovi su javni", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Prag aktivnosti", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/hu/admin/settings/reputation.json b/public/language/hu/admin/settings/reputation.json index d98443850e..1c4d5808ef 100644 --- a/public/language/hu/admin/settings/reputation.json +++ b/public/language/hu/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Hírnév beállítások", "disable": "Hírnév rendszer kikapcsolása", "disable-down-voting": "Leszavazás kikapcsolása", - "votes-are-public": "Minden szavazat nyilvános", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Aktivitás küszöb értékek", "min-rep-upvote": "Minimális hírnév a hozzászólások pozitív szavazásához", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/hy/admin/settings/reputation.json b/public/language/hy/admin/settings/reputation.json index e11aaccc65..d173846c35 100644 --- a/public/language/hy/admin/settings/reputation.json +++ b/public/language/hy/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Վարկանիշի կարգավորումներ", "disable": "Անջատել վարկանիշի համակարգը", "disable-down-voting": "Անջատել Down Voting-ը", - "votes-are-public": "Բոլոր ձայները հրապարակային են", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Անջատել վարկանիշի համակարգը", "min-rep-upvote": "Նվազագույն հեղինակություն դրական քվեարկության համար", "upvotes-per-day": "Օրական կողմ ձայներ (սահմանված է 0 անսահմանափակ կողմ ձայների համար)", diff --git a/public/language/id/admin/settings/reputation.json b/public/language/id/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/id/admin/settings/reputation.json +++ b/public/language/id/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/it/admin/settings/reputation.json b/public/language/it/admin/settings/reputation.json index f84ec4ee04..240f7f7523 100644 --- a/public/language/it/admin/settings/reputation.json +++ b/public/language/it/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Impostazioni reputazione", "disable": "Disabilita sistema reputazione", "disable-down-voting": "Disabilita voto negativo", - "votes-are-public": "Tutti i voti sono pubblici", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Soglie di attività", "min-rep-upvote": "Reputazione minima per votare positivamente i post", "upvotes-per-day": "Voti positivi al giorno (impostare a 0 per i voti positivi illimitati)", diff --git a/public/language/ja/admin/settings/reputation.json b/public/language/ja/admin/settings/reputation.json index 2ae070ba58..e5d5ed9c70 100644 --- a/public/language/ja/admin/settings/reputation.json +++ b/public/language/ja/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "評価の設定", "disable": "レピュテーションシステムを無効にする", "disable-down-voting": "低評価を無効にする", - "votes-are-public": "すべての投票は公開されています", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "アクティビティのしきい値", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ko/admin/settings/reputation.json b/public/language/ko/admin/settings/reputation.json index 43bb0328db..2c759910a5 100644 --- a/public/language/ko/admin/settings/reputation.json +++ b/public/language/ko/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "평판 설정", "disable": "평판 시스템 비활성화", "disable-down-voting": "비추천 비활성화", - "votes-are-public": "모든 투표 공개", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "활동 임계값", "min-rep-upvote": "게시물을 추천할 수 있는 최소 평판", "upvotes-per-day": "하루에 가능한 추천 횟수 (무제한 추천을 위해 0으로 설정)", diff --git a/public/language/lt/admin/settings/reputation.json b/public/language/lt/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/lt/admin/settings/reputation.json +++ b/public/language/lt/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/lv/admin/settings/reputation.json b/public/language/lv/admin/settings/reputation.json index 6df67ebd1c..057379b418 100644 --- a/public/language/lv/admin/settings/reputation.json +++ b/public/language/lv/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Ranga punktu sistēma", "disable": "Atspējot ranga punktu sistēmu", "disable-down-voting": "Atspējot balsošanu \"pret\"", - "votes-are-public": "Visi balsojumi ir publiski", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Aktivitātes sliekšņi", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ms/admin/settings/reputation.json b/public/language/ms/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/ms/admin/settings/reputation.json +++ b/public/language/ms/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/nb/admin/settings/reputation.json b/public/language/nb/admin/settings/reputation.json index c17d74f8ed..cd2eb4a00c 100644 --- a/public/language/nb/admin/settings/reputation.json +++ b/public/language/nb/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Omdømmeinnstillinger", "disable": "Skru av omdømmesystem", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum omdømme for å stemme opp innlegg", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/nl/admin/settings/reputation.json b/public/language/nl/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/nl/admin/settings/reputation.json +++ b/public/language/nl/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/pl/admin/settings/reputation.json b/public/language/pl/admin/settings/reputation.json index ecec40614b..1966ad3aa1 100644 --- a/public/language/pl/admin/settings/reputation.json +++ b/public/language/pl/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Ustawienia reputacji", "disable": "Wyłącz system reputacji", "disable-down-voting": "Wyłącz system głosów przeciw", - "votes-are-public": "Wszystkie głosy są publiczne", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Progi aktywności", "min-rep-upvote": "Minimalna reputacja pozwalająca głosować za postami", "upvotes-per-day": "Limit głosów za na dzień (ustaw 0 by były nielimitowane)", diff --git a/public/language/pt-BR/admin/settings/reputation.json b/public/language/pt-BR/admin/settings/reputation.json index 0b59ee90a0..8c770993ae 100644 --- a/public/language/pt-BR/admin/settings/reputation.json +++ b/public/language/pt-BR/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Configurações de Reputação", "disable": "Desabilitar o Sistema de Reputação", "disable-down-voting": "Desativar a Negativação", - "votes-are-public": "Todos os Votos São Públicos", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Limites às atividades", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/pt-PT/admin/settings/reputation.json b/public/language/pt-PT/admin/settings/reputation.json index c417c4a61d..f3764be19a 100644 --- a/public/language/pt-PT/admin/settings/reputation.json +++ b/public/language/pt-PT/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Definições de Reputação", "disable": "Desativar Sistema de Reputação", "disable-down-voting": "Desativar Votos Negativos", - "votes-are-public": "Todos os Votos São Públicos", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Limites de Atividade", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ro/admin/settings/reputation.json b/public/language/ro/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/ro/admin/settings/reputation.json +++ b/public/language/ro/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ru/admin/settings/reputation.json b/public/language/ru/admin/settings/reputation.json index 01fced0def..8d8be9a4f0 100644 --- a/public/language/ru/admin/settings/reputation.json +++ b/public/language/ru/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Настройка системы репутации", "disable": "Выключить отслеживание репутации", "disable-down-voting": "Отключить понижение рейтинга", - "votes-are-public": "Все голоса общедоступны", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Пороговые значения", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/rw/admin/settings/reputation.json b/public/language/rw/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/rw/admin/settings/reputation.json +++ b/public/language/rw/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sc/admin/settings/reputation.json b/public/language/sc/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/sc/admin/settings/reputation.json +++ b/public/language/sc/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sk/admin/settings/reputation.json b/public/language/sk/admin/settings/reputation.json index 69ef3fad85..ae3dd814e9 100644 --- a/public/language/sk/admin/settings/reputation.json +++ b/public/language/sk/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Nastavenie reputácie", "disable": "Zakázať systém reputácie", "disable-down-voting": "Zakázať hlasovanie", - "votes-are-public": "Všetky hlasovania sú verejné", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Obmedzenie aktivity", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sl/admin/settings/reputation.json b/public/language/sl/admin/settings/reputation.json index fff75edb9f..d93c70e104 100644 --- a/public/language/sl/admin/settings/reputation.json +++ b/public/language/sl/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Nastavitve ugleda", "disable": "Onemogoči sistem ugleda", "disable-down-voting": "Onemogoči glasovanje proti", - "votes-are-public": "Vsi glasovi so javni", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sq-AL/admin/settings/reputation.json b/public/language/sq-AL/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/sq-AL/admin/settings/reputation.json +++ b/public/language/sq-AL/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sr/admin/settings/reputation.json b/public/language/sr/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/sr/admin/settings/reputation.json +++ b/public/language/sr/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sv/admin/settings/reputation.json b/public/language/sv/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/sv/admin/settings/reputation.json +++ b/public/language/sv/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/th/admin/settings/reputation.json b/public/language/th/admin/settings/reputation.json index e4fff22620..a78d0e3fd5 100644 --- a/public/language/th/admin/settings/reputation.json +++ b/public/language/th/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/tr/admin/settings/reputation.json b/public/language/tr/admin/settings/reputation.json index 850e692e36..670be283c9 100644 --- a/public/language/tr/admin/settings/reputation.json +++ b/public/language/tr/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "İtibar Ayarları", "disable": "İtibar Sistemini Devre Dışı Bırak", "disable-down-voting": "Eksi Oyu Devre Dışı Bırak", - "votes-are-public": "Tüm Oylar Herkese Açık", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Etkinlik Eşikleri", "min-rep-upvote": "Artılanan iletiler için gereken minimum itibar", "upvotes-per-day": "Artı oy günlük limiti (sınırsız artı oy için 0 giriniz)", diff --git a/public/language/uk/admin/settings/reputation.json b/public/language/uk/admin/settings/reputation.json index b0da969c93..e8cd341914 100644 --- a/public/language/uk/admin/settings/reputation.json +++ b/public/language/uk/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Налаштування репутації", "disable": "Вимкнути систему репутації", "disable-down-voting": "Вимкнути голосування проти", - "votes-are-public": "Всі голоси публічні", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Допуски активності", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/vi/admin/settings/reputation.json b/public/language/vi/admin/settings/reputation.json index 12b29ddcf7..d9ea9ad7be 100644 --- a/public/language/vi/admin/settings/reputation.json +++ b/public/language/vi/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "Cài Đặt Đánh Giá Uy Tín", "disable": "Tắt Hệ Thống Đánh Giá Uy Tín", "disable-down-voting": "Tắt Phản Đối", - "votes-are-public": "Tất Cả Bình Chọn Là Công Khai", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "Ngưỡng hoạt động", "min-rep-upvote": "Uy tín tối thiểu để ủng hộ bài đăng", "upvotes-per-day": "Số phiếu ủng hộ mỗi ngày (đặt thành 0 để có số phiếu ủng hộ không giới hạn)", diff --git a/public/language/zh-CN/admin/settings/reputation.json b/public/language/zh-CN/admin/settings/reputation.json index 6bbf2f50ce..1b0cd612ea 100644 --- a/public/language/zh-CN/admin/settings/reputation.json +++ b/public/language/zh-CN/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "声望设置", "disable": "禁用声望系统", "disable-down-voting": "禁用 踩", - "votes-are-public": "公开所有投票", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "操作限制", "min-rep-upvote": "顶帖子 需要的最低声望", "upvotes-per-day": "每天顶的次数（设置为0则表示无限制）", diff --git a/public/language/zh-TW/admin/settings/reputation.json b/public/language/zh-TW/admin/settings/reputation.json index 09a78a7428..5950909a11 100644 --- a/public/language/zh-TW/admin/settings/reputation.json +++ b/public/language/zh-TW/admin/settings/reputation.json @@ -2,7 +2,10 @@ "reputation": "聲望設定", "disable": "停用 聲望系統", "disable-down-voting": "停用 倒讚", - "votes-are-public": "公開所有讚", + "vote-visibility": "Vote visibility", + "vote-visibility-all": "Everyone can see votes", + "vote-visibility-loggedin": "Only logged in users can see votes", + "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", "thresholds": "操作限制", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", From 7969e62d061faa1488a1bcbfdb187e586f1d6fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 25 May 2024 12:36:04 -0400 Subject: [PATCH 10/18] fix: wrong var for ignored --- src/topics/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/topics/index.js b/src/topics/index.js index 59e731affe..5724d8a276 100644 --- a/src/topics/index.js +++ b/src/topics/index.js @@ -138,7 +138,7 @@ Topics.getTopicsByTids = async function (tids, options) { topic.isOwner = topic.uid === parseInt(uid, 10); topic.ignored = followData[i].ignoring; topic.followed = followData[i].following; - topic.unread = parseInt(uid, 10) <= 0 || (!hasRead[i] && !topic.ignored[i]); + topic.unread = parseInt(uid, 10) <= 0 || (!hasRead[i] && !topic.ignored); topic.bookmark = bookmarks[i] && (sortNewToOld ? Math.max(1, topic.postcount + 2 - bookmarks[i]) : Math.min(topic.postcount, bookmarks[i] + 1)); From 97952467c073f13ab4dcb84bfda1d67c696aaa9f Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Mon, 27 May 2024 09:19:18 +0000 Subject: [PATCH 11/18] Latest translations and fallbacks --- .../bg/admin/settings/reputation.json | 8 +-- public/language/th/admin/manage/users.json | 44 ++++++------ .../language/th/admin/settings/homepage.json | 2 +- .../th/admin/settings/reputation.json | 72 +++++++++---------- .../language/th/admin/settings/sockets.json | 6 +- public/language/th/admin/settings/tags.json | 20 +++--- 6 files changed, 76 insertions(+), 76 deletions(-) diff --git a/public/language/bg/admin/settings/reputation.json b/public/language/bg/admin/settings/reputation.json index 89f89f0f4a..a79a14fdd8 100644 --- a/public/language/bg/admin/settings/reputation.json +++ b/public/language/bg/admin/settings/reputation.json @@ -2,10 +2,10 @@ "reputation": "Настройки за репутацията", "disable": "Изключване на системата за репутация", "disable-down-voting": "Забрана на отрицателното гласуване", - "vote-visibility": "Vote visibility", - "vote-visibility-all": "Everyone can see votes", - "vote-visibility-loggedin": "Only logged in users can see votes", - "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", + "vote-visibility": "Видимост на подадените гласове", + "vote-visibility-all": "Всички могат да виждат подадените гласове", + "vote-visibility-loggedin": "Само вписаните потребители могат да виждат подадените гласове", + "vote-visibility-privileged": "Само потребителите с по-високи правомощия (като администратори и модератори) могат да виждат подадените гласове", "thresholds": "Ограничения на дейността", "min-rep-upvote": "Минимална репутация, необходима за положително гласуване за публикации", "upvotes-per-day": "Положителни гласувания за ден (задайте 0 за неограничен брой)", diff --git a/public/language/th/admin/manage/users.json b/public/language/th/admin/manage/users.json index 482fc0148f..d876b10871 100644 --- a/public/language/th/admin/manage/users.json +++ b/public/language/th/admin/manage/users.json @@ -2,8 +2,8 @@ "manage-users": "Manage Users", "users": "ผู้ใช้", "edit": "จัดการ", - "make-admin": "ทำให้เป็นแอดมิน", - "remove-admin": "ยกเลิกการเป็นแอดมิน", + "make-admin": "ทำให้เป็นผู้ดูแลระบบ", + "remove-admin": "ยกเลิกการเป็นผู้ดูแลระบบ", "change-email": "เปลี่ยนอีเมล", "new-email": "เพิ่มอีเมลใหม่", "validate-email": "ยืนยันอีเมล", @@ -90,25 +90,25 @@ "alerts.flag-reset-success": "ยกเลิกรายงานแล้ว!", "alerts.no-remove-yourself-admin": "คุณไม่สามารถที่จะยกเลิกตัวเองจากการเป็นผู้ดูแลระบบ", "alerts.make-admin-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแลระบบแล้ว", - "alerts.confirm-remove-admin": "คุณต้องการลบผู้ดูแลระบบคนนี้หรือไม่?", - "alerts.remove-admin-success": "ผู้ใช้ไม่ได้เป็นผู้ดูแลอีกต่อไป", - "alerts.make-global-mod-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแลระดับโลกแล้ว", - "alerts.confirm-remove-global-mod": "คุณต้องการลบผู้ดูแลทั่วโลกนี้หรือไม่?", - "alerts.remove-global-mod-success": "ผู้ใช้ไม่เป็นผู้ดูแลระดับโลกอีกแล้ว", - "alerts.make-moderator-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแล", - "alerts.confirm-remove-moderator": "คุณต้องการนำผู้ดูแลนี้ออกหรือไม่?", - "alerts.remove-moderator-success": "ผู้ใช้ไม่ได้เป็นผู้ดูแลอีกต่อไป", + "alerts.confirm-remove-admin": "คุณต้องการปลดผู้ดูแลระบบคนนี้หรือไม่?", + "alerts.remove-admin-success": "ผู้ใช้ไม่ได้เป็นผู้ดูแลระบบอีกต่อไป", + "alerts.make-global-mod-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแลบอร์ดรวมแล้ว", + "alerts.confirm-remove-global-mod": "คุณต้องการปลดผู้ดูแลบอร์ดรวมนี้หรือไม่?", + "alerts.remove-global-mod-success": "ผู้ใช้ไม่เป็นผู้ดูแลบอร์ดรวมอีกแล้ว", + "alerts.make-moderator-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแลบอร์ดแล้ว", + "alerts.confirm-remove-moderator": "คุณต้องการปลดผู้ดูแลบอร์ดนี้ออกหรือไม่?", + "alerts.remove-moderator-success": "ผู้ใช้ไม่ได้เป็นผู้ดูแลบอร์ดอีกต่อไป", "alerts.confirm-validate-email": "คุณต้องการที่ยืนยันอีเมลของผู้ใช้เหล่านี้หรือไม่?", "alerts.confirm-force-password-reset": "คุณต้องการให้ผู้ใช้เหล่านี้ถูกรีเซ็ตรหัสผ่านและออกจากระบบหรือไม่?", "alerts.validate-email-success": "อีเมลที่ได้รับการยืนยัน", "alerts.validate-force-password-reset-success": "รหัสผ่านของผู้ใช้งานถูกรีเซ็ต และการเข้าระบบถูกถอดออก", "alerts.password-reset-confirm": "คุณต้องการที่จะส่งอีเมลการล้างค่ารหัสผ่านให้กับผู้ใช้เหล่านี้หรือไม่?", "alerts.password-reset-email-sent": "อีเมลรีเซ็ตรหัสผ่านถูกส่งแล้ว", - "alerts.confirm-delete": "Warning!

Do you really want to delete user(s)?

This action is not reversible! Only the user account will be deleted, their posts and topics will remain.

", - "alerts.delete-success": "ผู้ใช้งานโดนลบ!", - "alerts.confirm-delete-content": "Warning!

Do you really want to delete these user(s) content?

This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.

", - "alerts.delete-content-success": "User(s) Content Deleted!", - "alerts.confirm-purge": "Warning!

Do you really want to delete user(s) and their content?

This action is not reversible! All user data and content will be erased!

", + "alerts.confirm-delete": "คำเตือน!

คุณต้องการลบ ผู้ใช้งานหรือไม่?

คำสั่งนี้ไม่สามารถย้อนกลับได้! เฉพาะบัญชีผู้ใช้งานเท่านั้นที่จะถูกลบ โพสต์และกระทู้ของผู้ใช้งานจะยังคงอยู่

", + "alerts.delete-success": "ผู้ใช้งานถูกลบแล้ว!", + "alerts.confirm-delete-content": "คำเตือน!

คุณต้องการลบเนื้อหาของผู้ใช้งานหรือไม่?

คำสั่งนี้ไม่สามารถย้อนกลับได้! บัญชีผู้ใช้งานจะยังคงอยู่ แต่โพสต์และกระทู้ของผู้ใช้งานจะถูกลบ

", + "alerts.delete-content-success": "เนื้อหาของผู้ใช้งานถูกลบแล้ว!", + "alerts.confirm-purge": "คำเตือน!

คุณต้องการลบผู้ใช้งานและเนื้อหาหรือไม่?

คำสั่งนี้ไม่สามารถย้อนกลับได้! ข้อมูลผู้ใช้งานและเนื้อหาจะถูกลบทั้งหมด!

", "alerts.create": "สร้างผู้ใช้งาน", "alerts.button-create": "สร้าง", "alerts.button-cancel": "ยกเลิก", @@ -119,8 +119,8 @@ "alerts.prompt-email": "อีเมล: ", "alerts.email-sent-to": "อีเมลคำเชิญถูกส่งไปที่ %1", - "alerts.x-users-found": "%1 user(s) found, (%2 seconds)", - "alerts.select-a-single-user-to-change-email": "Select a single user to change email", + "alerts.x-users-found": "พบผู้ใช้งาน %1 ราย (ใช้เวลา %2 วินาที)", + "alerts.select-a-single-user-to-change-email": "เลือกผู้ใช้งานที่จะเปลี่ยนอีเมล", "export": "ส่งออกไฟล์", "export-users-fields-title": "เลือกฟิลด์สำหรับ CSV", "export-field-email": "อีเมล", @@ -143,9 +143,9 @@ "export-field-signature": "ลายเซ็น", "export-field-aboutme": "เกี่ยวกับฉัน", - "export-users-started": "Exporting users as csv, this might take a while. You will receive a notification when it is complete.", - "export-users-completed": "Users exported as csv, click here to download.", - "email": "Email", - "password": "Password", - "manage": "Manage" + "export-users-started": "กำลังส่งออกข้อมูลผู้ใช้งานเป็น CSV ซึ่งอาจใช้เวลาสักระยะ คุณจะได้รับการแจ้งเตือนเมื่อเสร็จแล้ว", + "export-users-completed": "ข้อมูลผู้ใช้งานถูกส่งออกเป็น CSV แล้ว คลิกที่นี่เพื่อดาวน์โหลด", + "email": "อีเมล", + "password": "รหัสผ่าน", + "manage": "จัดการ" } \ No newline at end of file diff --git a/public/language/th/admin/settings/homepage.json b/public/language/th/admin/settings/homepage.json index 48f9ebe23a..5a0b8eda6e 100644 --- a/public/language/th/admin/settings/homepage.json +++ b/public/language/th/admin/settings/homepage.json @@ -4,5 +4,5 @@ "home-page-route": "เส้นทางหน้าแรก", "custom-route": "เส้นทางที่กำหนดเอง", "allow-user-home-pages": "อนุญาตหน้าแรกของผู้ใช้", - "home-page-title": "Title ของหน้าแรก (ค่าเริ่มต้น \"Home\")" + "home-page-title": "ชื่อของหน้าแรก (ค่าเริ่มต้นคือ \"Home\")" } \ No newline at end of file diff --git a/public/language/th/admin/settings/reputation.json b/public/language/th/admin/settings/reputation.json index a78d0e3fd5..89eda61b9f 100644 --- a/public/language/th/admin/settings/reputation.json +++ b/public/language/th/admin/settings/reputation.json @@ -1,40 +1,40 @@ { "reputation": "Reputation Settings", - "disable": "Disable Reputation System", - "disable-down-voting": "Disable Down Voting", - "vote-visibility": "Vote visibility", - "vote-visibility-all": "Everyone can see votes", - "vote-visibility-loggedin": "Only logged in users can see votes", - "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", - "thresholds": "Activity Thresholds", - "min-rep-upvote": "Minimum reputation to upvote posts", - "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", - "upvotes-per-user-per-day": "Upvotes per user per day (set to 0 for unlimited upvotes)", - "min-rep-downvote": "Minimum reputation to downvote posts", - "downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)", - "downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)", - "min-rep-chat": "Minimum reputation to send chat messages", - "min-rep-post-links": "Minimum reputation to post links", - "min-rep-flag": "Minimum reputation to flag posts", - "min-rep-website": "Minimum reputation to add \"Website\" to user profile", - "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", - "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile", - "min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile", - "min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile", + "disable": "ปิดการใช้งานระบบชื่อเสียง", + "disable-down-voting": "ปิดการใช้งานการโหวดลง", + "vote-visibility": "การมองเห็นการโหวด", + "vote-visibility-all": "ทุกคนสามารถเห็นการโหวด", + "vote-visibility-loggedin": "เฉพาะผู้ที่เข้าสู่ระบบแล้วถึงมองเห็นการโหวด", + "vote-visibility-privileged": "เฉพาะผู้ที่มีสิทธิ์พิเศษเช่น ผู้ดูแลระบบ และ ผู้ดูแลบอร์ด สามารถเห็นการโหวด", + "thresholds": "เกณฑ์สำหรับการกระทำ", + "min-rep-upvote": "ชื่อเสียงขั้นต่ำที่สามารถโหวดโพสต์ขึ้นได้", + "upvotes-per-day": "จำนวนโหวดขึ้นต่อวัน (ตั้งค่าเป็น 0 ถ้าให้โหวดขึ้นได้ไม่จำกัดจำนวน)", + "upvotes-per-user-per-day": "จำนวนโหวดขึ้นต่อผู้ใช้งานต่อวัน (ตั้งค่าเป็น 0 ถ้าให้โหวดขึ้นได้ไม่จำกัดจำนวน)", + "min-rep-downvote": "ชื่อเสียงขั้นต่ำที่สามารถโหวดโพสต์ลงได้", + "downvotes-per-day": "จำนวนโหวดลงต่อวัน (ตั้งค่าเป็น 0 ถ้าให้โหวดลงได้ไม่จำกัดจำนวน)", + "downvotes-per-user-per-day": "จำนวนโหวดลงต่อผู้ใช้งานต่อวัน (ตั้งค่าเป็น 0 ถ้าให้โหวดลงได้ไม่จำกัดจำนวน)", + "min-rep-chat": "ชื่อเสียงขึ้นต่ำที่สามารถส่งข้อความแชทได้", + "min-rep-post-links": "ชื่อเสียงขึ้นต่ำที่สามารถโพสต์ลิงก์ได้", + "min-rep-flag": "ชื่อเสียงขึ้นต่ำที่สามารถรายงานโพสต์ได้", + "min-rep-website": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม เว็บไซต์ ลงในหน้าโปรไฟล์ผู้ใช้", + "min-rep-aboutme": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม ข้อมูลเกี่ยวกับฉัน ลงในหน้าโปรไฟล์ผู้ใช้", + "min-rep-signature": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม ลายเซ็น ลงในหน้าโปรไฟล์ผู้ใช้", + "min-rep-profile-picture": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม รูปภาพโปรไฟล์ ลงในหน้าโปรไฟล์ผู้ใช้", + "min-rep-cover-picture": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม รูปภาพปก ลงในหน้าโปรไฟล์ผู้ใช้", - "flags": "Flag Settings", - "flags.limit-per-target": "Maximum number of times something can be flagged", - "flags.limit-per-target-placeholder": "Default: 0", - "flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.", - "flags.limit-post-flags-per-day": "Maximum number of times a user can flag posts in a day", - "flags.limit-post-flags-per-day-help": "Set to 0 to disable, (default: 10)", - "flags.limit-user-flags-per-day": "Maximum number of times a user can flag users in a day", - "flags.limit-user-flags-per-day-help": "Set to 0 to disable, (default: 10)", - "flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts", - "flags.auto-flag-on-downvote-threshold-help": "Set to 0 to disable, (default: 0)", - "flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned", - "flags.action-on-resolve": "Do the following when a flag is resolved", - "flags.action-on-reject": "Do the following when a flag is rejected", - "flags.action.nothing": "Do nothing", - "flags.action.rescind": "Rescind the notification sent to moderators/administrators" + "flags": "การตั้งค่าการรายงาน", + "flags.limit-per-target": "จำนวนครั้งสูงสุดที่บางอย่างสามารถถูกรายงานได้", + "flags.limit-per-target-placeholder": "ค่าเริ่มต้น: 0", + "flags.limit-per-target-help": "เมื่อโพสต์หรือผู้ใช้งานถูกรายงานหลายครั้ง ทุกการรายงานเพิ่มเติมจะถูกนับเป็น "จำนวนรายงาน" ตั้งค่าตัวเลือกนี้เป็นตัวเลขอื่นนอกเหนือจาก 0 เพื่อจำกัดจำนวนรายงานที่สามารถได้รับ", + "flags.limit-post-flags-per-day": "จำนวนครั้งสูงสุดที่ผู้ใช้งานหนึ่งสามารถรายงานโพสต์ได้ใน 1 วัน", + "flags.limit-post-flags-per-day-help": "ตั้งค่าเป็น 0 ถ้าสามารถทำได้ไม่จำกัด (ค่าเริ่มต้น: 10)", + "flags.limit-user-flags-per-day": "จำนวนครั้งสูงสุดที่ผู้ใช้งานหนึ่งสามารถรายงานผู้ใช้งานอื่นได้ใน 1 วัน", + "flags.limit-user-flags-per-day-help": "ตั้งค่าเป็น 0 ถ้าสามารถทำได้ไม่จำกัด (ค่าเริ่มต้น: 10)", + "flags.auto-flag-on-downvote-threshold": "จำนวนการโหวดลงที่ทำให้ระบบรายงานโพสต์โดยอัตโนมัติทำงาน", + "flags.auto-flag-on-downvote-threshold-help": "ตั้งค่าเป็น 0 ถ้าสามารถทำได้ไม่จำกัด (ค่าเริ่มต้น: 10)", + "flags.auto-resolve-on-ban": "ถือว่ารายงานทั้งหมดของผู้ใช้งานถูกจัดการแล้วเมื่อผู้ใช้งานนั้นโดนแบน", + "flags.action-on-resolve": "เมื่อการรายงานถูกจัดการแล้ว ให้ทำดังต่อไปนี้", + "flags.action-on-reject": "เมื่อการรายงานถูกปฏิเสธ ให้ทำดังต่อไปนี้", + "flags.action.nothing": "ไม่ทำอะไร", + "flags.action.rescind": "ยกเลิกการแจ้งเตือน ผู้ดูแลบอร์ด และผู้ดูแลระบบ" } \ No newline at end of file diff --git a/public/language/th/admin/settings/sockets.json b/public/language/th/admin/settings/sockets.json index d04ee42fcf..0ad873891a 100644 --- a/public/language/th/admin/settings/sockets.json +++ b/public/language/th/admin/settings/sockets.json @@ -1,6 +1,6 @@ { "reconnection": "Reconnection Settings", - "max-attempts": "Max Reconnection Attempts", - "default-placeholder": "Default: %1", - "delay": "Reconnection Delay" + "max-attempts": "จำนวนการเชื่อมต่อใหม่สูงสุด", + "default-placeholder": "ค่าเริ่มต้น: %1", + "delay": "เวลาที่รอก่อนเชื่อมต่อใหม่" } \ No newline at end of file diff --git a/public/language/th/admin/settings/tags.json b/public/language/th/admin/settings/tags.json index c1cdb2b644..34b0620615 100644 --- a/public/language/th/admin/settings/tags.json +++ b/public/language/th/admin/settings/tags.json @@ -1,13 +1,13 @@ { "tag": "Tag Settings", - "link-to-manage": "Manage Tags", - "system-tags": "System Tags", - "system-tags-help": "Only privileged users will be able to use these tags.", - "tags-per-topic": "Tags per topic", - "min-per-topic": "Minimum Tags per Topic", - "max-per-topic": "Maximum Tags per Topic", - "min-length": "Minimum Tag Length", - "max-length": "Maximum Tag Length", - "related-topics": "Related Topics", - "max-related-topics": "Maximum related topics to display (if supported by theme)" + "link-to-manage": "จัดการแท็ก", + "system-tags": "แท็กของระบบ", + "system-tags-help": "เฉพาะผู้ที่มีสิทธิ์พิเศษถึงสามารถใช้แท็กเหล่านี้ได้", + "tags-per-topic": "จำนวนแท็กของกระทู้", + "min-per-topic": "จำนวนแท็กของกระทู้ขั้นต่ำ", + "max-per-topic": "จำนวนแท็กของกระทู้สูงสุด", + "min-length": "ความยาวแท็กขั้นต่ำ", + "max-length": "ความยาวแท็กสูงสุด", + "related-topics": "กระทู้ที่เกี่ยวข้อง", + "max-related-topics": "แสดงจำนวนกระทู้ที่เกี่ยวข้องมากสุด (ถ้าธีมรองรับ)" } \ No newline at end of file From 9ebd96e8308ca7ef35f9c02b62d0588b1f7b52b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 10:36:42 -0400 Subject: [PATCH 12/18] fix(deps): update dependency sitemap to v8 (#12595) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index baa886a2ed..2a6299bb54 100644 --- a/install/package.json +++ b/install/package.json @@ -128,7 +128,7 @@ "semver": "7.6.2", "serve-favicon": "2.5.0", "sharp": "0.32.6", - "sitemap": "7.1.1", + "sitemap": "8.0.0", "socket.io": "4.7.5", "socket.io-client": "4.7.5", "@socket.io/redis-adapter": "8.3.0", From 72a0fe9320aff298b20fa8ab8b667857c6ca8b88 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 10:37:44 -0400 Subject: [PATCH 13/18] fix(deps): update dependency nodebb-plugin-2factor to v7.5.2 (#12577) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 2a6299bb54..5f8b459ffe 100644 --- a/install/package.json +++ b/install/package.json @@ -93,7 +93,7 @@ "mousetrap": "1.6.5", "multiparty": "4.2.3", "nconf": "0.12.1", - "nodebb-plugin-2factor": "7.5.1", + "nodebb-plugin-2factor": "7.5.2", "nodebb-plugin-composer-default": "10.2.36", "nodebb-plugin-dbsearch": "6.2.3", "nodebb-plugin-emoji": "5.1.15", From 8f6ef987ff53fa3709edf84e14cc753c8e9f334e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 10:38:29 -0400 Subject: [PATCH 14/18] chore(deps): update postgres docker tag to v16.3 (#12576) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a80ffda67c..a011d8b635 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: - redis postgres: - image: postgres:16.1-alpine + image: postgres:16.3-alpine restart: unless-stopped environment: POSTGRES_USER: nodebb From 3f904986f4242192ba9c694cc683fe63819fdc19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 11:12:23 -0400 Subject: [PATCH 15/18] chore(deps): update dependency lint-staged to v15.2.5 (#12598) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5f8b459ffe..f5e7874bb8 100644 --- a/install/package.json +++ b/install/package.json @@ -164,7 +164,7 @@ "grunt-contrib-watch": "1.1.0", "husky": "8.0.3", "jsdom": "24.0.0", - "lint-staged": "15.2.4", + "lint-staged": "15.2.5", "mocha": "10.4.0", "mocha-lcov-reporter": "1.3.0", "mockdate": "3.0.5", From 5595a35ec6b9f7b638dc5fd230f189edb4cb75f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 11:12:32 -0400 Subject: [PATCH 16/18] fix(deps): update dependency ace-builds to v1.34.2 (#12599) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index f5e7874bb8..0e1a7a6312 100644 --- a/install/package.json +++ b/install/package.json @@ -34,7 +34,7 @@ "@fortawesome/fontawesome-free": "6.5.2", "@isaacs/ttlcache": "1.4.1", "@popperjs/core": "2.11.8", - "ace-builds": "1.34.1", + "ace-builds": "1.34.2", "archiver": "7.0.1", "async": "3.2.5", "autoprefixer": "10.4.19", From c1a6293fee877a23310461dd4482eed32f22ebc6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 11:36:21 -0400 Subject: [PATCH 17/18] fix(deps): update dependency esbuild to v0.21.4 (#12600) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 0e1a7a6312..b7c437ebe7 100644 --- a/install/package.json +++ b/install/package.json @@ -63,7 +63,7 @@ "csrf-sync": "4.0.3", "daemon": "1.1.0", "diff": "5.2.0", - "esbuild": "0.21.3", + "esbuild": "0.21.4", "express": "4.19.2", "express-session": "1.18.0", "express-useragent": "1.0.15", From 91e79c22371340c8c0ff03bbb45cc1bafe8f71bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 11:36:43 -0400 Subject: [PATCH 18/18] chore(deps): update dependency jsdom to v24.1.0 (#12601) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b7c437ebe7..2d284b1e41 100644 --- a/install/package.json +++ b/install/package.json @@ -163,7 +163,7 @@ "grunt": "1.6.1", "grunt-contrib-watch": "1.1.0", "husky": "8.0.3", - "jsdom": "24.0.0", + "jsdom": "24.1.0", "lint-staged": "15.2.5", "mocha": "10.4.0", "mocha-lcov-reporter": "1.3.0",