Merge branch 'main' into openlibrary-author-fields

bookwyrm/migrations/0132_alter_user_preferred_language.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.2.10 on 2022-02-02 20:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0131_merge_20220125_1644"),
+    ]
+
+    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)"),
+                    ("gl-es", "Galego (Galician)"),
+                    ("it-it", "Italiano (Italian)"),
+                    ("fr-fr", "Français (French)"),
+                    ("lt-lt", "Lietuvių (Lithuanian)"),
+                    ("no-no", "Norsk (Norwegian)"),
+                    ("pt-br", "Português do Brasil (Brazilian Portuguese)"),
+                    ("pt-pt", "Português Europeu (European Portuguese)"),
+                    ("sv-se", "Svenska (Swedish)"),
+                    ("zh-hans", "简体中文 (Simplified Chinese)"),
+                    ("zh-hant", "繁體中文 (Traditional Chinese)"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]

bookwyrm/migrations/0133_alter_listitem_notes.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.11 on 2022-02-04 20:06
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0132_alter_user_preferred_language"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="listitem",
+            name="notes",
+            field=bookwyrm.models.fields.HtmlField(
+                blank=True, max_length=300, null=True
+            ),
+        ),
+    ]

bookwyrm/migrations/0134_announcement_display_type.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.11 on 2022-02-11 18:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0133_alter_listitem_notes"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="announcement",
+            name="display_type",
+            field=models.CharField(
+                choices=[
+                    ("white-ter", "None"),
+                    ("primary-light", "Primary"),
+                    ("success-light", "Success"),
+                    ("link-light", "Link"),
+                    ("warning-light", "Warning"),
+                    ("danger-light", "Danger"),
+                ],
+                default="white-ter",
+                max_length=20,
+            ),
+        ),
+    ]