diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2014-03-03 14:27:22 +0800 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2014-03-03 14:27:22 +0800 |
| commit | 55ba92a9c9fc22ce5482c1a7d18ffb0003be2b80 (patch) | |
| tree | 2042fb3b7cf45242e757875da99134ba86f0af26 | |
| parent | 57e08aa23247141db58c244f01afda52110b86b7 (diff) | |
Edited contrib.sites check messages for grammar and consistency.
| -rw-r--r-- | django/contrib/sites/managers.py | 6 | ||||
| -rw-r--r-- | tests/sites_framework/tests.py | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/django/contrib/sites/managers.py b/django/contrib/sites/managers.py index 28e3168017..d5ed93c791 100644 --- a/django/contrib/sites/managers.py +++ b/django/contrib/sites/managers.py @@ -27,8 +27,7 @@ class CurrentSiteManager(models.Manager): return [ checks.Error( "CurrentSiteManager could not find a field named '%s'." % field_name, - hint=('Ensure that you did not misspell the field name. ' - 'Does the field exist?'), + hint=None, obj=self, id='sites.E001', ) @@ -37,8 +36,7 @@ class CurrentSiteManager(models.Manager): if not isinstance(field, (models.ForeignKey, models.ManyToManyField)): return [ checks.Error( - "CurrentSiteManager requires that '%s.%s' must be a " - "ForeignKey or ManyToManyField." % ( + "CurrentSiteManager cannot use '%s.%s' as it is not a ForeignKey or ManyToManyField." % ( self.model._meta.object_name, field_name ), hint=None, diff --git a/tests/sites_framework/tests.py b/tests/sites_framework/tests.py index 680d5d4fb2..97d01e1d57 100644 --- a/tests/sites_framework/tests.py +++ b/tests/sites_framework/tests.py @@ -51,8 +51,7 @@ class SitesFrameworkTestCase(TestCase): checks.Error( ("CurrentSiteManager could not find a field named " "'places_this_article_should_appear'."), - hint=('Ensure that you did not misspell the field name. ' - 'Does the field exist?'), + hint=None, obj=InvalidArticle.on_site, id='sites.E001', ) @@ -67,7 +66,7 @@ class SitesFrameworkTestCase(TestCase): errors = ConfusedArticle.check() expected = [ checks.Error( - "CurrentSiteManager requires that 'ConfusedArticle.site' must be a ForeignKey or ManyToManyField.", + "CurrentSiteManager cannot use 'ConfusedArticle.site' as it is not a ForeignKey or ManyToManyField.", hint=None, obj=ConfusedArticle.on_site, id='sites.E002', |