From 617dd777a0c972c3fcd0dd0a826c1fe54acbaadf Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 29 Feb 2024 09:52:41 +0000 Subject: [PATCH 1/2] Prevent "Element" hardcoded in i18n files Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/static_analysis.yaml | 2 ++ package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml index 1d041cd3ac..2caa342b6b 100644 --- a/.github/workflows/static_analysis.yaml +++ b/.github/workflows/static_analysis.yaml @@ -31,6 +31,8 @@ jobs: i18n_lint: name: "i18n Check" uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main + with: + hardcoded-words: "Element" js_lint: name: "ESLint" diff --git a/package.json b/package.json index b52a932f0e..59d807a3fb 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "jest-mock": "^29.0.0", "jest-raw-loader": "^1.0.1", "matrix-mock-request": "^2.5.0", - "matrix-web-i18n": "^3.1.3", + "matrix-web-i18n": "^3.2.0", "mini-css-extract-plugin": "^2.7.6", "minimist": "^1.2.6", "mkdirp": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index a63f247838..f5255cdf86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8698,10 +8698,10 @@ matrix-mock-request@^2.5.0: uuid "^9.0.0" what-input "^5.2.10" -matrix-web-i18n@^3.1.3: - version "3.1.5" - resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.1.5.tgz#cab9adb233b63b3760d6e40f71fff8041c648789" - integrity sha512-xe9Letv1KT04X7CalnK080cRUBvlVum5fSspaxPJ575W/+ZEwwN2mktF7Bl5gDMpuFLuXvP97xkr66BOB4I+3g== +matrix-web-i18n@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.2.0.tgz#45df533ba6e2ae98e1d1984132a1972e6dc6e490" + integrity sha512-dq/1s6jxRL8OIv653WetS99Hy8WsoE8dCYqvQTngfVaUp+D0WLRssFevbPJZNftU/3ZWi8fx4jL7aoWg9iIo3A== dependencies: "@babel/parser" "^7.18.5" "@babel/traverse" "^7.18.5" From 7856a2aac3442774b64c287a6ec39a5dfbd67e76 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 29 Feb 2024 10:43:50 +0000 Subject: [PATCH 2/2] Update matrix-web-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 59d807a3fb..2f0e1405bc 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "jest-mock": "^29.0.0", "jest-raw-loader": "^1.0.1", "matrix-mock-request": "^2.5.0", - "matrix-web-i18n": "^3.2.0", + "matrix-web-i18n": "^3.2.1", "mini-css-extract-plugin": "^2.7.6", "minimist": "^1.2.6", "mkdirp": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index f5255cdf86..66962f37dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8698,10 +8698,10 @@ matrix-mock-request@^2.5.0: uuid "^9.0.0" what-input "^5.2.10" -matrix-web-i18n@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.2.0.tgz#45df533ba6e2ae98e1d1984132a1972e6dc6e490" - integrity sha512-dq/1s6jxRL8OIv653WetS99Hy8WsoE8dCYqvQTngfVaUp+D0WLRssFevbPJZNftU/3ZWi8fx4jL7aoWg9iIo3A== +matrix-web-i18n@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.2.1.tgz#34e6b66bec71a52fddbe72db56d9e35dabbaff59" + integrity sha512-pBklE6Q6mAwG6N3Qtpu/e+qX0XuWEdrs4SZ+QmYJWfyLNtKAB6XcSpE5m7aBW/+11ejg8ua8Q5bNcDV2b7C9lg== dependencies: "@babel/parser" "^7.18.5" "@babel/traverse" "^7.18.5"