diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92d04ca3d0..fe73393c69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+#### v3.2.2 (2023-07-12)
+
+##### Chores
+
+* up themes (f1170b18)
+* up spam-be-gone (eed34d04)
+* remove log (509faa5e)
+* incrementing version number - v3.2.1 (20145074)
+* update changelog for v3.2.1 (c7f8cee9)
+* incrementing version number - v3.2.0 (9ecac38e)
+* incrementing version number - v3.1.7 (0b4e81ab)
+* incrementing version number - v3.1.6 (b3a3b130)
+* incrementing version number - v3.1.5 (ec19343a)
+* incrementing version number - v3.1.4 (2452783c)
+* incrementing version number - v3.1.3 (3b4e9d3f)
+* incrementing version number - v3.1.2 (40fa3489)
+* incrementing version number - v3.1.1 (40250733)
+* incrementing version number - v3.1.0 (0cb386bd)
+* incrementing version number - v3.0.1 (26f6ea49)
+* incrementing version number - v3.0.0 (224e08cd)
+
+##### Bug Fixes
+
+* #11787 (6ae0df4f)
+* #11786 fix selector for upgradable plugins (bf114c11)
+
#### v3.2.1 (2023-07-05)
##### Chores
diff --git a/install/package.json b/install/package.json
index 521665a95a..a7ee942973 100644
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
- "version": "3.2.1",
+ "version": "3.2.2",
"homepage": "https://www.nodebb.org",
"repository": {
"type": "git",
diff --git a/public/language/en-GB/admin/settings/guest.json b/public/language/en-GB/admin/settings/guest.json
index 44370e3668..a0062ef75a 100644
--- a/public/language/en-GB/admin/settings/guest.json
+++ b/public/language/en-GB/admin/settings/guest.json
@@ -1,6 +1,6 @@
{
"settings": "Settings",
- "guest-settings": "Guest settings",
+ "guest-settings": "Guest Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
"topic-views.enabled": "Allow guests to increase topic view counts",
diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js
index 591ad5d22b..de7cd48096 100644
--- a/public/src/admin/settings.js
+++ b/public/src/admin/settings.js
@@ -13,13 +13,14 @@ define('admin/settings', [
const mainHader = $('[component="settings/main/header"]');
if (headers.length > 1 && tocList.length) {
- headers.each(function () {
- const header = $(this).text();
- const anchor = header.toLowerCase()
- .replace(/ /g, '-')
- .replace(/&/g, '-')
- .trim();
- $(this).parent().attr('id', anchor);
+ headers.each(function (i) {
+ const $this = $(this);
+ const header = $this.text();
+ const anchor = $this.parent().attr('id') || `section${i + 1}`;
+ // for elements that don't have id use section{index}
+ if (anchor.startsWith('section')) {
+ $this.parent().attr('id', anchor);
+ }
tocList.append(`${header}`);
});
const offset = mainHader.outerHeight(true);
diff --git a/src/middleware/render.js b/src/middleware/render.js
index ac7121d6f8..afae14cdae 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -258,6 +258,7 @@ module.exports = function (middleware) {
latestVersion: getLatestVersion(),
privileges: privileges.admin.get(req.uid),
tags: meta.tags.parse(req, {}, [], []),
+ languageDirection: translator.translate('[[language:dir]]', res.locals.config.acpLang),
});
const { userData } = results;
@@ -294,6 +295,9 @@ module.exports = function (middleware) {
latestVersion: results.latestVersion,
upgradeAvailable: results.latestVersion && semver.gt(results.latestVersion, version),
showManageMenu: results.privileges.superadmin || ['categories', 'privileges', 'users', 'admins-mods', 'groups', 'tags', 'settings'].some(priv => results.privileges[`admin:${priv}`]),
+ defaultLang: meta.config.defaultLang || 'en-GB',
+ acpLang: res.locals.config.acpLang,
+ languageDirection: results.languageDirection,
};
templateValues.template = { name: res.locals.template };
diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl
index 3f0874457f..501c64f8cc 100644
--- a/src/views/admin/header.tpl
+++ b/src/views/admin/header.tpl
@@ -1,5 +1,5 @@
-
+
{title}
diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl
index 8251181f9a..fc3fcc4b8f 100644
--- a/src/views/admin/settings/advanced.tpl
+++ b/src/views/admin/settings/advanced.tpl
@@ -3,7 +3,7 @@