From 4847f13de047443b668cf07fe7d05448279093ad Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@gmail.com>
Date: Sun, 2 Jul 2017 11:43:23 +1000
Subject: [PATCH] Use Linux Australia for release and not pycon

Update the recording and materials release to say Linux Australia, not
Pycon Australia. This generates a migration because the model text has
change - but also because in the 0001_initial migration it appears that
this help text is stored as a byte string.

This is a bit weird, but realistically running this migration is not
going to cause us any problems so just add it so we don't end up
fighting django along the way.
---
 .../migrations/0002_auto_20170702_1140.py     | 45 +++++++++++++++++++
 pinaxcon/proposals/models.py                  |  4 +-
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pinaxcon/proposals/migrations/0002_auto_20170702_1140.py

diff --git a/pinaxcon/proposals/migrations/0002_auto_20170702_1140.py b/pinaxcon/proposals/migrations/0002_auto_20170702_1140.py
new file mode 100644
index 00000000..985d5158
--- /dev/null
+++ b/pinaxcon/proposals/migrations/0002_auto_20170702_1140.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2017-07-02 01:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='talkproposal',
+            name='materials_release',
+            field=models.BooleanField(default=True, help_text="I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
+        ),
+        migrations.AlterField(
+            model_name='talkproposal',
+            name='recording_release',
+            field=models.BooleanField(default=True, help_text="I allow Linux Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
+        ),
+        migrations.AlterField(
+            model_name='talkproposal',
+            name='target_audience',
+            field=models.IntegerField(choices=[(1, 'User'), (2, 'Business'), (3, 'Community'), (4, 'Developer')]),
+        ),
+        migrations.AlterField(
+            model_name='tutorialproposal',
+            name='materials_release',
+            field=models.BooleanField(default=True, help_text="I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
+        ),
+        migrations.AlterField(
+            model_name='tutorialproposal',
+            name='recording_release',
+            field=models.BooleanField(default=True, help_text="I allow Linux Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
+        ),
+        migrations.AlterField(
+            model_name='tutorialproposal',
+            name='target_audience',
+            field=models.IntegerField(choices=[(1, 'User'), (2, 'Business'), (3, 'Community'), (4, 'Developer')]),
+        ),
+    ]
diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py
index fbc7fb9f..0fc53891 100644
--- a/pinaxcon/proposals/models.py
+++ b/pinaxcon/proposals/models.py
@@ -21,7 +21,7 @@ class Proposal(ProposalBase):
 
     recording_release = models.BooleanField(
         default=True,
-        help_text="I allow PyCon Australia to release any recordings of "
+        help_text="I allow Linux Australia to release any recordings of "
         "presentations covered by this proposal, under the <a "
         "href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> "
         "Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"
@@ -29,7 +29,7 @@ class Proposal(ProposalBase):
 
     materials_release = models.BooleanField(
         default=True,
-        help_text="I allow PyCon Australia to release any other material "
+        help_text="I allow Linux Australia to release any other material "
         "(such as slides) from presentations covered by this proposal, under "
         "the <a "
         "href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> "