Merge branch 'main' into bookwyrm-groups

There are database migrations in main ahead of this branch so they need to be merged in to the branch before we can merge back into main.

bookwyrm/migrations/0107_alter_user_preferred_language.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.2.5 on 2021-10-11 16:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0106_user_preferred_language"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="preferred_language",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("en-us", "English"),
+                    ("de-de", "Deutsch (German)"),
+                    ("es", "Español (Spanish)"),
+                    ("fr-fr", "Français (French)"),
+                    ("pt-br", "Português - Brasil (Brazilian Portugues)"),
+                    ("zh-hans", "简体中文 (Simplified Chinese)"),
+                    ("zh-hant", "繁體中文 (Traditional Chinese)"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]

bookwyrm/migrations/0108_alter_user_preferred_language.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.2.5 on 2021-10-11 17:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0107_alter_user_preferred_language"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="preferred_language",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("en-us", "English"),
+                    ("de-de", "Deutsch (German)"),
+                    ("es-es", "Español (Spanish)"),
+                    ("fr-fr", "Français (French)"),
+                    ("pt-br", "Português - Brasil (Brazilian Portuguese)"),
+                    ("zh-hans", "简体中文 (Simplified Chinese)"),
+                    ("zh-hant", "繁體中文 (Traditional Chinese)"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]

bookwyrm/migrations/0109_status_edited_date.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.5 on 2021-10-15 15:54
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0108_alter_user_preferred_language"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="status",
+            name="edited_date",
+            field=bookwyrm.models.fields.DateTimeField(blank=True, null=True),
+        ),
+    ]

bookwyrm/migrations/0110_auto_20211015_1734.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.5 on 2021-10-15 17:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0109_status_edited_date"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="quotation",
+            name="raw_quote",
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="status",
+            name="raw_content",
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]