From 61cb93dea267c0bca45c44e83e783b5cc26b9125 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Fri, 22 Dec 2023 09:18:23 +0000 Subject: [PATCH 1/4] Latest translations and fallbacks --- public/language/nb/admin/settings/user.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/nb/admin/settings/user.json b/public/language/nb/admin/settings/user.json index b0902f0465..7003c8ec3e 100644 --- a/public/language/nb/admin/settings/user.json +++ b/public/language/nb/admin/settings/user.json @@ -82,7 +82,7 @@ "categoryWatchState.tracking": "Tracking", "categoryWatchState.notwatching": "OvervÄker ikke", "categoryWatchState.ignoring": "Ignorerer", - "restrictions-new": "New User Restrictions", + "restrictions-new": "Nye brukerbegrensninger ", "restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted", "restrictions.seconds-between-new": "Seconds between posts for new users", "restrictions.seconds-before-new": "Seconds before a new user can make their first post", From 788404c1d2c4246b4831254cebb7f66602cb0098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 22 Dec 2023 10:17:33 -0500 Subject: [PATCH 2/4] fix: #12243, don' set process.env.config if it doesnt exist --- src/cli/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cli/index.js b/src/cli/index.js index 9f0af71030..56853b8304 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -114,7 +114,9 @@ if (!configExists && process.argv[2] !== 'setup') { return; } -process.env.CONFIG = configFile; +if (configExists) { + process.env.CONFIG = configFile; +} // running commands program From 8165f4545823d81e009e69c713b3a0de1a8cbeaa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 10:19:01 -0500 Subject: [PATCH 3/4] fix(deps): update dependency workerpool to v9.0.4 (#12244) 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 a98053b33f..5fd2368070 100644 --- a/install/package.json +++ b/install/package.json @@ -146,7 +146,7 @@ "webpack": "5.89.0", "webpack-merge": "5.10.0", "winston": "3.11.0", - "workerpool": "9.0.3", + "workerpool": "9.0.4", "xml": "1.0.1", "xregexp": "5.1.1", "yargs": "17.7.2", From 4b87c30f6216bc69d2fb40875d9b1d0da7ab6fbd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 22 Dec 2023 15:52:38 -0500 Subject: [PATCH 4/4] fix: bug where body wasn't properly sent on ap-style content-types --- src/request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/request.js b/src/request.js index e7621eb0e2..bb1a406ebd 100644 --- a/src/request.js +++ b/src/request.js @@ -13,6 +13,7 @@ async function call(url, method, { body, timeout, jar, ...config } = {}) { fetchImpl = fetchCookie(fetch, jar); } + const jsonTest = /application\/([a-z]+\+)?json/; const opts = { ...config, method, @@ -26,7 +27,7 @@ async function call(url, method, { body, timeout, jar, ...config } = {}) { } if (body && ['POST', 'PUT', 'PATCH', 'DEL', 'DELETE'].includes(method)) { - if (opts.headers['content-type'] && opts.headers['content-type'].startsWith('application/json')) { + if (opts.headers['content-type'] && jsonTest.test(opts.headers['content-type'])) { opts.body = JSON.stringify(body); } else { opts.body = body; @@ -37,7 +38,6 @@ async function call(url, method, { body, timeout, jar, ...config } = {}) { const { headers } = response; const contentType = headers.get('content-type'); - const jsonTest = /application\/([a-z]+\+)?json/; const isJSON = contentType && jsonTest.test(contentType); let respBody = await response.text(); if (isJSON && respBody) {