Skip to content

Commit 35ef324

Browse files
committed
Tweaked the field names of Person name fields to make the intended use clearer.
- Legacy-Id: 11140
1 parent d45ea54 commit 35ef324

3 files changed

Lines changed: 54 additions & 4 deletions

File tree

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('person', '0005_deactivate_unknown_email'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='person',
16+
name='ascii',
17+
field=models.CharField(max_length=255, verbose_name=b'Full Name (ASCII)'),
18+
preserve_default=True,
19+
),
20+
migrations.AlterField(
21+
model_name='person',
22+
name='ascii_short',
23+
field=models.CharField(max_length=32, null=True, verbose_name=b'Abbreviated Name (ASCII)', blank=True),
24+
preserve_default=True,
25+
),
26+
migrations.AlterField(
27+
model_name='person',
28+
name='name',
29+
field=models.CharField(max_length=255, verbose_name=b'Full Name (Unicode)', db_index=True),
30+
preserve_default=True,
31+
),
32+
migrations.AlterField(
33+
model_name='personhistory',
34+
name='ascii',
35+
field=models.CharField(max_length=255, verbose_name=b'Full Name (ASCII)'),
36+
preserve_default=True,
37+
),
38+
migrations.AlterField(
39+
model_name='personhistory',
40+
name='ascii_short',
41+
field=models.CharField(max_length=32, null=True, verbose_name=b'Abbreviated Name (ASCII)', blank=True),
42+
preserve_default=True,
43+
),
44+
migrations.AlterField(
45+
model_name='personhistory',
46+
name='name',
47+
field=models.CharField(max_length=255, verbose_name=b'Full Name (Unicode)', db_index=True),
48+
preserve_default=True,
49+
),
50+
]

ietf/person/models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
class PersonInfo(models.Model):
1616
time = models.DateTimeField(default=datetime.datetime.now) # When this Person record entered the system
17-
name = models.CharField(max_length=255, db_index=True) # The normal unicode form of the name. This must be
17+
name = models.CharField("Full Name (Unicode)", max_length=255, db_index=True) # The normal unicode form of the name. This must be
1818
# set to the same value as the ascii-form if equal.
19-
ascii = models.CharField(max_length=255) # The normal ascii-form of the name.
20-
ascii_short = models.CharField(max_length=32, null=True, blank=True) # The short ascii-form of the name. Also in alias table if non-null
19+
ascii = models.CharField("Full Name (ASCII)", max_length=255) # The normal ascii-form of the name.
20+
ascii_short = models.CharField("Abbreviated Name (ASCII)", max_length=32, null=True, blank=True) # The short ascii-form of the name. Also in alias table if non-null
2121
address = models.TextField(max_length=255, blank=True)
2222
affiliation = models.CharField(max_length=255, blank=True)
2323

ietf/templates/registration/edit_profile.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ <h1>Profile for {{ user.username }}</h1>
8888
</div>
8989

9090
<div class="form-group">
91-
<label class="col-sm-2 control-label">{{person_form.ascii.label|upper}}</label>
91+
<label class="col-sm-2 control-label">{{person_form.ascii.label}}</label>
9292
<div class="col-sm-10">
9393
<div class="row">
9494
<div class="col-sm-5">

0 commit comments

Comments
 (0)