summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-07-17 13:45:20 -0400
committerTim Graham <timograham@gmail.com>2015-07-17 14:07:18 -0400
commite25ba6e8bb6054a2c5592ade12ec6fe095ba75d1 (patch)
treeedd2cc737db84dee1ee664b20246a716b1e444d1
parentf8cc464452f495fce2a3d6f7494396c8f798a1e6 (diff)
Refs #25073 -- Copied recently added verbose_names to migrations.
-rw-r--r--django/contrib/admin/migrations/0001_initial.py4
-rw-r--r--django/contrib/auth/migrations/0001_initial.py2
-rw-r--r--django/contrib/flatpages/migrations/0001_initial.py2
-rw-r--r--django/contrib/redirects/migrations/0001_initial.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/admin/migrations/0001_initial.py b/django/contrib/admin/migrations/0001_initial.py
index 088d36becd..0360f59269 100644
--- a/django/contrib/admin/migrations/0001_initial.py
+++ b/django/contrib/admin/migrations/0001_initial.py
@@ -23,8 +23,8 @@ class Migration(migrations.Migration):
('object_repr', models.CharField(max_length=200, verbose_name='object repr')),
('action_flag', models.PositiveSmallIntegerField(verbose_name='action flag')),
('change_message', models.TextField(verbose_name='change message', blank=True)),
- ('content_type', models.ForeignKey(to_field='id', blank=True, to='contenttypes.ContentType', null=True)),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+ ('content_type', models.ForeignKey(to_field='id', blank=True, to='contenttypes.ContentType', null=True, verbose_name='content type')),
+ ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='user')),
],
options={
'ordering': ('-action_time',),
diff --git a/django/contrib/auth/migrations/0001_initial.py b/django/contrib/auth/migrations/0001_initial.py
index a58f73ab1a..2c2960f6be 100644
--- a/django/contrib/auth/migrations/0001_initial.py
+++ b/django/contrib/auth/migrations/0001_initial.py
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(max_length=50, verbose_name='name')),
- ('content_type', models.ForeignKey(to='contenttypes.ContentType', to_field='id')),
+ ('content_type', models.ForeignKey(to='contenttypes.ContentType', to_field='id', verbose_name='content type')),
('codename', models.CharField(max_length=100, verbose_name='codename')),
],
options={
diff --git a/django/contrib/flatpages/migrations/0001_initial.py b/django/contrib/flatpages/migrations/0001_initial.py
index fe0a3f3374..3281e54bf6 100644
--- a/django/contrib/flatpages/migrations/0001_initial.py
+++ b/django/contrib/flatpages/migrations/0001_initial.py
@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
('enable_comments', models.BooleanField(default=False, verbose_name='enable comments')),
('template_name', models.CharField(help_text="Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'.", max_length=70, verbose_name='template name', blank=True)),
('registration_required', models.BooleanField(default=False, help_text='If this is checked, only logged-in users will be able to view the page.', verbose_name='registration required')),
- ('sites', models.ManyToManyField(to='sites.Site')),
+ ('sites', models.ManyToManyField(to='sites.Site', verbose_name='sites')),
],
options={
'ordering': ('url',),
diff --git a/django/contrib/redirects/migrations/0001_initial.py b/django/contrib/redirects/migrations/0001_initial.py
index 49906348bf..8d4da06d26 100644
--- a/django/contrib/redirects/migrations/0001_initial.py
+++ b/django/contrib/redirects/migrations/0001_initial.py
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
name='Redirect',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('site', models.ForeignKey(to='sites.Site', to_field='id')),
+ ('site', models.ForeignKey(to='sites.Site', to_field='id', verbose_name='site')),
('old_path', models.CharField(help_text="This should be an absolute path, excluding the domain name. Example: '/events/search/'.", max_length=200, verbose_name='redirect from', db_index=True)),
('new_path', models.CharField(help_text="This can be either an absolute path (as above) or a full URL starting with 'http://'.", max_length=200, verbose_name='redirect to', blank=True)),
],