Merged in [13503] from rjsparks@nostrum.com:

levkowetz · levkowetz · commit b3fe24d76bb7 · 2017-06-04T21:49:43.000Z
Add usernames to the email sent to the secretariat when a possible duplicate person has been detected. Fixes ietf-tools#2307. - Legacy-Id: 13521 Note: SVN reference [13503] has been migrated to Git commit d330b8d
diff --git a/bin/count.c b/bin/count.c
@@ -13,7 +13,7 @@ int main( void )
     c = fgetc(stdin);
     while(c != EOF)
     {
-	if (c == '.') count++;
+	if (c=='.' || c=='E' || c=='F') count++;
 	fputc(c, stdout);
 	fflush(stdout);
 	if ( count % 76 == 0) {
diff --git a/ietf/templates/person/mail/possible_duplicates.txt b/ietf/templates/person/mail/possible_duplicates.txt
@@ -9,9 +9,10 @@ There are now {{persons|length}} Person objects sharing that name.
 Please check to see if they represent the same actual person, and if so, merge the objects as appropriate.
 
 {% for person in persons %}Person {{forloop.counter}} {{ person.name }} (pk={{person.pk}})
-    time:    {{person.time}}
-    ascii:   {{person.ascii}}
-    email:   {% for email in person.email_set.all %}{{ email.address }} {% endfor %}
-    aliases: {{ person.alias_set.all|join:", " }}
+    time:     {{person.time}}
+    ascii:    {{person.ascii}}
+    email:    {% for email in person.email_set.all %}{{ email.address }} {% endfor %}
+    aliases:  {{ person.alias_set.all|join:", " }}
+    username: {% if person.user %}{{person.user.username}}{% else %}None{% endif %}
 
 {% endfor %} {% endautoescape %}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ int main( void )`
`13`	`13`	`c = fgetc(stdin);`
`14`	`14`	`while(c != EOF)`
`15`	`15`	`{`
`16`		`- if (c == '.') count++;`
	`16`	`+ if (c=='.' \|\| c=='E' \|\| c=='F') count++;`
`17`	`17`	`fputc(c, stdout);`
`18`	`18`	`fflush(stdout);`
`19`	`19`	`if ( count % 76 == 0) {`