From be6065e6a54f3de45f6e370051bc3a9efff37d71 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 1 Sep 2016 12:04:43 +0000
Subject: [PATCH] Manual post naming and string tweaks  - Legacy-Id: 11918

---
 ietf/mailtrigger/migrations/0006_auto_20160707_1933.py | 6 +++---
 ietf/mailtrigger/utils.py                              | 2 +-
 ietf/name/fixtures/names.json                          | 6 +++---
 ietf/submit/migrations/0012_auto_20160414_1902.py      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ietf/mailtrigger/migrations/0006_auto_20160707_1933.py b/ietf/mailtrigger/migrations/0006_auto_20160707_1933.py
index d4b3300de..0064e1ebc 100644
--- a/ietf/mailtrigger/migrations/0006_auto_20160707_1933.py
+++ b/ietf/mailtrigger/migrations/0006_auto_20160707_1933.py
@@ -10,15 +10,15 @@ def forward(apps, schema_editor):
 
     rc = Recipient.objects.create
 
-    rc(slug='manualpost_message',
-       desc='The IETF manual post processing system',
+    rc(slug='submission_manualpost_handling',
+       desc='IETF manual post handling',
        template='<ietf-manualpost@ietf.org>')
 
 
 def reverse(apps, schema_editor):
     Recipient=apps.get_model('mailtrigger','Recipient')
 
-    Recipient.objects.filter(slug='manualpost_message').delete()
+    Recipient.objects.filter(slug='submission_manualpost_handling').delete()
 
 
 class Migration(migrations.Migration):
diff --git a/ietf/mailtrigger/utils.py b/ietf/mailtrigger/utils.py
index 4c779af82..bf336d004 100644
--- a/ietf/mailtrigger/utils.py
+++ b/ietf/mailtrigger/utils.py
@@ -81,7 +81,7 @@ def gather_relevant_expansions(**kwargs):
     return sorted(rule_list)
 
 def get_base_submission_message_address():
-    return Recipient.objects.get(slug='manualpost_message').gather()[0]
+    return Recipient.objects.get(slug='submission_manualpost_handling').gather()[0]
 
 def get_base_ipr_request_address():
     return Recipient.objects.get(slug='ipr_requests').gather()[0]
diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
index 439d73f2e..fc5cfe190 100644
--- a/ietf/name/fixtures/names.json
+++ b/ietf/name/fixtures/names.json
@@ -880,7 +880,7 @@
    "posted"
   ],
   "used": true,
-  "name": "Manual Post Awaiting Draft",
+  "name": "Manual Post Waiting for Draft",
   "desc": ""
  },
  "model": "name.draftsubmissionstatename",
@@ -4920,10 +4920,10 @@
 {
  "fields": {
   "template": "<ietf-manualpost@ietf.org>",
-  "desc": "The IETF manual post processing system"
+  "desc": "IETF manual post handling"
  },
  "model": "mailtrigger.recipient",
- "pk": "manualpost_message"
+ "pk": "submission_manualpost_handling"
 },
 {
  "fields": {
diff --git a/ietf/submit/migrations/0012_auto_20160414_1902.py b/ietf/submit/migrations/0012_auto_20160414_1902.py
index 2f5315158..6c52b5bf1 100644
--- a/ietf/submit/migrations/0012_auto_20160414_1902.py
+++ b/ietf/submit/migrations/0012_auto_20160414_1902.py
@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
         # version than this migration expects. We use the historical version.
         DraftSubmissionStateName = apps.get_model("name", "DraftSubmissionStateName")
         DraftSubmissionStateName.objects.create(slug="waiting-for-draft",
-                                                name="Manual Post Awaiting Draft Upload",
+                                                name="Manual Post Waiting for Draft",
                                                 desc="",
                                                 used=True,
                                                 order=8)