From d715d82c2463c0a8d16ed63b6f7f84aa0d830542 Mon Sep 17 00:00:00 2001 From: Alireza Mohammadi Date: Sat, 15 Jul 2017 16:16:16 +0000 Subject: [PATCH] Better punctuation during state change by adding \" before and after old and new state. Fixes issue #1545. - Legacy-Id: 13913 --- ietf/doc/views_charter.py | 6 +++--- ietf/sync/iana.py | 2 +- ietf/sync/tests.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py index 37d70c845..d05e872b8 100644 --- a/ietf/doc/views_charter.py +++ b/ietf/doc/views_charter.py @@ -103,7 +103,7 @@ def change_state(request, name, option=None): e.time = group.time e.by = by e.state_id = group.state.slug - e.desc = "Group state changed to %s from %s" % (group.state, oldstate) + e.desc = "Group state changed to \"%s\" from \"%s\"" % (group.state, oldstate) e.save() else: @@ -145,7 +145,7 @@ def change_state(request, name, option=None): email_charter_internal_review(request,charter) if message or charter_state.slug == "intrev" or charter_state.slug == "extrev": - email_admin_re_charter(request, group, "Charter state changed to %s" % charter_state.name, message,'charter_state_edit_admin_needed') + email_admin_re_charter(request, group, "Charter state changed to \"%s\"" % charter_state.name, message,'charter_state_edit_admin_needed') # TODO - do we need a seperate set of recipients for state changes to charters vrs other kind of documents email_state_changed(request, charter, "State changed to %s." % charter_state, 'doc_state_edited') @@ -729,7 +729,7 @@ def approve(request, name): charter.save_with_history(events) - email_admin_re_charter(request, group, "Charter state changed to %s" % new_charter_state.name, change_description,'charter_state_edit_admin_needed') + email_admin_re_charter(request, group, "Charter state changed to \"%s\"" % new_charter_state.name, change_description,'charter_state_edit_admin_needed') # move milestones over milestones_to_delete = list(group.groupmilestone_set.filter(state__in=("active", "review"))) diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py index 574fdead1..23c88c1dd 100644 --- a/ietf/sync/iana.py +++ b/ietf/sync/iana.py @@ -207,7 +207,7 @@ def update_history_with_changes(changes, send_email=True): doc.save_with_history([e]) if send_email and (state != prev_state): - email_state_changed(None, doc, "IANA %s state changed to %s" % (kind, state.name),'doc_iana_state_changed') + email_state_changed(None, doc, "IANA %s state changed to \"%s\"" % (kind, state.name),'doc_iana_state_changed') return added_events, warnings diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py index e03f6c746..09a6b37f8 100644 --- a/ietf/sync/tests.py +++ b/ietf/sync/tests.py @@ -79,7 +79,7 @@ class IANASyncTests(TestCase): self.assertEqual(draft.get_state_slug("draft-iana-review"), "not-ok") self.assertEqual(draft.get_state_slug("draft-iana-action"), "waitrfc") e = draft.latest_event(StateDocEvent, type="changed_state", state_type="draft-iana-action") - self.assertEqual(e.desc, "IANA Action state changed to Waiting on RFC Editor from In Progress") + self.assertEqual(e.desc, "IANA Action state changed to \"Waiting on RFC Editor\" from \"In Progress\"") # self.assertEqual(e.time, datetime.datetime(2011, 10, 9, 5, 0)) # check timezone handling self.assertEqual(len(outbox), 3 ) for m in outbox: