From 8b8cd1ab4d3744d7d2046a78a255404f0c1a118b Mon Sep 17 00:00:00 2001 From: Elisabeth Kulzer Date: Mon, 4 Jan 2021 16:05:10 +0100 Subject: [PATCH] Add check for empty translation source strings (#5044) * Update sha * Update check-deps cache Co-authored-by: Mattermod --- .circleci/config.yml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- scripts/precommit/i18n.sh | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a269a7081..9dc13c355 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -255,7 +255,7 @@ jobs: steps: # Taken from https://github.com/entur/owasp-orb/blob/master/src/%40orb.yml#L349-L361 - owasp/generate_cache_keys: - cache_key: commmandline-default-cache-key-v6 + cache_key: commmandline-default-cache-key-v7 - owasp/restore_owasp_cache - run: name: Update OWASP Dependency-Check Database diff --git a/package-lock.json b/package-lock.json index 8d4e99dbc..8fa26a954 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23718,8 +23718,8 @@ } }, "mmjstool": { - "version": "github:mattermost/mattermost-utilities#519b99a4e51e6c67a0dbd46a6efdff27dc835aaa", - "from": "github:mattermost/mattermost-utilities#519b99a4e51e6c67a0dbd46a6efdff27dc835aaa", + "version": "github:mattermost/mattermost-utilities#3faa6075089a541d8c90ed85114e644c7a23fedf", + "from": "github:mattermost/mattermost-utilities#3faa6075089a541d8c90ed85114e644c7a23fedf", "dev": true, "requires": { "estree-walk": "2.2.0", diff --git a/package.json b/package.json index e47e7c884..7408f78ed 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "jetifier": "1.6.6", "jsdom-global": "3.0.2", "metro-react-native-babel-preset": "0.64.0", - "mmjstool": "github:mattermost/mattermost-utilities#519b99a4e51e6c67a0dbd46a6efdff27dc835aaa", + "mmjstool": "github:mattermost/mattermost-utilities#3faa6075089a541d8c90ed85114e644c7a23fedf", "mock-async-storage": "2.2.0", "mock-socket": "9.0.3", "nock": "13.0.5", diff --git a/scripts/precommit/i18n.sh b/scripts/precommit/i18n.sh index d15d9222a..67c1c0943 100755 --- a/scripts/precommit/i18n.sh +++ b/scripts/precommit/i18n.sh @@ -9,6 +9,7 @@ npm run mmjstool -- i18n extract-mobile --webapp-dir tmp/fake-webapp-dir --mobil diff tmp/en.json assets/base/i18n/en.json # Address weblate behavior which does not remove whole translation item when translation string is set to empty npm run mmjstool -- i18n clean-empty --webapp-dir tmp/fake-webapp-dir --mobile-dir . --check +npm run mmjstool -- i18n check-empty-src --webapp-dir tmp/fake-webapp-dir --mobile-dir . rm -rf tmp