innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Edited contrib.sites check messages for grammar and consistency.

This commit is contained in:
Russell Keith-Magee 2014-03-03 14:27:22 +08:00
parent 57e08aa232
commit 55ba92a9c9
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/sites/managers.py
View File

@ -27,8 +27,7 @@ class CurrentSiteManager(models.Manager):
return [ return [
checks.Error( checks.Error(
"CurrentSiteManager could not find a field named '%s'." % field_name, "CurrentSiteManager could not find a field named '%s'." % field_name,
hint=('Ensure that you did not misspell the field name. ' hint=None,
'Does the field exist?'),
obj=self, obj=self,
id='sites.E001', id='sites.E001',
) )
@ -37,8 +36,7 @@ class CurrentSiteManager(models.Manager):
if not isinstance(field, (models.ForeignKey, models.ManyToManyField)): if not isinstance(field, (models.ForeignKey, models.ManyToManyField)):
return [ return [
checks.Error( checks.Error(
"CurrentSiteManager requires that '%s.%s' must be a " "CurrentSiteManager cannot use '%s.%s' as it is not a ForeignKey or ManyToManyField." % (
"ForeignKey or ManyToManyField." % (
self.model._meta.object_name, field_name self.model._meta.object_name, field_name
), ),
hint=None, hint=None,

5
tests/sites_framework/tests.py
View File

@ -51,8 +51,7 @@ class SitesFrameworkTestCase(TestCase):
checks.Error( checks.Error(
("CurrentSiteManager could not find a field named " ("CurrentSiteManager could not find a field named "
"'places_this_article_should_appear'."), "'places_this_article_should_appear'."),
hint=('Ensure that you did not misspell the field name. ' hint=None,
'Does the field exist?'),
obj=InvalidArticle.on_site, obj=InvalidArticle.on_site,
id='sites.E001', id='sites.E001',
) )
@ -67,7 +66,7 @@ class SitesFrameworkTestCase(TestCase):
errors = ConfusedArticle.check() errors = ConfusedArticle.check()
expected = [ expected = [
checks.Error( 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, hint=None,
obj=ConfusedArticle.on_site, obj=ConfusedArticle.on_site,
id='sites.E002', id='sites.E002',