Merge remote-tracking branch 'origin/develop' into activitypub

.github/workflows/test.yaml

@@ -63,7 +63,7 @@ jobs:
           - 5432:5432
 
       redis:
-        image: 'redis:7.2.5'
+        image: 'redis:7.4.0'
         # Set health checks to wait until redis has started
         options: >-
           --health-cmd "redis-cli ping"

docker-compose-pgsql.yml

@@ -24,7 +24,7 @@ services:
       - postgres-data:/var/lib/postgresql/data
 
   redis:
-    image: redis:7.2.5-alpine
+    image: redis:7.4.0-alpine
     restart: unless-stopped
     command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
     # command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF

docker-compose-redis.yml

@@ -14,7 +14,7 @@ services:
       - ./install/docker/setup.json:/usr/src/app/setup.json
 
   redis:
-    image: redis:7.2.5-alpine
+    image: redis:7.4.0-alpine
     restart: unless-stopped
     command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
     # command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF

docker-compose.yml

@@ -26,7 +26,7 @@ services:
       - mongo-data:/data/db
       - ./install/docker/mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js
   redis:
-    image: redis:7.2.5-alpine
+    image: redis:7.4.0-alpine
     restart: unless-stopped
     command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
     # command: ['redis-server', '--save', '60', '1', '--loglevel', 'warning'] # uncomment if you want to use snapshotting instead of AOF

install/package.json

@@ -35,7 +35,7 @@
         "@isaacs/ttlcache": "1.4.1",
         "@nodebb/spider-detector": "2.0.3",
         "@popperjs/core": "2.11.8",
-        "ace-builds": "1.36.0",
+        "ace-builds": "1.36.2",
         "archiver": "7.0.1",
         "async": "3.2.6",
         "autoprefixer": "10.4.20",
@@ -110,23 +110,23 @@
         "nodebb-theme-peace": "2.2.6",
         "nodebb-theme-persona": "14.0.0-pre.1",
         "nodebb-widget-essentials": "7.0.21",
-        "nodemailer": "6.9.14",
+        "nodemailer": "6.9.15",
         "nprogress": "0.2.0",
         "passport": "0.7.0",
         "passport-http-bearer": "1.0.1",
         "passport-local": "1.0.0",
         "pg": "8.12.0",
         "pg-cursor": "2.11.0",
-        "postcss": "8.4.41",
+        "postcss": "8.4.45",
         "postcss-clean": "1.2.0",
         "progress-webpack-plugin": "1.0.16",
         "prompt": "1.3.0",
         "ioredis": "5.4.1",
         "rimraf": "5.0.10",
         "rss": "1.2.2",
-        "rtlcss": "4.2.0",
+        "rtlcss": "4.3.0",
         "sanitize-html": "2.13.0",
-        "sass": "1.77.8",
+        "sass": "1.78.0",
         "semver": "7.6.3",
         "serve-favicon": "2.5.0",
         "sharp": "0.32.6",
@@ -134,7 +134,7 @@
         "socket.io": "4.7.5",
         "socket.io-client": "4.7.5",
         "@socket.io/redis-adapter": "8.3.0",
-        "sortablejs": "1.15.2",
+        "sortablejs": "1.15.3",
         "spdx-license-list": "6.9.0",
         "terser-webpack-plugin": "5.3.10",
         "textcomplete": "0.18.2",
@@ -144,7 +144,7 @@
         "toobusy-js": "0.5.1",
         "tough-cookie": "4.1.4",
         "validator": "13.12.0",
-        "webpack": "5.93.0",
+        "webpack": "5.94.0",
         "webpack-merge": "6.0.1",
         "winston": "3.14.2",
         "workerpool": "9.1.3",
@@ -155,17 +155,17 @@
     },
     "devDependencies": {
         "@apidevtools/swagger-parser": "10.1.0",
-        "@commitlint/cli": "19.4.0",
+        "@commitlint/cli": "19.4.1",
-        "@commitlint/config-angular": "19.3.0",
+        "@commitlint/config-angular": "19.4.1",
         "coveralls": "3.1.1",
         "eslint": "8.57.0",
         "eslint-config-nodebb": "0.2.1",
-        "eslint-plugin-import": "2.29.1",
+        "eslint-plugin-import": "2.30.0",
         "grunt": "1.6.1",
         "grunt-contrib-watch": "1.1.0",
         "husky": "8.0.3",
-        "jsdom": "24.1.1",
+        "jsdom": "25.0.0",
-        "lint-staged": "15.2.9",
+        "lint-staged": "15.2.10",
         "mocha": "10.7.3",
         "mocha-lcov-reporter": "1.3.0",
         "mockdate": "3.0.5",
@@ -173,7 +173,7 @@
         "smtp-server": "3.13.4"
     },
     "optionalDependencies": {
-        "sass-embedded": "1.77.8"
+        "sass-embedded": "1.78.0"
     },
     "resolutions": {
         "*/jquery": "3.7.1"

public/language/ar/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/bg/modules.json

@@ -1,9 +1,9 @@
 {
     "chat.room-id": "Стая %1",
     "chat.chatting-with": "Разговор с",
-    "chat.placeholder": "Type chat message here, drag & drop images",
+    "chat.placeholder": "Въведете съобщение тук или пуснете снимки",
-    "chat.placeholder.mobile": "Type chat message",
+    "chat.placeholder.mobile": "Въведете съобщение",
-    "chat.placeholder.message-room": "Message #%1",
+    "chat.placeholder.message-room": "Съобщение #%1",
     "chat.scroll-up-alert": "Към последните съобщения",
     "chat.usernames-and-x-others": "%1 и %2 други",
     "chat.chat-with-usernames": "Разговор с %1",

public/language/bg/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Впишете се или се регистрирайте, за да можете да търсите.",
 	"settings.title": "Настройки на темата",
 	"settings.enableQuickReply": "Включване на бързите отговори",
-	"settings.enableBreadcrumbs": "Включване на пътечките на страниците",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Центриране на заглавните елементи",
 	"settings.mobileTopicTeasers": "Показване на резюмета на темите на мобилни устройства",
 	"settings.stickyToolbar": "Статична лента с инструменти",

public/language/bn/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/cs/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/da/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/de/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Anmelden oder registrieren, um zu suchen",
 	"settings.title": "Theme-Einstellungen",
 	"settings.enableQuickReply": "Schnelle Antworten aktivieren",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Header-Elemente zentrieren",
 	"settings.mobileTopicTeasers": "Themen-Vorschau auf Mobilgeräten anzeigen",
 	"settings.stickyToolbar": "Klebrige Toolbar",

public/language/el/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/en-GB/error.json

@@ -179,6 +179,7 @@
 
 	"cant-chat-with-yourself": "You can't chat with yourself!",
 	"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+	"chat-user-blocked": "You have been blocked by this user.",
 	"chat-disabled": "Chat system disabled",
 	"too-many-messages": "You have sent too many messages, please wait awhile.",
 	"invalid-chat-message": "Invalid chat message",

public/language/en-GB/notifications.json

@@ -83,6 +83,7 @@
 	"email-confirmed": "Email Confirmed",
 	"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
 	"email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
+	"email-confirm-error-message-already-validated": "Your email address was already validated.",
 	"email-confirm-sent": "Confirmation email sent.",
 
 	"none": "None",

public/language/en-GB/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/en-GB/user.json

@@ -82,6 +82,7 @@
 	"change-password": "Change Password",
 	"change-password-error": "Invalid Password!",
 	"change-password-error-wrong-current": "Your current password is not correct!",
+	"change-password-error-same-password": "Your new password matches your current password, please use a new password.",
 	"change-password-error-match": "Passwords must match!",
 	"change-password-error-privileges": "You do not have the rights to change this password.",
 	"change-password-success": "Your password is updated!",

public/language/en-US/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/en-x-pirate/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/es/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/et/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/fa-IR/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "برای جستجو وارد شوید و یا ثبت نام کنید ",
 	"settings.title": "تنظیمات تم ",
 	"settings.enableQuickReply": "پاسخ سریع را فعال کنید",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "وسط چین کردن عناصر هدر ",
 	"settings.mobileTopicTeasers": "نمایش تیزرهای تاپیک در گوشی",
 	"settings.stickyToolbar": "نوار ابزار چسبیده ",

public/language/fi/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Etsi kirjautumalla sisään tai luomalla tili.",
 	"settings.title": "Teeman asetukset",
 	"settings.enableQuickReply": "Käytä Pikavastausta",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Keskitä otsakkeen elementit",
 	"settings.mobileTopicTeasers": "Näytä aihe-ehdotukset mobiilinäkymässä",
 	"settings.stickyToolbar": "Kiinteä työkalupalkki",

public/language/fr/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Connectez-vous ou inscrivez-vous pour  faire une recherche.",
 	"settings.title": "Configuration du thème",
 	"settings.enableQuickReply": "Activer les réponses rapides",
-	"settings.enableBreadcrumbs": "Activer le fil d'Ariane",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Centrer les éléments d'en-tête",
 	"settings.mobileTopicTeasers": "Afficher les teasers de sujet sur mobile",
 	"settings.stickyToolbar": "Barre d'outils",

public/language/gl/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/he/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "התחברו או הירשמו כדי לחפש.",
 	"settings.title": "הגדרות ערכת נושא",
 	"settings.enableQuickReply": "הפעלת תגובה מהירה",
-	"settings.enableBreadcrumbs": "אפשר סימני דרך",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "מרכוז אלמנטים של כותרת",
 	"settings.mobileTopicTeasers": "הצגת טיזרים של נושאים בנייד",
 	"settings.stickyToolbar": "הצמד את סרגל הכלים בעת גלילה",

public/language/hr/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/hu/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Kenyérmorzsa linkek engedélyezése",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/hy/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Մուտք գործել կամ գրանցվել որոնման համար:",
 	"settings.title": "Թեմայի կարգավորումներ",
 	"settings.enableQuickReply": "Միացնել արագ արձագանքը",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Կենտրոնական վերնագրի տարրեր",
 	"settings.mobileTopicTeasers": "Ցույց տալ թեմայի թիզերները բջջայինով",
 	"settings.stickyToolbar": "Կպչուն գործիքագոտի",

public/language/id/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/it/modules.json

@@ -1,9 +1,9 @@
 {
     "chat.room-id": "Stanza %1",
     "chat.chatting-with": "Messaggia con",
-    "chat.placeholder": "Type chat message here, drag & drop images",
+    "chat.placeholder": "Digita qui il messaggio di chat, trascina e rilascia le immagini",
-    "chat.placeholder.mobile": "Type chat message",
+    "chat.placeholder.mobile": "Digita il messaggio di chat",
-    "chat.placeholder.message-room": "Message #%1",
+    "chat.placeholder.message-room": "Messaggio #%1",
     "chat.scroll-up-alert": "Vai al messaggio più recente",
     "chat.usernames-and-x-others": "%1 & %2 altri",
     "chat.chat-with-usernames": "Chatta con %1",

public/language/it/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Accedi o registrati per effettuare la ricerca.",
 	"settings.title": "Impostazioni tema",
 	"settings.enableQuickReply": "Abilita risposta rapida",
-	"settings.enableBreadcrumbs": "Abilita breadcrumb",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Centra elementi dell'intestazione",
 	"settings.mobileTopicTeasers": "Mostra le anteprime delle discussioni su mobile",
 	"settings.stickyToolbar": "Barra degli strumenti adesiva",

public/language/ja/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/ko/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "검색하려면 로그인하거나 등록하세요.",
 	"settings.title": "테마 설정",
 	"settings.enableQuickReply": "빠른 답장 활성화",
-	"settings.enableBreadcrumbs": "사이트 이동 경로 활성화",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "헤더 요소 가운데 정렬",
 	"settings.mobileTopicTeasers": "모바일에서 토픽 미리보기 표시",
 	"settings.stickyToolbar": "툴바 고정",

public/language/lt/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/lv/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/ms/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/nb/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/nl/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/pl/modules.json

@@ -1,9 +1,9 @@
 {
     "chat.room-id": "Pokój %1",
     "chat.chatting-with": "Czatuj z",
-    "chat.placeholder": "Type chat message here, drag & drop images",
+    "chat.placeholder": "Wpisz treść wiadomości lub przeciągnij i upuść obrazki",
-    "chat.placeholder.mobile": "Type chat message",
+    "chat.placeholder.mobile": "Wpisz treść wiadomości",
-    "chat.placeholder.message-room": "Message #%1",
+    "chat.placeholder.message-room": "Wiadomość #%1",
     "chat.scroll-up-alert": "Go to most recent message",
     "chat.usernames-and-x-others": "%1 i %2 innych",
     "chat.chat-with-usernames": "Czatuj z %1",

public/language/pl/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Aby wyszukiwać zaloguj się lub zarejestruj.",
 	"settings.title": "Ustawienia stylu",
 	"settings.enableQuickReply": "Włącz szybkie odpowiadanie",
-	"settings.enableBreadcrumbs": "Pokazuj łącza do wszystkich stron nadrzędnych",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Wyśrodkuj elementy nagłówka",
 	"settings.mobileTopicTeasers": "Pokazuj zwiastuny tematów na telefonie",
 	"settings.stickyToolbar": "Przyklejaj pasek narzędziowy",

public/language/pt-BR/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/pt-PT/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/ro/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/ru/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/rw/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/sc/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/sk/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/sl/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/sq-AL/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/sr/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Пријавите се или региструјте за претрагу.",
 	"settings.title": "Подешавање тема",
 	"settings.enableQuickReply": "Омогући брзи одговор",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Центрирај елементе заглавља",
 	"settings.mobileTopicTeasers": "Прикажи најавне теме на мобилном телефону",
 	"settings.stickyToolbar": "Лепљива трака алата",

public/language/sv/admin/extend/widgets.json

@@ -26,10 +26,10 @@
 	"container": "Container",
 	"container.placeholder": "Drag and drop a container or enter HTML here.",
 	"show-to-groups": "Show to groups",
-	"hide-from-groups": "Hide from groups",
+	"hide-from-groups": "Dölj från grupper",
 	"start-date": "Start date",
 	"end-date": "End date",
 	"hide-on-mobile": "Hide on mobile",
-	"hide-drafts": "Hide drafts",
+	"hide-drafts": "Dölj utkast",
-	"show-drafts": "Show drafts"
+	"show-drafts": "Visa utkast"
 }

public/language/sv/admin/manage/categories.json

@@ -18,7 +18,7 @@
 	"is-section": "Treat this category as a section",
 	"post-queue": "Post queue",
 	"tag-whitelist": "Tag Whitelist",
-	"upload-image": "Upload Image",
+	"upload-image": "Ladda upp bild",
 	"upload": "Upload",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
@@ -92,7 +92,7 @@
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
 	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
-	"collapse-all": "Collapse All",
+	"collapse-all": "Dölj alla",
 	"expand-all": "Expand All",
 	"disable-on-create": "Disable on create",
 	"no-matches": "No matches"

public/language/sv/admin/manage/privileges.json

@@ -9,7 +9,7 @@
   	"select-clear-all": "Select/Clear All",
 	"chat": "Chat",
 	"chat-with-privileged": "Chat with Privileged",
-	"upload-images": "Upload Images",
+	"upload-images": "Ladda upp bilder",
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",

public/language/sv/admin/settings/post.json

@@ -4,11 +4,11 @@
 	"sorting.post-default": "Default Post Sorting",
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
-	"sorting.recently-replied": "Recently Replied",
+	"sorting.recently-replied": "Nyligen besvarade",
-	"sorting.recently-created": "Recently Created",
+	"sorting.recently-created": "Nyligen skapade",
 	"sorting.most-votes": "Most Votes",
 	"sorting.most-posts": "Most Posts",
-	"sorting.most-views": "Most Views",
+	"sorting.most-views": "Flest visningar",
 	"sorting.topic-default": "Default Topic Sorting",
 	"length": "Post Length",
 	"post-queue": "Post Queue",

public/language/sv/admin/settings/user.json

@@ -79,7 +79,7 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.tracking": "Tracking",
+	"categoryWatchState.tracking": "Bevakning",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring",
 	"restrictions-new": "New User Restrictions",

public/language/sv/category.json

@@ -10,13 +10,13 @@
     "watch": "Bevaka",
     "ignore": "Ignorera",
     "watching": "Bevakar",
-    "tracking": "Tracking",
+    "tracking": "Bevakning",
     "not-watching": "Följer inte",
     "ignoring": "Ignorerar",
-    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
+    "watching.description": "Visa ämnen i olästa och senaste",
-    "tracking.description": "Shows topics in unread & recent",
+    "tracking.description": "Visa ämnen i olästa och senaste",
     "not-watching.description": "Visa inte ämnen i olästa, visa i senaste",
-    "ignoring.description": "Do not show topics in unread & recent",
+    "ignoring.description": "Visa inte ämnen i olästa och senaste",
     "watching.message": "Nu får du uppdateringar från den här kategorin och alla underkategorier",
     "tracking.message": "You are now tracking updates from this category and all subcategories",
     "notwatching.message": "Du får inga uppdateringar från den här kategorin eller alla underkategorier",

public/language/sv/global.json

@@ -20,8 +20,8 @@
     "you-have-successfully-logged-in": "Inloggningen lyckades",
     "save-changes": "Spara ändringar",
     "save": "Spara",
-    "create": "Create",
+    "create": "Skapa",
-    "cancel": "Cancel",
+    "cancel": "Avbryt",
     "close": "Stäng",
     "pagination": "Siduppdelning",
     "pagination.previouspage": "Previous Page",
@@ -49,10 +49,10 @@
     "header.account": "Account",
     "header.navigation": "Navigering",
     "header.manage": "Manage",
-    "header.drafts": "Drafts",
+    "header.drafts": "Utkast",
     "notifications.loading": "Laddar notiser",
     "chats.loading": "Laddar chattar",
-    "drafts.loading": "Loading Drafts",
+    "drafts.loading": "Laddar utkast",
     "motd.welcome": "Välkommen till NodeBB, framtidens diskussionsplattform.",
     "alert.success": "Lyckat",
     "alert.error": "Fel",
@@ -67,7 +67,7 @@
     "users": "Användare",
     "topics": "Ämnen",
     "posts": "Inlägg",
-    "x-posts": "<span class=\"formatted-number\">%1</span> posts",
+    "x-posts": "<span class=\"formatted-number\">%1</span> inlägg",
     "x-topics": "<span class=\"formatted-number\">%1</span> topics",
     "x-reputation": "<span class=\"formatted-number\">%1</span> reputation",
     "best": "Bästa",
@@ -80,7 +80,7 @@
     "downvoters": "Nerröstare",
     "downvoted": "Nedröstad",
     "views": "Visningar",
-    "posters": "Posters",
+    "posters": "Användare",
     "reputation": "Rykte",
     "lastpost": "Senaste inlägget",
     "firstpost": "Först inlägget",
@@ -116,7 +116,7 @@
     "guests": "Anonyma",
     "former-user": "En före detta användare",
     "system-user": "System",
-    "unknown-user": "Unknown user",
+    "unknown-user": "Okänd användare",
     "updated.title": "Forumet uppdaterades",
     "updated.message": "Det här forumet har nu uppdaterats till senaste versionen. Klicka här för att ladda om sidan.",
     "privacy": "Integritet",
@@ -140,12 +140,12 @@
     "edited": "Redigerad",
     "disabled": "Avstängd",
     "select": "Välj",
-    "selected": "Selected",
+    "selected": "Vald",
-    "copied": "Copied",
+    "copied": "Kopierad",
     "user-search-prompt": "Skriv något för att hitta användare",
-    "hidden": "Hidden",
+    "hidden": "Dold",
-    "sort": "Sort",
+    "sort": "Sortera",
-    "actions": "Actions",
+    "actions": "Handlingar",
     "rss-feed": "RSS Feed",
     "skip-to-content": "Skip to content"
 }

public/language/sv/modules.json

@@ -79,7 +79,7 @@
     "composer.compose": "Komponera",
     "composer.show-preview": "Visa förhandsgranskning",
     "composer.hide-preview": "Dölj förhandsgranskning",
-    "composer.help": "Help",
+    "composer.help": "Hjälp",
     "composer.user-said-in": "%1 sa i %2:",
     "composer.user-said": "%1 sa:",
     "composer.discard": "Är du säker på att du vill ta bort det här inlägget?",
@@ -88,23 +88,23 @@
     "composer.uploading": "Laddar upp %1",
     "composer.formatting.bold": "Fet",
     "composer.formatting.italic": "Kursiv",
-    "composer.formatting.heading": "Heading",
+    "composer.formatting.heading": "Rubrik",
-    "composer.formatting.heading1": "Heading 1",
+    "composer.formatting.heading1": "Rubrik 1",
-    "composer.formatting.heading2": "Heading 2",
+    "composer.formatting.heading2": "Rubrik 2",
-    "composer.formatting.heading3": "Heading 3",
+    "composer.formatting.heading3": "Rubrik 3",
-    "composer.formatting.heading4": "Heading 4",
+    "composer.formatting.heading4": "Rubrik 4",
-    "composer.formatting.heading5": "Heading 5",
+    "composer.formatting.heading5": "Rubrik 5",
-    "composer.formatting.heading6": "Heading 6",
+    "composer.formatting.heading6": "Rubrik 6",
     "composer.formatting.list": "Lista",
     "composer.formatting.strikethrough": "Genomstrykning",
     "composer.formatting.code": "Kod",
     "composer.formatting.link": "Länk",
-    "composer.formatting.picture": "Image Link",
+    "composer.formatting.picture": "Bildlänk",
     "composer.upload-picture": "Ladda upp bild",
     "composer.upload-file": "Ladda upp fil",
     "composer.zen-mode": "Zen Mode",
     "composer.select-category": "Välj en kategori",
-    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
+    "composer.textarea.placeholder": "Skriv innehåll här, dra och släpp bilder",
     "composer.post-queue-alert": "Hello👋!<br/>This forum uses a post queue system, since you are a new user your post will be hidden until it is approved by our moderation team.",
     "composer.schedule-for": "Schedule topic for",
     "composer.schedule-date": "Date",
@@ -112,8 +112,8 @@
     "composer.cancel-scheduling": "Cancel Scheduling",
     "composer.change-schedule-date": "Change Date",
     "composer.set-schedule-date": "Set Date",
-    "composer.discard-all-drafts": "Discard all drafts",
+    "composer.discard-all-drafts": "Ignorera samtliga utkast",
-    "composer.no-drafts": "You have no drafts",
+    "composer.no-drafts": "Du har inga utkast",
     "composer.discard-draft-confirm": "Do you want to discard this draft?",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Avbryt",

public/language/sv/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Notiser",
     "no-notifs": "Du har inga nya notiser",
-    "see-all": "All notifications",
+    "see-all": "Alla notiser",
     "mark-all-read": "Markera alla notiser som lästa",
     "back-to-home": "Tillbaka till %1",
     "outgoing-link": "Utgående länk",
@@ -28,10 +28,10 @@
     "new-messages-from": "%1 new messages from <strong>%2</strong>",
     "new-message-in": "New message in <strong>%1</strong>",
     "new-messages-in": "%1 new messages in <strong>%2</strong>",
-    "user-posted-in-public-room": "<strong>%1</strong> wrote in <strong class=\"text-nowrap\"><i class=\"fa %2\"></i>%3</strong>",
+    "user-posted-in-public-room": "<strong>%1</strong> skrev i <strong class=\"text-nowrap\"><i class=\"fa %2\"></i>%3</strong>",
-    "user-posted-in-public-room-dual": "<strong>%1</strong> and <strong>%2</strong> wrote in <strong class=\"text-nowrap\"><i class=\"fa %3\"></i>%4</strong>",
+    "user-posted-in-public-room-dual": "<strong>%1</strong> och <strong>%2</strong> skrev i <strong class=\"text-nowrap\"><i class=\"fa %3\"></i>%4</strong>",
-    "user-posted-in-public-room-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> wrote in <strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>",
+    "user-posted-in-public-room-triple": "<strong>%1</strong>, <strong>%2</strong> och <strong>%3</strong> skrev i <strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>",
-    "user-posted-in-public-room-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others wrote in <strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>",
+    "user-posted-in-public-room-multiple": "<strong>%1</strong>, <strong>%2</strong> och %3 andra skrev i <strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>",
     "upvoted-your-post-in": "<strong>%1</strong> har röstat upp ditt inlägg i <strong>%2</strong>",
     "upvoted-your-post-in-dual": "<strong>%1</strong> och <strong>%2</strong> har röstat upp ditt inlägg i <strong>%3</strong>.",
     "upvoted-your-post-in-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> have upvoted your post in <strong>%4</strong>.",

public/language/sv/recent.json

@@ -7,5 +7,5 @@
     "alltime": "Alltid",
     "no-recent-topics": "Det finns inga olästa ämnen.",
     "no-popular-topics": "Det finns inga populära ämnen.",
-    "load-new-posts": "Load new posts"
+    "load-new-posts": "Ladda nya inlägg"
 }

public/language/sv/tags.json

@@ -1,17 +1,17 @@
 {
-    "all-tags": "All tags",
+    "all-tags": "Alla taggar",
     "no-tag-topics": "Det finns inga ämnen med denna tagg.",
     "no-tags-found": "No tags found",
     "tags": "Taggar",
-    "enter-tags-here": "Enter tags, %1 - %2 characters.",
+    "enter-tags-here": "Lägg till taggar, %1 - %2 tecken.",
     "enter-tags-here-short": "Ange taggar...",
     "no-tags": "Det finns inga taggar ännu.",
     "select-tags": "Välj Etiketter",
     "tag-whitelist": "Tag Whitelist",
     "watching": "Watching",
     "not-watching": "Not Watching",
-    "watching.description": "Notify me of new topics.",
+    "watching.description": "Notifiera mig vid nya ämnen",
-    "not-watching.description": "Do not notify me of new topics.",
+    "not-watching.description": "Notifiera mig ej vid nya ämnen",
     "following-tag.message": "You will now be receiving notifications when somebody posts a topic with this tag.",
     "not-following-tag.message": "You will not receive notifications when somebody posts a topic with this tag."
 }

public/language/sv/themes/harmony.json

@@ -1,13 +1,14 @@
 {
 	"theme-name": "Harmony Theme",
 	"skins": "Skins",
-	"collapse": "Collapse",
+	"collapse": "Dölj",
 	"expand": "Expand",
 	"sidebar-toggle": "Sidebar Toggle",
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/sv/topic.json

@@ -42,8 +42,8 @@
     "copy-ip": "Kopiera IP",
     "ban-ip": "Banna IP",
     "view-history": "Redigera historik",
-    "wrote-ago": "wrote <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
+    "wrote-ago": "skrev <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
-    "wrote-on": "wrote on <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
+    "wrote-on": "skrev den <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
     "replied-to-user-ago": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
     "replied-to-user-on": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> on <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
     "user-locked-topic-ago": "%1 locked this topic %2",
@@ -67,8 +67,8 @@
     "user-forked-topic-ago": "%1 <a href=\"%2\">forked</a> this topic %3",
     "user-forked-topic-on": "%1 <a href=\"%2\">forked</a> this topic on %3",
     "bookmark-instructions": "Klicka här för att återgå till senast lästa inlägg i detta ämne.",
-    "flag-post": "Flag this post",
+    "flag-post": "Flagga inlägg",
-    "flag-user": "Flag this user",
+    "flag-user": "Flagga användare",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
     "resolve-flag": "Resolve Flag",
@@ -105,7 +105,7 @@
     "thread-tools.change-owner": "Ändra ägare",
     "thread-tools.select-category": "Välj kategori",
     "thread-tools.fork": "Grena ämne",
-    "thread-tools.tag": "Tag Topic",
+    "thread-tools.tag": "Tagga ämne",
     "thread-tools.delete": "Ta bort ämne",
     "thread-tools.delete-posts": "Radera inlägg",
     "thread-tools.delete-confirm": "Är du säker på att du vill ta bort det här ämnet?",
@@ -114,7 +114,7 @@
     "thread-tools.purge": "Rensa bort ämne",
     "thread-tools.purge-confirm": "Är du säker att du vill rensa bort det här ämnet?",
     "thread-tools.merge-topics": "Slå samman ämnen",
-    "thread-tools.merge": "Merge Topic",
+    "thread-tools.merge": "Slå samman ämne",
     "topic-move-success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
     "topic-move-multiple-success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
     "topic-move-all-success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
@@ -132,7 +132,7 @@
     "bookmark": "Bokmärke",
     "bookmarks": "Bokmärken",
     "bookmarks.has-no-bookmarks": "Du har inte bokmärkt några inlägg ännu.",
-    "copy-permalink": "Copy Permalink",
+    "copy-permalink": "Kopiera länk",
     "loading-more-posts": "Laddar fler inlägg",
     "move-topic": "Flytta ämne",
     "move-topics": "Flytta ämnen",
@@ -159,11 +159,11 @@
     "change-owner-instruction": "Klicka på de inlägg du vill tilldela en annan användare",
     "composer.title-placeholder": "Skriv in ämnets titel här...",
     "composer.handle-placeholder": "Skriv ditt namn/användarnamn här",
-    "composer.hide": "Hide",
+    "composer.hide": "Dölj",
     "composer.discard": "Avbryt",
     "composer.submit": "Skicka",
     "composer.additional-options": "Ytterligare val",
-    "composer.post-later": "Post Later",
+    "composer.post-later": "Skicka senare",
     "composer.schedule": "Schemalägg",
     "composer.replying-to": "Svarar till %1",
     "composer.new-topic": "Nytt ämne",
@@ -182,11 +182,11 @@
     "sort-by": "Sortera på",
     "oldest-to-newest": "Äldst till nyaste",
     "newest-to-oldest": "Nyaste till äldst",
-    "recently-replied": "Recently Replied",
+    "recently-replied": "Nyligen besvarade",
-    "recently-created": "Recently Created",
+    "recently-created": "Nyligen skapade",
     "most-votes": "Flest röster",
     "most-posts": "Flest inlägg",
-    "most-views": "Most Views",
+    "most-views": "Flest visningar",
     "stale.title": "Skapa nytt ämne istället?",
     "stale.warning": "Ämnet du svarar på är ganska gammalt. Vill du skapa ett nytt ämne istället och inkludera en referens till det här ämnet i ditt inlägg?",
     "stale.create": "Skapa nytt ämne",
@@ -210,7 +210,7 @@
     "no-more-next-post": "You don't have more posts in this topic",
     "open-composer": "Open composer",
     "post-quick-reply": "Quick reply",
-    "navigator.index": "Post %1 of %2",
+    "navigator.index": "Inlägg %1 av %2",
     "navigator.unread": "%1 unread",
     "upvote-post": "Upvote post",
     "downvote-post": "Downvote post",

public/language/th/modules.json

@@ -1,13 +1,13 @@
 {
     "chat.room-id": "ห้อง %1",
     "chat.chatting-with": "คุยกับ",
-    "chat.placeholder": "Type chat message here, drag & drop images",
+    "chat.placeholder": "พิมพ์ข้อความแชทที่นี่ หรือลากรูปภาพมาปล่อย",
-    "chat.placeholder.mobile": "Type chat message",
+    "chat.placeholder.mobile": "พิมพ์ข้อความแชท",
-    "chat.placeholder.message-room": "Message #%1",
+    "chat.placeholder.message-room": "ข้อความ %1",
     "chat.scroll-up-alert": "ไปที่ข้อความล่าสุด",
-    "chat.usernames-and-x-others": "%1, %2 และผู้อื่น",
+    "chat.usernames-and-x-others": "%1  และอีก %2 คน",
     "chat.chat-with-usernames": "แชทกับ %1",
-    "chat.chat-with-usernames-and-x-others": "แชทกับ %1, %2 และผู้อื่น",
+    "chat.chat-with-usernames-and-x-others": "แชทกับ %1  และอีก %2 คน",
     "chat.send": "ส่ง",
     "chat.no-active": "คุณไม่มีแชทที่คุยอยู่",
     "chat.user-typing-1": "<strong>%1</strong> กำลังพิมพ์ ...",

public/language/th/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "เข้าสู่ระบบหรือสมัครบัญชีเพื่อค้นหา",
 	"settings.title": "การตั้งค่าธีม",
 	"settings.enableQuickReply": "เปิดใช้งานการตอบกลับทันที",
-	"settings.enableBreadcrumbs": "เปิดใช้งานแถบนำทาง",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "ทำให้ข้อความส่วนหัวอยู่ตรงกลาง",
 	"settings.mobileTopicTeasers": "แสดงตัวอย่างเนื้อหากระทู้บนมือถือ",
 	"settings.stickyToolbar": "แถบเครื่องมือแบบ sticky",

public/language/tr/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Aramak için giriş yapın veya kaydolun",
 	"settings.title": "Tema Ayarları",
 	"settings.enableQuickReply": "Hızlı Cevabı Etkinleştir",
-	"settings.enableBreadcrumbs": "Başlıklar için yol izini (breadcrumbs) göster",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Tepedeki Merkezi Öğeler",
 	"settings.mobileTopicTeasers": "Başlık Önizlemelerini mobilde göster",
 	"settings.stickyToolbar": "Yapışkan Araç Çubuğu",

public/language/uk/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/language/vi/modules.json

@@ -1,9 +1,9 @@
 {
     "chat.room-id": "Phòng %1",
     "chat.chatting-with": "Trò chuyện với",
-    "chat.placeholder": "Type chat message here, drag & drop images",
+    "chat.placeholder": "Nhập tin nhắn trò chuyện vào đây, kéo & thả hình ảnh",
-    "chat.placeholder.mobile": "Type chat message",
+    "chat.placeholder.mobile": "Nhập tin nhắn trò chuyện",
-    "chat.placeholder.message-room": "Message #%1",
+    "chat.placeholder.message-room": "Tin nhắn #%1",
     "chat.scroll-up-alert": "Đi đến tin nhắn gần đây nhất",
     "chat.usernames-and-x-others": "%1 & %2 khác",
     "chat.chat-with-usernames": "Trò chuyện với %1",

public/language/vi/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Đăng nhập hoặc đăng ký để tìm kiếm.",
 	"settings.title": "Cài đặt chủ đề",
 	"settings.enableQuickReply": "Bật trả lời nhanh",
-	"settings.enableBreadcrumbs": "Bật dẫn hướng đường dẫn",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Yếu tố tiêu đề trung tâm",
 	"settings.mobileTopicTeasers": "Hiển thị đoạn giới thiệu chủ đề trên di động",
 	"settings.stickyToolbar": "Thanh công cụ cố định",

public/language/zh-CN/admin/dashboard.json

@@ -97,5 +97,5 @@
 	"clear-search-history-confirm": "您确定您要删除搜索历史吗？",
 	"search-term": "内容",
 	"search-count": "计数",
-	"view-all": "浏览全部"
+	"view-all": "查看全部"
 }

public/language/zh-CN/admin/manage/privileges.json

@@ -18,9 +18,9 @@
 	"search-content": "搜索内容",
 	"search-users": "搜索用户",
 	"search-tags": "搜索标签",
-	"view-users": "浏览用户",
+	"view-users": "查看用户",
-	"view-tags": "浏览标签",
+	"view-tags": "查看标签",
-	"view-groups": "浏览群组",
+	"view-groups": "查看群组",
 	"allow-local-login": "本地登录",
 	"allow-group-creation": "群组创建",
 	"view-users-info": "查看用户信息",

public/language/zh-CN/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "登录或注册以进行搜索。",
 	"settings.title": "主题设置",
 	"settings.enableQuickReply": "启用快速回复",
-	"settings.enableBreadcrumbs": "启用面包屑导航",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "标题元素居中",
 	"settings.mobileTopicTeasers": "在移动设备显示话题预告",
 	"settings.stickyToolbar": "附着工具条",

public/language/zh-CN/user.json

@@ -166,7 +166,7 @@
     "info.latest-flags": "最新举报",
     "info.profile": "资料",
     "info.post": "帖子",
-    "info.view-flag": "View flag",
+    "info.view-flag": "查看举报",
     "info.reported-by": "举报者：",
     "info.no-flags": "没有找到被举报的帖子",
     "info.ban-history": "最近封禁历史",

public/language/zh-TW/themes/harmony.json

@@ -7,7 +7,8 @@
 	"login-register-to-search": "Login or register to search.",
 	"settings.title": "Theme settings",
 	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Enable breadcrumbs",
+	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
+	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
 	"settings.centerHeaderElements": "Center header elements",
 	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
 	"settings.stickyToolbar": "Sticky toolbar",

public/openapi/read/confirm/code.yaml

@@ -24,6 +24,9 @@ get:
                   error:
                     type: string
                     description: Translation key for client-side localisation
+                  alreadyValidated:
+                    type: boolean
+                    description: set to true if the email was already validated
                 required:
                   - title
               - $ref: ../../components/schemas/CommonProps.yaml#/CommonProps

public/openapi/write/users/uid/password.yaml

@@ -23,7 +23,7 @@ put:
               example: '123456'
             newPassword:
               type: string
-              example: '123456'
+              example: '654321'
           required:
             - newPassword
   responses:

src/controllers/index.js

@@ -221,20 +221,31 @@ Controllers.registerInterstitial = async function (req, res, next) {
 	}
 };
 
-Controllers.confirmEmail = async (req, res, next) => {
+Controllers.confirmEmail = async (req, res) => {
+	function renderPage(opts = {}) {
+		res.render('confirm', {
+			title: '[[pages:confirm]]',
+			...opts,
+		});
+	}
 	try {
+		if (req.loggedIn) {
+			const emailValidated = await user.getUserField(req.uid, 'email:confirmed');
+			if (emailValidated) {
+				return renderPage({ alreadyValidated: true });
+			}
+		}
 		await user.email.confirmByCode(req.params.code, req.session.id);
 		if (req.session.registration) {
 			// After confirmation, no need to send user back to email change form
 			delete req.session.registration.updateEmail;
 		}
 
-		res.render('confirm', {
+		renderPage();
-			title: '[[pages:confirm]]',
-		});
 	} catch (e) {
-		if (e.message === '[[error:invalid-data]]') {
+		if (e.message === '[[error:invalid-data]]' || e.message === '[[error:confirm-email-expired]]') {
-			return next();
+			renderPage({ error: true });
+			return;
 		}
 
 		throw e;

src/messaging/index.js

@@ -363,7 +363,10 @@ Messaging.canMessageUser = async (uid, toUid) => {
 		user.blocks.is(uid, toUid),
 	]);
 
-	if (isBlocked || (settings.restrictChat && !isAdmin && !isModerator && !isFollowing)) {
+	if (isBlocked) {
+		throw new Error('[[error:chat-user-blocked]]');
+	}
+	if (settings.restrictChat && !isAdmin && !isModerator && !isFollowing) {
 		throw new Error('[[error:chat-restricted]]');
 	}
 

src/user/profile.js

@@ -319,6 +319,9 @@ module.exports = function (User) {
 			if (!correct) {
 				throw new Error('[[user:change-password-error-wrong-current]]');
 			}
+			if (data.currentPassword === data.newPassword) {
+				throw new Error('[[user:change-password-error-same-password]]');
+			}
 		}
 
 		const hashedPassword = await User.hashPassword(data.newPassword);

src/views/confirm.tpl

@@ -1,7 +1,19 @@
+{{{ if alreadyValidated }}}
+<div class="alert alert-info">
+	<p>[[notifications:email-confirm-error-message-already-validated]]</p>
+{{{ end }}}
+
+{{{ if error }}}
+<div class="alert alert-warning">
+	<p>[[notifications:email-confirm-error-message]]</p>
+{{{ end }}}
+
+{{{ if (!error && !alreadyValidated )}}}
 <div class="alert alert-success">
 	<strong>[[notifications:email-confirmed]]</strong>
 	<p>[[notifications:email-confirmed-message]]</p>
-	<p>
+{{{ end }}}
+	<p class="mb-0">
 		<a href="{config.relative_path}/">[[notifications:back-to-home, {config.siteTitle}]]</a>
 	</p>
-</div>
+</div>

src/views/reset_code.tpl

@@ -1,40 +1,42 @@
-<div class="row col-12 col-sm-6 offset-sm-3">
+<div class="row">
-	{{{ if valid }}}
+	<div class="col-12 col-sm-6 offset-sm-3">
-	<div class="card card-body bg-light">
+		{{{ if valid }}}
-		{{{ if displayExpiryNotice }}}
+		<div class="card card-body bg-light">
-		<div class="alert alert-warning">
+			{{{ if displayExpiryNotice }}}
-			[[reset_password:password-expired]]
+			<div class="alert alert-warning">
+				[[reset_password:password-expired]]
+			</div>
+			{{{ end }}}
+			<div class="alert alert-success alert-dismissible hidden" id="success">
+				<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+				<strong>[[reset_password:password-changed.title]]</strong>
+				<p>[[reset_password:password-changed.message]]</p>
+			</div>
+			<div class="alert alert-warning hidden" id="notice">
+				<strong></strong>
+				<p></p>
+			</div>
+			<form onsubmit="return false;" id="reset-form">
+				<div class="mb-3">
+					<label class="form-label" for="password">[[reset_password:new-password]]</label>
+					<input class="form-control" type="password" placeholder="[[reset_password:new-password]]" id="password" />
+				</div>
+				<div class="mb-3">
+					<label class="form-label" for="repeat">[[reset_password:repeat-password]]</label>
+					<input class="form-control" type="password" placeholder="[[reset_password:repeat-password]]" id="repeat" />
+				</div>
+				<button class="btn btn-primary" id="reset" type="submit">[[reset_password:reset-password]]</button>
+			</form>
+		</div>
+		{{{ else }}}
+		<div class="card">
+			<div class="card-header">
+				<h5 class="mb-0">[[reset_password:wrong-reset-code.title]]</h5>
+			</div>
+			<div class="card-body">
+				<p>[[reset_password:wrong-reset-code.message]]</p>
+			</div>
 		</div>
 		{{{ end }}}
-		<div class="alert alert-success alert-dismissible hidden" id="success">
-			<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-			<strong>[[reset_password:password-changed.title]]</strong>
-			<p>[[reset_password:password-changed.message]]</p>
-		</div>
-		<div class="alert alert-warning hidden" id="notice">
-			<strong></strong>
-			<p></p>
-		</div>
-		<form onsubmit="return false;" id="reset-form">
-			<div class="mb-3">
-				<label class="form-label" for="password">[[reset_password:new-password]]</label>
-				<input class="form-control" type="password" placeholder="[[reset_password:new-password]]" id="password" /><br />
-			</div>
-			<div class="mb-3">
-				<label class="form-label" for="repeat">[[reset_password:repeat-password]]</label>
-				<input class="form-control" type="password" placeholder="[[reset_password:repeat-password]]" id="repeat" /><br />
-			</div>
-			<button class="btn btn-primary btn-block" id="reset" type="submit">[[reset_password:reset-password]]</button>
-		</form>
 	</div>
-	{{{ else }}}
-	<div class="card text-bg-danger">
-		<h5 class="card-header">
-			[[reset_password:wrong-reset-code.title]]
-		</h5>
-		<div class="card-body">
-			<p>[[reset_password:wrong-reset-code.message]]</p>
-		</div>
-	</div>
-	{{{ end }}}
 </div>

test/api.js

@@ -575,8 +575,15 @@ describe('API', async () => {
 					const reloginPaths = ['GET /api/user/{userslug}/edit/email', 'PUT /users/{uid}/password', 'DELETE /users/{uid}/sessions/{uuid}'];
 					if (reloginPaths.includes(`${method.toUpperCase()} ${path}`)) {
 						({ jar } = await helpers.loginUser('admin', '123456'));
-						const sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1);
+						let sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1);
-						const sessObj = await db.sessionStoreGet(sessionIds[0]);
+						let sessObj = await db.sessionStoreGet(sessionIds[0]);
+						if (!sessObj) {
+							// password changed so login with new pwd
+							({ jar } = await helpers.loginUser('admin', '654321'));
+							sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1);
+							sessObj = await db.sessionStoreGet(sessionIds[0]);
+						}
+
 						const { uuid } = sessObj.meta;
 						mocks.delete['/users/{uid}/sessions/{uuid}'][1].example = uuid;
 

test/user.js

@@ -776,6 +776,18 @@ describe('User', () => {
 			assert(correct);
 		});
 
+		it('should not let user change their password to their current password', async () => {
+			const uid = await User.create({ username: 'changepasswordsame', password: '123456' });
+			await assert.rejects(
+				apiUser.changePassword({ uid: uid }, {
+					uid: uid,
+					newPassword: '123456',
+					currentPassword: '123456',
+				}),
+				{ message: '[[user:change-password-error-same-password]]' },
+			);
+		});
+
 		it('should not let user change another user\'s password', async () => {
 			const regularUserUid = await User.create({ username: 'regularuserpwdchange', password: 'regularuser1234' });
 			const uid = await User.create({ username: 'changeadminpwd1', password: '123456' });