diff options
| -rw-r--r-- | django/core/checks/model_checks.py | 4 | ||||
| -rw-r--r-- | docs/howto/writing-migrations.txt | 2 | ||||
| -rw-r--r-- | docs/ref/checks.txt | 4 | ||||
| -rw-r--r-- | docs/ref/forms/fields.txt | 4 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.9.txt | 2 | ||||
| -rw-r--r-- | docs/releases/2.1.15.txt | 2 | ||||
| -rw-r--r-- | docs/releases/2.2.8.txt | 2 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 1 | ||||
| -rw-r--r-- | docs/topics/db/queries.txt | 2 | ||||
| -rw-r--r-- | docs/topics/files.txt | 6 | ||||
| -rw-r--r-- | tests/cache/tests.py | 4 | ||||
| -rw-r--r-- | tests/check_framework/test_model_checks.py | 12 |
13 files changed, 23 insertions, 24 deletions
diff --git a/django/core/checks/model_checks.py b/django/core/checks/model_checks.py index 7b156fceee..15d9b7fd86 100644 --- a/django/core/checks/model_checks.py +++ b/django/core/checks/model_checks.py @@ -64,7 +64,7 @@ def check_all_models(app_configs=None, **kwargs): Error( "index name '%s' is not unique %s %s." % ( index_name, - 'for model' if len(model_labels) == 1 else 'amongst models:', + 'for model' if len(model_labels) == 1 else 'among models:', ', '.join(sorted(model_labels)), ), id='models.E029' if len(model_labels) == 1 else 'models.E030', @@ -77,7 +77,7 @@ def check_all_models(app_configs=None, **kwargs): Error( "constraint name '%s' is not unique %s %s." % ( constraint_name, - 'for model' if len(model_labels) == 1 else 'amongst models:', + 'for model' if len(model_labels) == 1 else 'among models:', ', '.join(sorted(model_labels)), ), id='models.E031' if len(model_labels) == 1 else 'models.E032', diff --git a/docs/howto/writing-migrations.txt b/docs/howto/writing-migrations.txt index ab1a897aa0..00dc0dfadf 100644 --- a/docs/howto/writing-migrations.txt +++ b/docs/howto/writing-migrations.txt @@ -327,7 +327,7 @@ If you change a :class:`~django.db.models.ManyToManyField` to use a ``through`` model, the default migration will delete the existing table and create a new one, losing the existing relations. To avoid this, you can use :class:`.SeparateDatabaseAndState` to rename the existing table to the new -table name whilst telling the migration autodetector that the new model has +table name while telling the migration autodetector that the new model has been created. You can check the existing table name through :djadmin:`sqlmigrate` or :djadmin:`dbshell`. You can check the new table name with the through model's ``_meta.db_table`` property. Your new ``through`` diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt index 79b8de1591..d5aeca2d8c 100644 --- a/docs/ref/checks.txt +++ b/docs/ref/checks.txt @@ -343,11 +343,11 @@ Models * **models.E028**: ``db_table`` ``<db_table>`` is used by multiple models: ``<model list>``. * **models.E029**: index name ``<index>`` is not unique for model ``<model>``. -* **models.E030**: index name ``<index>`` is not unique amongst models: +* **models.E030**: index name ``<index>`` is not unique among models: ``<model list>``. * **models.E031**: constraint name ``<constraint>`` is not unique for model ``<model>``. -* **models.E032**: constraint name ``<constraint>`` is not unique amongst +* **models.E032**: constraint name ``<constraint>`` is not unique among models: ``<model list>``. * **models.E033**: The index name ``<index>`` cannot start with an underscore or a number. diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 58db957512..d7f3ca17a2 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -711,7 +711,7 @@ For each field, we describe the default widget used if you don't specify After the field has been cleaned and validated, the ``UploadedFile`` object will have an additional ``image`` attribute containing the Pillow `Image`_ instance used to check if the file was a valid image. Pillow - closes the underlying file descriptor after verifying an image, so whilst + closes the underlying file descriptor after verifying an image, so while non-image data attributes, such as ``format``, ``height``, and ``width``, are available, methods that access the underlying image data, such as ``getdata()`` or ``getpixel()``, cannot be used without reopening the file. @@ -1354,7 +1354,7 @@ By default, :class:`ModelChoiceField` and :class:`ModelMultipleChoiceField` use When iterated, ``ModelChoiceIterator`` yields 2-tuple choices containing :class:`ModelChoiceIteratorValue` instances as the first ``value`` element in -each choice. ``ModelChoiceIteratorValue`` wraps the choice value whilst +each choice. ``ModelChoiceIteratorValue`` wraps the choice value while maintaining a reference to the source model instance that can be used in custom widget implementations, for example, to add `data-* attributes`_ to ``<option>`` elements. diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 2e862dbbb7..01ba71c182 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1710,7 +1710,7 @@ to refer to the queryset's model. On PostgreSQL only, you can pass ``no_key=True`` in order to acquire a weaker lock, that still allows creating rows that merely reference locked rows -(through a foreign key, for example) whilst the lock is in place. The +(through a foreign key, for example) while the lock is in place. The PostgreSQL documentation has more details about `row-level lock modes <https://www.postgresql.org/docs/current/explicit-locking.html#LOCKING-ROWS>`_. diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt index 69b41f1c08..07a75fc005 100644 --- a/docs/releases/1.9.txt +++ b/docs/releases/1.9.txt @@ -246,7 +246,7 @@ Minor features * The new :meth:`GDALRaster.warp() <django.contrib.gis.gdal.GDALRaster.warp>` method allows warping a raster by specifying target raster properties such as - origin, width, height, or pixel size (amongst others). + origin, width, height, or pixel size (among others). * The new :meth:`GDALRaster.transform() <django.contrib.gis.gdal.GDALRaster.transform>` method allows transforming a diff --git a/docs/releases/2.1.15.txt b/docs/releases/2.1.15.txt index 6715b369db..bb15f33d17 100644 --- a/docs/releases/2.1.15.txt +++ b/docs/releases/2.1.15.txt @@ -32,7 +32,7 @@ inlines in the admin form of an otherwise view-only parent model. Given the complexity of the Django admin, and in-particular the permissions related checks, it is the view of the Django security team that this change was necessary: that it is not currently feasible to maintain the existing behavior -whilst escaping the potential privilege escalation in a way that would avoid a +while escaping the potential privilege escalation in a way that would avoid a recurrence of similar issues in the future, and that would be compatible with Django's *safe by default* philosophy. diff --git a/docs/releases/2.2.8.txt b/docs/releases/2.2.8.txt index 76a6ad4f23..857ffff048 100644 --- a/docs/releases/2.2.8.txt +++ b/docs/releases/2.2.8.txt @@ -33,7 +33,7 @@ inlines in the admin form of an otherwise view-only parent model. Given the complexity of the Django admin, and in-particular the permissions related checks, it is the view of the Django security team that this change was necessary: that it is not currently feasible to maintain the existing behavior -whilst escaping the potential privilege escalation in a way that would avoid a +while escaping the potential privilege escalation in a way that would avoid a recurrence of similar issues in the future, and that would be compatible with Django's *safe by default* philosophy. diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index fc33877c86..5a6b53eeef 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -12,7 +12,6 @@ Ai Alchin alphanumerics amet -amongst analytics apnumber app diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt index 2afd500e54..bf154b658d 100644 --- a/docs/topics/db/queries.txt +++ b/docs/topics/db/queries.txt @@ -495,7 +495,7 @@ is ``'Beatles Blog'``:: This spanning can be as deep as you'd like. -It works backwards, too. Whilst it :attr:`can be customized +It works backwards, too. While it :attr:`can be customized <.ForeignKey.related_query_name>`, by default you refer to a "reverse" relationship in a lookup using the lowercase name of the model. diff --git a/docs/topics/files.txt b/docs/topics/files.txt index 73d0a11fff..59825023ce 100644 --- a/docs/topics/files.txt +++ b/docs/topics/files.txt @@ -75,9 +75,9 @@ location (:setting:`MEDIA_ROOT` if you are using the default .. note:: - Whilst :class:`~django.db.models.ImageField` non-image data attributes, - such as ``height``, ``width``, and ``size`` are available on the instance, - the underlying image data cannot be used without reopening the image. For + While :class:`~django.db.models.ImageField` non-image data attributes, such + as ``height``, ``width``, and ``size`` are available on the instance, the + underlying image data cannot be used without reopening the image. For example:: >>> from PIL import Image diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 1f0abc8434..75fd7853de 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -1272,8 +1272,8 @@ class BaseMemcachedTests(BaseCacheTests): def _perform_invalid_key_test(self, key, expected_warning): """ - Whilst other backends merely warn, memcached should raise for an - invalid key. + While other backends merely warn, memcached should raise for an invalid + key. """ msg = expected_warning.replace(key, cache.make_key(key)) with self.assertRaisesMessage(InvalidCacheKey, msg): diff --git a/tests/check_framework/test_model_checks.py b/tests/check_framework/test_model_checks.py index 02c36dc610..ce2d73fa20 100644 --- a/tests/check_framework/test_model_checks.py +++ b/tests/check_framework/test_model_checks.py @@ -161,7 +161,7 @@ class IndexNameTests(SimpleTestCase): self.assertEqual(checks.run_checks(app_configs=self.apps.get_app_configs()), [ Error( - "index name 'foo' is not unique amongst models: " + "index name 'foo' is not unique among models: " "check_framework.Model1, check_framework.Model2.", id='models.E030', ), @@ -181,7 +181,7 @@ class IndexNameTests(SimpleTestCase): self.assertEqual(checks.run_checks(app_configs=self.apps.get_app_configs()), [ Error( - "index name 'foo' is not unique amongst models: " + "index name 'foo' is not unique among models: " "check_framework.Model1, check_framework.Model2.", id='models.E030', ), @@ -220,7 +220,7 @@ class IndexNameTests(SimpleTestCase): self.assertEqual(checks.run_checks(app_configs=apps.get_app_configs()), [ Error( - "index name 'foo' is not unique amongst models: basic.Model1, " + "index name 'foo' is not unique among models: basic.Model1, " "check_framework.Model2.", id='models.E030', ), @@ -277,7 +277,7 @@ class ConstraintNameTests(TestCase): self.assertEqual(checks.run_checks(app_configs=self.apps.get_app_configs()), [ Error( - "constraint name 'foo' is not unique amongst models: " + "constraint name 'foo' is not unique among models: " "check_framework.Model1, check_framework.Model2.", id='models.E032', ), @@ -297,7 +297,7 @@ class ConstraintNameTests(TestCase): self.assertEqual(checks.run_checks(app_configs=self.apps.get_app_configs()), [ Error( - "constraint name 'foo' is not unique amongst models: " + "constraint name 'foo' is not unique among models: " "check_framework.Model1, check_framework.Model2.", id='models.E032', ), @@ -336,7 +336,7 @@ class ConstraintNameTests(TestCase): self.assertEqual(checks.run_checks(app_configs=apps.get_app_configs()), [ Error( - "constraint name 'foo' is not unique amongst models: " + "constraint name 'foo' is not unique among models: " "basic.Model1, check_framework.Model2.", id='models.E032', ), |