Merge branch 'icu-final' of github.com:SirStendec/weblate into icu-final

WeblateOrg · Sep 24, 2021 · 15851c5 · 15851c5
2 parents 477c7de + d23d14d
commit 15851c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/ci/pip-install b/ci/pip-install
@@ -16,7 +16,7 @@ else
     pip install --upgrade-strategy eager -U -r requirements-optional.txt
     if [ ${1:-latest} = edge ] ; then
         # Needed for Django 4.0 compatibility, see https://github.com/django-compressor/django-compressor/issues/1009
-        pip install --upgrade https://github.com/django-compressor/django-compressor/develop.zip
+        pip install --upgrade https://github.com/django-compressor/django-compressor/archive/refs/heads/develop.zip
         pip install --upgrade https://github.com/translate/translate/archive/master.zip
         pip install --upgrade https://github.com/WeblateOrg/language-data/archive/main.zip
         pip install --upgrade https://github.com/WeblateOrg/translation-finder/archive/main.zip

diff --git a/scripts/yarn/yarn.lock b/scripts/yarn/yarn.lock
@@ -55,9 +55,9 @@
     tslib "^1.9.3"
 
 ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^4.0.0:
   version "4.3.0"

diff --git a/weblate/trans/tests/test_component.py b/weblate/trans/tests/test_component.py
@@ -628,7 +628,11 @@ def test_autolock(self):
 
         change = component.change_set.get(action=Change.ACTION_LOCK)
         self.assertEqual(change.details, {"auto": True})
-        self.assertEqual(change.get_action_display(), "Component automatically locked")
+        self.assertEqual(change.get_action_display(), "Component locked")
+        self.assertEqual(
+            change.get_details_display(),
+            "Component was automatically locked because of an alert.",
+        )
 
         component.add_alert("UpdateFailure")
         self.assertTrue(component.locked)