Skip to content

Commit 4087a98

Browse files
committed
End help_texts with period consistently - the default error rendering in the bootstrap3 library depends on it
- Legacy-Id: 8940
1 parent 8c5f79e commit 4087a98

15 files changed

Lines changed: 64 additions & 66 deletions

File tree

ietf/doc/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
3434
self.fields['ad'].choices = list(choices) + [("", "-------"), (ad_pk, Person.objects.get(pk=ad_pk).plain_name())]
3535

3636
class NotifyForm(forms.Form):
37-
notify = forms.CharField(max_length=255, help_text="List of email addresses to receive state notifications, separated by comma", label="Notification list", required=False)
37+
notify = forms.CharField(max_length=255, help_text="List of email addresses to receive state notifications, separated by comma.", label="Notification list", required=False)
3838

3939
def clean_notify(self):
4040
addrspecs = [x.strip() for x in self.cleaned_data["notify"].split(',')]

ietf/doc/views_charter.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
class ChangeStateForm(forms.Form):
3434
charter_state = forms.ModelChoiceField(State.objects.filter(used=True, type="charter"), label="Charter state", empty_label=None, required=False)
3535
initial_time = forms.IntegerField(initial=0, label="Review time", help_text="(in weeks)", required=False)
36-
message = forms.CharField(widget=forms.Textarea, help_text="Leave blank to change state without notifying the Secretariat", required=False, label=mark_safe("Message to the Secretariat"))
37-
comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the charter history", required=False)
36+
message = forms.CharField(widget=forms.Textarea, help_text="Leave blank to change state without notifying the Secretariat.", required=False, label=mark_safe("Message to the Secretariat"))
37+
comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the charter history.", required=False)
3838
def __init__(self, *args, **kwargs):
3939
self.hide = kwargs.pop('hide', None)
4040
group = kwargs.pop('group')
@@ -225,9 +225,9 @@ def state_pk(slug):
225225
context_instance=RequestContext(request))
226226

227227
class ChangeTitleForm(forms.Form):
228-
charter_title = forms.CharField(widget=forms.TextInput, label="Charter title", help_text="Enter new charter title", required=True)
229-
message = forms.CharField(widget=forms.Textarea, help_text="Leave blank to change the title without notifying the Secretariat", required=False, label=mark_safe("Message to Secretariat"))
230-
comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the charter history", required=False)
228+
charter_title = forms.CharField(widget=forms.TextInput, label="Charter title", help_text="Enter new charter title.", required=True)
229+
message = forms.CharField(widget=forms.Textarea, help_text="Leave blank to change the title without notifying the Secretariat.", required=False, label=mark_safe("Message to Secretariat"))
230+
comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the charter history.", required=False)
231231
def __init__(self, *args, **kwargs):
232232
charter = kwargs.pop('charter')
233233
super(ChangeTitleForm, self).__init__(*args, **kwargs)
@@ -328,8 +328,8 @@ def edit_ad(request, name):
328328

329329

330330
class UploadForm(forms.Form):
331-
content = forms.CharField(widget=forms.Textarea, label="Charter text", help_text="Edit the charter text", required=False)
332-
txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file", required=False)
331+
content = forms.CharField(widget=forms.Textarea, label="Charter text", help_text="Edit the charter text.", required=False)
332+
txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file.", required=False)
333333

334334
def clean_content(self):
335335
return self.cleaned_data["content"].replace("\r", "")

ietf/doc/views_conflict_review.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
class ChangeStateForm(forms.Form):
2525
review_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev"), label="Conflict review state", empty_label=None, required=True)
26-
comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history", required=False)
26+
comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history.", required=False)
2727

2828
@role_required("Area Director", "Secretariat")
2929
def change_state(request, name, option=None):
@@ -114,8 +114,8 @@ def send_conflict_eval_email(request,review):
114114
msg)
115115

116116
class UploadForm(forms.Form):
117-
content = forms.CharField(widget=forms.Textarea, label="Conflict review response", help_text="Edit the conflict review response", required=False)
118-
txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file", required=False)
117+
content = forms.CharField(widget=forms.Textarea, label="Conflict review response", help_text="Edit the conflict review response.", required=False)
118+
txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file.", required=False)
119119

120120
def clean_content(self):
121121
return self.cleaned_data["content"].replace("\r", "")
@@ -265,7 +265,7 @@ def default_approval_text(review):
265265

266266

267267
class AnnouncementForm(forms.Form):
268-
announcement_text = forms.CharField(widget=forms.Textarea, label="IETF Conflict Review Announcement", help_text="Edit the announcement message", required=True)
268+
announcement_text = forms.CharField(widget=forms.Textarea, label="IETF Conflict Review Announcement", help_text="Edit the announcement message.", required=True)
269269

270270
@role_required("Secretariat")
271271
def approve(request, name):
@@ -324,13 +324,13 @@ def approve(request, name):
324324
context_instance=RequestContext(request))
325325

326326
class SimpleStartReviewForm(forms.Form):
327-
notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)
327+
notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
328328

329329
class StartReviewForm(forms.Form):
330330
ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'),
331331
label="Shepherding AD", empty_label="(None)", required=True)
332332
create_in_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev", slug__in=("needshep", "adrev")), empty_label=None, required=False)
333-
notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)
333+
notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
334334
telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False, widget=forms.Select(attrs={'onchange':'make_bold()'}))
335335

336336
def __init__(self, *args, **kwargs):

ietf/doc/views_draft.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ class EditInfoForm(forms.Form):
459459
area = forms.ModelChoiceField(Group.objects.filter(type="area", state="active"), empty_label="(None - individual submission)", required=False, label="Assigned to area")
460460
ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'), label="Responsible AD", empty_label="(None)", required=True)
461461
create_in_state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg", slug__in=("pub-req", "watching")), empty_label=None, required=False)
462-
notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)
462+
notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
463463
note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False)
464464
telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False, widget=forms.Select(attrs={'onchange':'make_bold()'}))
465465
returning_item = forms.BooleanField(required=False)
@@ -850,8 +850,8 @@ def edit_iesg_note(request, name):
850850
context_instance=RequestContext(request))
851851

852852
class ShepherdWriteupUploadForm(forms.Form):
853-
content = forms.CharField(widget=forms.Textarea, label="Shepherd writeup", help_text="Edit the shepherd writeup", required=False)
854-
txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file", required=False)
853+
content = forms.CharField(widget=forms.Textarea, label="Shepherd writeup", help_text="Edit the shepherd writeup.", required=False)
854+
txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file.", required=False)
855855

856856
def clean_content(self):
857857
return self.cleaned_data["content"].replace("\r", "")
@@ -1197,7 +1197,7 @@ def request_publication(request, name):
11971197
class AdoptDraftForm(forms.Form):
11981198
group = forms.ModelChoiceField(queryset=Group.objects.filter(type__in=["wg", "rg"], state="active").order_by("-type", "acronym"), required=True, empty_label=None)
11991199
newstate = forms.ModelChoiceField(queryset=State.objects.filter(type__in=['draft-stream-ietf','draft-stream-irtf'],slug__in=['wg-cand', 'c-adopt', 'adopt-wg', 'info', 'wg-doc', 'candidat','active']),required=True,label="State")
1200-
comment = forms.CharField(widget=forms.Textarea, required=False, label="Comment", help_text="Optional comment explaining the reasons for the adoption")
1200+
comment = forms.CharField(widget=forms.Textarea, required=False, label="Comment", help_text="Optional comment explaining the reasons for the adoption.")
12011201
weeks = forms.IntegerField(required=False, label="Expected weeks in adoption state")
12021202

12031203
def __init__(self, *args, **kwargs):
@@ -1310,7 +1310,7 @@ def adopt_draft(request, name):
13101310
class ChangeStreamStateForm(forms.Form):
13111311
new_state = forms.ModelChoiceField(queryset=State.objects.filter(used=True), label='State', help_text=u"Only select 'Submitted to IESG for Publication' to correct errors. Use the document's main page to request publication.")
13121312
weeks = forms.IntegerField(label='Expected weeks in state',required=False)
1313-
comment = forms.CharField(widget=forms.Textarea, required=False, help_text="Optional comment for the document history")
1313+
comment = forms.CharField(widget=forms.Textarea, required=False, help_text="Optional comment for the document history.")
13141314
tags = forms.ModelMultipleChoiceField(queryset=DocTagName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False)
13151315

13161316
def __init__(self, *args, **kwargs):

ietf/doc/views_status_change.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
class ChangeStateForm(forms.Form):
2727
new_state = forms.ModelChoiceField(State.objects.filter(type="statchg", used=True), label="Status Change Evaluation State", empty_label=None, required=True)
28-
comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history", required=False)
28+
comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history.", required=False)
2929

3030

3131
@role_required("Area Director", "Secretariat")
@@ -109,8 +109,8 @@ def send_status_change_eval_email(request,doc):
109109
send_mail_preformatted(request,msg)
110110

111111
class UploadForm(forms.Form):
112-
content = forms.CharField(widget=forms.Textarea, label="Status change text", help_text="Edit the status change text", required=False)
113-
txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file", required=False)
112+
content = forms.CharField(widget=forms.Textarea, label="Status change text", help_text="Edit the status change text.", required=False)
113+
txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file.", required=False)
114114

115115
def clean_content(self):
116116
return self.cleaned_data["content"].replace("\r", "")
@@ -306,7 +306,7 @@ def default_approval_text(status_change,relateddoc):
306306
from django.forms.formsets import formset_factory
307307

308308
class AnnouncementForm(forms.Form):
309-
announcement_text = forms.CharField(widget=forms.Textarea, label="Status Change Announcement", help_text="Edit the announcement message", required=True)
309+
announcement_text = forms.CharField(widget=forms.Textarea, label="Status Change Announcement", help_text="Edit the announcement message.", required=True)
310310
label = None
311311

312312
def __init__(self, *args, **kwargs):
@@ -436,12 +436,12 @@ def clean(self):
436436
return clean_helper(self,EditStatusChangeForm)
437437

438438
class StartStatusChangeForm(forms.Form):
439-
document_name = forms.CharField(max_length=255, label="Document name", help_text="A descriptive name such as status-change-md2-to-historic is better than status-change-rfc1319", required=True)
439+
document_name = forms.CharField(max_length=255, label="Document name", help_text="A descriptive name such as status-change-md2-to-historic is better than status-change-rfc1319.", required=True)
440440
title = forms.CharField(max_length=255, label="Title", required=True)
441441
ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'),
442442
label="Shepherding AD", empty_label="(None)", required=True)
443443
create_in_state = forms.ModelChoiceField(State.objects.filter(type="statchg", slug__in=("needshep", "adrev")), empty_label=None, required=False)
444-
notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)
444+
notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
445445
telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False, widget=forms.Select(attrs={'onchange':'make_bold()'}))
446446
relations={}
447447

ietf/group/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class GroupInfo(models.Model):
2424
list_archive = models.CharField(max_length=255, blank=True)
2525
comments = models.TextField(blank=True)
2626

27-
unused_states = models.ManyToManyField('doc.State', help_text="Document states that have been disabled for the group", blank=True)
28-
unused_tags = models.ManyToManyField(DocTagName, help_text="Document tags that have been disabled for the group", blank=True)
27+
unused_states = models.ManyToManyField('doc.State', help_text="Document states that have been disabled for the group.", blank=True)
28+
unused_tags = models.ManyToManyField(DocTagName, help_text="Document tags that have been disabled for the group.", blank=True)
2929

3030
def __unicode__(self):
3131
return self.name
@@ -149,7 +149,7 @@ class GroupMilestoneInfo(models.Model):
149149
state = models.ForeignKey(GroupMilestoneStateName)
150150
desc = models.CharField(verbose_name="Description", max_length=500)
151151
due = models.DateField()
152-
resolved = models.CharField(max_length=50, blank=True, help_text="Explanation of why milestone is resolved (usually \"Done\"), or empty if still due")
152+
resolved = models.CharField(max_length=50, blank=True, help_text="Explanation of why milestone is resolved (usually \"Done\"), or empty if still due.")
153153

154154
docs = models.ManyToManyField('doc.Document', blank=True)
155155

@@ -209,7 +209,7 @@ class Role(models.Model):
209209
name = models.ForeignKey(RoleName)
210210
group = models.ForeignKey(Group)
211211
person = models.ForeignKey(Person)
212-
email = models.ForeignKey(Email, help_text="Email address used by person for this role")
212+
email = models.ForeignKey(Email, help_text="Email address used by person for this role.")
213213
def __unicode__(self):
214214
return u"%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym or self.group.name)
215215

@@ -224,7 +224,7 @@ class RoleHistory(models.Model):
224224
name = models.ForeignKey(RoleName)
225225
group = models.ForeignKey(GroupHistory)
226226
person = models.ForeignKey(Person)
227-
email = models.ForeignKey(Email, help_text="Email address used by person for this role")
227+
email = models.ForeignKey(Email, help_text="Email address used by person for this role.")
228228
def __unicode__(self):
229229
return u"%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym)
230230

ietf/ipr/forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class GenericDisclosureForm(forms.Form):
113113
holder_contact_info = forms.CharField(label="Other Info (address, phone, etc.)", max_length=255,widget=forms.Textarea,required=False)
114114
submitter_name = forms.CharField(max_length=255,required=False)
115115
submitter_email = forms.EmailField(required=False)
116-
patent_info = forms.CharField(max_length=255,widget=forms.Textarea, required=False, help_text="Patent, Serial, Publication, Registration, or Application/File number(s), Date(s) granted or applied for, Country, and any additional notes")
116+
patent_info = forms.CharField(max_length=255,widget=forms.Textarea, required=False, help_text="Patent, Serial, Publication, Registration, or Application/File number(s), Date(s) granted or applied for, Country, and any additional notes.")
117117
has_patent_pending = forms.BooleanField(required=False)
118118
statement = forms.CharField(max_length=255,widget=forms.Textarea,required=False)
119119
updates = SearchableIprDisclosuresField(required=False, help_text="If this disclosure <strong>updates</strong> other disclosures identify here which ones. Leave this field blank if this disclosure does not update any prior disclosures. <strong>Note</strong>: Updates to IPR disclosures must only be made by authorized representatives of the original submitters. Updates will automatically be forwarded to the current Patent Holder's Contact and to the Submitter of the original IPR disclosure.")
@@ -233,7 +233,7 @@ class Meta:
233233
exclude = [ 'by','docs','state','rel' ]
234234

235235
class MessageModelForm(forms.ModelForm):
236-
response_due = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, required=False, help_text='The date which a response is due')
236+
response_due = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, required=False, help_text='The date which a response is due.')
237237

238238
class Meta:
239239
model = Message

ietf/liaisons/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class LiaisonForm(forms.Form):
2828
to_poc = forms.CharField(widget=ReadOnlyWidget, label="POC", required=False)
2929
response_contact = forms.CharField(required=False, max_length=255)
3030
technical_contact = forms.CharField(required=False, max_length=255)
31-
cc1 = forms.CharField(widget=forms.Textarea, label="CC", required=False, help_text='Please insert one email address per line')
31+
cc1 = forms.CharField(widget=forms.Textarea, label="CC", required=False, help_text='Please insert one email address per line.')
3232
purpose = forms.ChoiceField()
3333
related_to = SearchableLiaisonStatementField(label=u'Related Liaison Statement', required=False)
3434
deadline_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Deadline', required=True)

ietf/liaisons/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ class LiaisonStatement(models.Model):
1616

1717
related_to = models.ForeignKey('LiaisonStatement', blank=True, null=True)
1818

19-
from_group = models.ForeignKey(Group, related_name="liaisonstatement_from_set", null=True, blank=True, help_text="Sender group, if it exists")
20-
from_name = models.CharField(max_length=255, help_text="Name of the sender body")
19+
from_group = models.ForeignKey(Group, related_name="liaisonstatement_from_set", null=True, blank=True, help_text="Sender group, if it exists.")
20+
from_name = models.CharField(max_length=255, help_text="Name of the sender body.")
2121
from_contact = models.ForeignKey(Email, blank=True, null=True)
22-
to_group = models.ForeignKey(Group, related_name="liaisonstatement_to_set", null=True, blank=True, help_text="Recipient group, if it exists")
23-
to_name = models.CharField(max_length=255, help_text="Name of the recipient body")
24-
to_contact = models.CharField(blank=True, max_length=255, help_text="Contacts at recipient body")
22+
to_group = models.ForeignKey(Group, related_name="liaisonstatement_to_set", null=True, blank=True, help_text="Recipient group, if it exists.")
23+
to_name = models.CharField(max_length=255, help_text="Name of the recipient body.")
24+
to_contact = models.CharField(blank=True, max_length=255, help_text="Contacts at recipient body.")
2525

2626
reply_to = models.CharField(blank=True, max_length=255)
2727

0 commit comments

Comments
 (0)