diff --git a/js/package-lock.json b/js/package-lock.json index a5ce051e6..854dcb0a3 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "@flarum/core", "dependencies": { - "@askvortsov/rich-icu-message-formatter": "^0.1.0", - "@ultraq/icu-message-formatter": "^0.10.1", + "@askvortsov/rich-icu-message-formatter": "^0.2.1", + "@ultraq/icu-message-formatter": "^0.12.0", "bootstrap": "^3.4.1", "clsx": "^1.1.1", "color-thief-browser": "^2.0.2", @@ -40,13 +40,14 @@ } }, "node_modules/@askvortsov/rich-icu-message-formatter": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@askvortsov/rich-icu-message-formatter/-/rich-icu-message-formatter-0.1.0.tgz", - "integrity": "sha512-ZSHJZRqtopZljPcoCoyA4K+ORB/CpZKy2yJrZDsRdMB9MaQIKSCMx97WsHMU+VpW4nr8rUxfkE0eqvUlCBu9yQ==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@askvortsov/rich-icu-message-formatter/-/rich-icu-message-formatter-0.2.1.tgz", + "integrity": "sha512-Gw+FBqsFCIu2+A79gZ6XV68DtAdEj37uRHUDTR9kqLDdWgSK9bVbOWkIl5K1DUnU1ZytffNagVmRF4T1FM11lA==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.11.2", "@ultraq/array-utils": "^2.1.0", - "@ultraq/icu-message-formatter": "^0.10.0" + "@ultraq/icu-message-formatter": "^0.12.0" }, "engines": { "node": ">=10" @@ -1846,16 +1847,17 @@ } }, "node_modules/@ultraq/icu-message-formatter": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@ultraq/icu-message-formatter/-/icu-message-formatter-0.10.1.tgz", - "integrity": "sha512-UxhC0wQvDmeQSZ/4RtxO62czV8fjV/T6A0JU9zjGS0eK+ho0WeTixnEUJ0vNikFBqUkaopl+HDjrsvTDXm5W+A==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@ultraq/icu-message-formatter/-/icu-message-formatter-0.12.0.tgz", + "integrity": "sha512-ebd/ZyC1lCVPPrX3AQ9h77NDK4d1nor0Grmv43e97+omWvJB29lbuT+9yM3sq4Ri1QKwTvKG1BUhXBz0oAAR2w==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", "@ultraq/array-utils": "^2.1.0", "@ultraq/function-utils": "^0.3.0" }, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/@webassemblyjs/ast": { @@ -7383,13 +7385,13 @@ }, "dependencies": { "@askvortsov/rich-icu-message-formatter": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@askvortsov/rich-icu-message-formatter/-/rich-icu-message-formatter-0.1.0.tgz", - "integrity": "sha512-ZSHJZRqtopZljPcoCoyA4K+ORB/CpZKy2yJrZDsRdMB9MaQIKSCMx97WsHMU+VpW4nr8rUxfkE0eqvUlCBu9yQ==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@askvortsov/rich-icu-message-formatter/-/rich-icu-message-formatter-0.2.1.tgz", + "integrity": "sha512-Gw+FBqsFCIu2+A79gZ6XV68DtAdEj37uRHUDTR9kqLDdWgSK9bVbOWkIl5K1DUnU1ZytffNagVmRF4T1FM11lA==", "requires": { "@babel/runtime": "^7.11.2", "@ultraq/array-utils": "^2.1.0", - "@ultraq/icu-message-formatter": "^0.10.0" + "@ultraq/icu-message-formatter": "^0.12.0" } }, "@babel/code-frame": { @@ -8645,9 +8647,9 @@ "integrity": "sha512-AwFCYorRn0GE34hfgxaCmfnReHqcwWE6QwWPQf/1Zj7k3Zi0FATSJhbtDA+6ayV8p6AnhEntntXaMWMkK17tEQ==" }, "@ultraq/icu-message-formatter": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@ultraq/icu-message-formatter/-/icu-message-formatter-0.10.1.tgz", - "integrity": "sha512-UxhC0wQvDmeQSZ/4RtxO62czV8fjV/T6A0JU9zjGS0eK+ho0WeTixnEUJ0vNikFBqUkaopl+HDjrsvTDXm5W+A==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@ultraq/icu-message-formatter/-/icu-message-formatter-0.12.0.tgz", + "integrity": "sha512-ebd/ZyC1lCVPPrX3AQ9h77NDK4d1nor0Grmv43e97+omWvJB29lbuT+9yM3sq4Ri1QKwTvKG1BUhXBz0oAAR2w==", "requires": { "@babel/runtime": "^7.11.2", "@ultraq/array-utils": "^2.1.0", diff --git a/js/package.json b/js/package.json index 5e2000640..a5a676e8b 100644 --- a/js/package.json +++ b/js/package.json @@ -3,8 +3,8 @@ "name": "@flarum/core", "prettier": "@flarum/prettier-config", "dependencies": { - "@askvortsov/rich-icu-message-formatter": "^0.1.0", - "@ultraq/icu-message-formatter": "^0.10.1", + "@askvortsov/rich-icu-message-formatter": "^0.2.1", + "@ultraq/icu-message-formatter": "^0.12.0", "bootstrap": "^3.4.1", "clsx": "^1.1.1", "color-thief-browser": "^2.0.2", diff --git a/js/src/common/Translator.tsx b/js/src/common/Translator.tsx index 2d2036ff3..8830ecd80 100644 --- a/js/src/common/Translator.tsx +++ b/js/src/common/Translator.tsx @@ -55,16 +55,7 @@ export default class Translator { if (!parameters.username) parameters.username = username(user); } - const escapedParameters: TranslatorParameters = {}; - - for (const param in parameters) { - const paramValue = parameters[param]; - - if (typeof paramValue === 'string') escapedParameters[param] = <>{parameters[param]}; - else escapedParameters[param] = parameters[param]; - } - - return escapedParameters; + return parameters; } trans(id: string, parameters: TranslatorParameters = {}) {