Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-05 14:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'kaedroho-core-verbose-names-cleanup'

Browse source
This commit is contained in:
Matt Westcott 2015-09-02 19:51:14 +01:00
commit b42f3d4776
3 changed files with 47 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailadmin/tests/test_edit_handlers.py
View file

@ -424,7 +424,7 @@ class TestPageChooserPanel(TestCase):
'barbecue',
'wagtailcore.site'
).bind_to_model(PageChooserModel).target_content_type()[0]
self.assertEqual(result.name, 'Site')
self.assertEqual(result.name, 'site')
def test_target_content_type_malformed_type(self):
result = PageChooserPanel(

34
wagtail/wagtailcore/migrations/0019_verbose_names_cleanup.py Normal file
View file

@ -0,0 +1,34 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('wagtailcore', '0018_pagerevision_submitted_for_moderation_index'),
]
operations = [
migrations.AlterModelOptions(
name='grouppagepermission',
options={'verbose_name': 'group page permission', 'verbose_name_plural': 'group page permissions'},
),
migrations.AlterModelOptions(
name='page',
options={'verbose_name': 'page', 'verbose_name_plural': 'pages'},
),
migrations.AlterModelOptions(
name='pagerevision',
options={'verbose_name': 'page revision', 'verbose_name_plural': 'page revisions'},
),
migrations.AlterModelOptions(
name='pageviewrestriction',
options={'verbose_name': 'page view restriction', 'verbose_name_plural': 'page view restrictions'},
),
migrations.AlterModelOptions(
name='site',
options={'verbose_name': 'site', 'verbose_name_plural': 'sites'},
),
]

16
wagtail/wagtailcore/models.py
View file

@ -59,7 +59,8 @@ class Site(models.Model):
class Meta:
unique_together = ('hostname', 'port')
verbose_name = _('Site')
verbose_name = _('site')
verbose_name_plural = _('sites')
def natural_key(self):
return (self.hostname, self.port)
@ -1025,6 +1026,10 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, index.Indexed
context['action_url'] = action_url
return TemplateResponse(request, self.password_required_template, context)
class Meta:
verbose_name = _('page')
verbose_name_plural = _('pages')
def get_navigation_menu_items():
# Get all pages that appear in the navigation menu: ones which have children,
@ -1200,7 +1205,8 @@ class PageRevision(models.Model):
return '"' + six.text_type(self.page) + '" at ' + six.text_type(self.created_at)
class Meta:
verbose_name = _('Page Revision')
verbose_name = _('page revision')
verbose_name_plural = _('page revisions')
PAGE_PERMISSION_TYPE_CHOICES = [
@ -1218,7 +1224,8 @@ class GroupPagePermission(models.Model):
class Meta:
unique_together = ('group', 'page', 'permission_type')
verbose_name = _('Group Page Permission')
verbose_name = _('group page permission')
verbose_name_plural = _('group page permissions')
class UserPagePermissionsProxy(object):
@ -1444,4 +1451,5 @@ class PageViewRestriction(models.Model):
password = models.CharField(verbose_name=_('Password'), max_length=255)
class Meta:
verbose_name = _('Page View Restriction')
verbose_name = _('page view restriction')
verbose_name_plural = _('page view restrictions')