diff --git a/ietf/doc/migrations/0015_auto_20160927_0713.py b/ietf/doc/migrations/0015_auto_20160927_0713.py index fa127a6d2..18ad77a5d 100644 --- a/ietf/doc/migrations/0015_auto_20160927_0713.py +++ b/ietf/doc/migrations/0015_auto_20160927_0713.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('name', '0015_insert_review_name_data'), ('review', '0001_initial'), - ('doc', '0014_auto_20160824_2218'), + ('doc', '0014_auto_20160524_2147'), ] operations = [ @@ -27,7 +27,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='docevent', name='type', - field=models.CharField(max_length=50, choices=[(b'new_revision', b'Added new revision'), (b'changed_document', b'Changed document metadata'), (b'added_comment', b'Added comment'), (b'deleted', b'Deleted document'), (b'changed_state', b'Changed state'), (b'changed_stream', b'Changed document stream'), (b'expired_document', b'Expired document'), (b'extended_expiry', b'Extended expiry of document'), (b'requested_resurrect', b'Requested resurrect'), (b'completed_resurrect', b'Completed resurrect'), (b'changed_consensus', b'Changed consensus'), (b'published_rfc', b'Published RFC'), (b'added_suggested_replaces', b'Added suggested replacement relationships'), (b'reviewed_suggested_replaces', b'Reviewed suggested replacement relationships'), (b'changed_group', b'Changed group'), (b'changed_protocol_writeup', b'Changed protocol writeup'), (b'changed_charter_milestone', b'Changed charter milestone'), (b'initial_review', b'Set initial review time'), (b'changed_review_announcement', b'Changed WG Review text'), (b'changed_action_announcement', b'Changed WG Action text'), (b'started_iesg_process', b'Started IESG process on document'), (b'created_ballot', b'Created ballot'), (b'closed_ballot', b'Closed ballot'), (b'sent_ballot_announcement', b'Sent ballot announcement'), (b'changed_ballot_position', b'Changed ballot position'), (b'changed_ballot_approval_text', b'Changed ballot approval text'), (b'changed_ballot_writeup_text', b'Changed ballot writeup text'), (b'changed_rfc_editor_note_text', b'Changed RFC Editor Note text'), (b'changed_last_call_text', b'Changed last call text'), (b'requested_last_call', b'Requested last call'), (b'sent_last_call', b'Sent last call'), (b'scheduled_for_telechat', b'Scheduled for telechat'), (b'iesg_approved', b'IESG approved document (no problem)'), (b'iesg_disapproved', b'IESG disapproved document (do not publish)'), (b'approved_in_minute', b'Approved in minute'), (b'iana_review', b'IANA review comment'), (b'rfc_in_iana_registry', b'RFC is in IANA registry'), (b'rfc_editor_received_announcement', b'Announcement was received by RFC Editor'), (b'requested_publication', b'Publication at RFC Editor requested'), (b'sync_from_rfc_editor', b'Received updated information from RFC Editor'), (b'requested_review', b'Requested review'), (b'assigned_review_request', b'Assigned review request'), (b'closed_review_request', b'Closed review request')]), + field=models.CharField(max_length=50, choices=[(b'new_revision', b'Added new revision'), (b'changed_document', b'Changed document metadata'), (b'added_comment', b'Added comment'), (b'added_message', b'Added message'), (b'deleted', b'Deleted document'), (b'changed_state', b'Changed state'), (b'changed_stream', b'Changed document stream'), (b'expired_document', b'Expired document'), (b'extended_expiry', b'Extended expiry of document'), (b'requested_resurrect', b'Requested resurrect'), (b'completed_resurrect', b'Completed resurrect'), (b'changed_consensus', b'Changed consensus'), (b'published_rfc', b'Published RFC'), (b'added_suggested_replaces', b'Added suggested replacement relationships'), (b'reviewed_suggested_replaces', b'Reviewed suggested replacement relationships'), (b'changed_group', b'Changed group'), (b'changed_protocol_writeup', b'Changed protocol writeup'), (b'changed_charter_milestone', b'Changed charter milestone'), (b'initial_review', b'Set initial review time'), (b'changed_review_announcement', b'Changed WG Review text'), (b'changed_action_announcement', b'Changed WG Action text'), (b'started_iesg_process', b'Started IESG process on document'), (b'created_ballot', b'Created ballot'), (b'closed_ballot', b'Closed ballot'), (b'sent_ballot_announcement', b'Sent ballot announcement'), (b'changed_ballot_position', b'Changed ballot position'), (b'changed_ballot_approval_text', b'Changed ballot approval text'), (b'changed_ballot_writeup_text', b'Changed ballot writeup text'), (b'changed_rfc_editor_note_text', b'Changed RFC Editor Note text'), (b'changed_last_call_text', b'Changed last call text'), (b'requested_last_call', b'Requested last call'), (b'sent_last_call', b'Sent last call'), (b'scheduled_for_telechat', b'Scheduled for telechat'), (b'iesg_approved', b'IESG approved document (no problem)'), (b'iesg_disapproved', b'IESG disapproved document (do not publish)'), (b'approved_in_minute', b'Approved in minute'), (b'iana_review', b'IANA review comment'), (b'rfc_in_iana_registry', b'RFC is in IANA registry'), (b'rfc_editor_received_announcement', b'Announcement was received by RFC Editor'), (b'requested_publication', b'Publication at RFC Editor requested'), (b'sync_from_rfc_editor', b'Received updated information from RFC Editor'), (b'requested_review', b'Requested review'), (b'assigned_review_request', b'Assigned review request'), (b'closed_review_request', b'Closed review request')]), preserve_default=True, ), ] diff --git a/ietf/name/migrations/0016_auto_20161013_1010.py b/ietf/name/migrations/0016_auto_20161013_1010.py new file mode 100644 index 000000000..f40fe2751 --- /dev/null +++ b/ietf/name/migrations/0016_auto_20161013_1010.py @@ -0,0 +1,138 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('name', '0015_insert_review_name_data'), + ] + + operations = [ + migrations.AlterModelOptions( + name='ballotpositionname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='constraintname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='dbtemplatetypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='docrelationshipname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='docremindertypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='doctagname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='doctypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='draftsubmissionstatename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='feedbacktypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='groupmilestonestatename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='groupstatename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='grouptypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='intendedstdlevelname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='iprdisclosurestatename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='ipreventtypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='iprlicensetypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='liaisonstatementeventtypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='liaisonstatementpurposename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='liaisonstatementstate', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='liaisonstatementtagname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='meetingtypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='nomineepositionstatename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='reviewrequeststatename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='reviewresultname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='reviewtypename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='rolename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='roomresourcename', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='sessionstatusname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='stdlevelname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='streamname', + options={'ordering': ['order', 'name']}, + ), + migrations.AlterModelOptions( + name='timeslottypename', + options={'ordering': ['order', 'name']}, + ), + ] diff --git a/ietf/review/migrations/0001_initial.py b/ietf/review/migrations/0001_initial.py index 7f618abe1..6bb49423c 100644 --- a/ietf/review/migrations/0001_initial.py +++ b/ietf/review/migrations/0001_initial.py @@ -23,6 +23,8 @@ class Migration(migrations.Migration): ('team', models.ForeignKey(to='group.Group')), ], options={ + 'verbose_name': 'next reviewer in team setting', + 'verbose_name_plural': 'next reviewer in team settings', }, bases=(models.Model,), ), @@ -34,6 +36,8 @@ class Migration(migrations.Migration): ('team', models.ForeignKey(to='group.Group')), ], options={ + 'verbose_name': 'review result used in team setting', + 'verbose_name_plural': 'review result used in team settings', }, bases=(models.Model,), ), @@ -44,11 +48,12 @@ class Migration(migrations.Migration): ('min_interval', models.IntegerField(default=30, verbose_name=b'Can review at most', choices=[(7, b'Once per week'), (14, b'Once per fortnight'), (30, b'Once per month'), (61, b'Once per two months'), (91, b'Once per quarter')])), ('filter_re', models.CharField(help_text=b'Draft names matching regular expression should not be assigned', max_length=255, verbose_name=b'Filter regexp', blank=True)), ('skip_next', models.IntegerField(default=0, verbose_name=b'Skip next assignments')), - ('remind_days_before_deadline', models.IntegerField(null=True, blank=True)), + ('remind_days_before_deadline', models.IntegerField(help_text=b"To get an email reminder in case you forget to do an assigned review, enter the number of days before a review deadline you want to receive it. Clear the field if you don't want a reminder.", null=True, blank=True)), ('person', models.ForeignKey(to='person.Person')), ('team', models.ForeignKey(to='group.Group')), ], options={ + 'verbose_name_plural': 'reviewer settings', }, bases=(models.Model,), ), @@ -84,6 +89,7 @@ class Migration(migrations.Migration): ('team', models.ForeignKey(to='group.Group')), ], options={ + 'verbose_name_plural': 'review wishes', }, bases=(models.Model,), ), @@ -95,6 +101,8 @@ class Migration(migrations.Migration): ('type', models.ForeignKey(to='name.ReviewTypeName')), ], options={ + 'verbose_name': 'review type used in team setting', + 'verbose_name_plural': 'review type used in team settings', }, bases=(models.Model,), ),