diff --git a/bookwyrm/migrations/0126_auto_20220112_2315.py b/bookwyrm/migrations/0126_auto_20220112_2315.py new file mode 100644 index 00000000..23645d96 --- /dev/null +++ b/bookwyrm/migrations/0126_auto_20220112_2315.py @@ -0,0 +1,55 @@ +# Generated by Django 3.2.10 on 2022-01-12 23:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0125_alter_user_preferred_language"), + ] + + operations = [ + migrations.AlterField( + model_name="annualgoal", + name="privacy", + field=models.CharField( + choices=[ + ("public", "Public"), + ("unlisted", "Unlisted"), + ("followers", "Followers"), + ("direct", "Private"), + ], + default="public", + max_length=255, + ), + ), + migrations.AlterField( + model_name="importjob", + name="privacy", + field=models.CharField( + choices=[ + ("public", "Public"), + ("unlisted", "Unlisted"), + ("followers", "Followers"), + ("direct", "Private"), + ], + default="public", + max_length=255, + ), + ), + migrations.AlterField( + model_name="user", + name="default_post_privacy", + field=models.CharField( + choices=[ + ("public", "Public"), + ("unlisted", "Unlisted"), + ("followers", "Followers"), + ("direct", "Private"), + ], + default="public", + max_length=255, + ), + ), + ] diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 7d14f88f..0edcd8fd 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -203,9 +203,12 @@ class UsernameField(ActivitypubFieldMixin, models.CharField): return value.split("@")[0] -PrivacyLevels = models.TextChoices( - "Privacy", ["public", "unlisted", "followers", "direct"] -) +PrivacyLevels = [ + ("public", _("Public")), + ("unlisted", _("Unlisted")), + ("followers", _("Followers")), + ("direct", _("Private")), +] class PrivacyField(ActivitypubFieldMixin, models.CharField): @@ -214,9 +217,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField): public = "https://www.w3.org/ns/activitystreams#Public" def __init__(self, *args, **kwargs): - super().__init__( - *args, max_length=255, choices=PrivacyLevels.choices, default="public" - ) + super().__init__(*args, max_length=255, choices=PrivacyLevels, default="public") # pylint: disable=invalid-name def set_field_from_activity(self, instance, data, overwrite=True): diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index 919bbf0d..bcba391b 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -40,9 +40,7 @@ class ImportJob(models.Model): mappings = models.JSONField() complete = models.BooleanField(default=False) source = models.CharField(max_length=100) - privacy = models.CharField( - max_length=255, default="public", choices=PrivacyLevels.choices - ) + privacy = models.CharField(max_length=255, default="public", choices=PrivacyLevels) retry = models.BooleanField(default=False) @property diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index bd340b01..a63d3f15 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -129,7 +129,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): related_name="favorite_statuses", ) default_post_privacy = models.CharField( - max_length=255, default="public", choices=fields.PrivacyLevels.choices + max_length=255, default="public", choices=fields.PrivacyLevels ) remote_id = fields.RemoteIdField(null=True, unique=True, activitypub_field="id") created_date = models.DateTimeField(auto_now_add=True) @@ -427,7 +427,7 @@ class AnnualGoal(BookWyrmModel): goal = models.IntegerField(validators=[MinValueValidator(1)]) year = models.IntegerField(default=get_current_year) privacy = models.CharField( - max_length=255, default="public", choices=fields.PrivacyLevels.choices + max_length=255, default="public", choices=fields.PrivacyLevels ) class Meta: diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html index b18eb4e9..642d177c 100644 --- a/bookwyrm/templates/preferences/edit_user.html +++ b/bookwyrm/templates/preferences/edit_user.html @@ -34,26 +34,26 @@
{{ form.avatar }} - {% include 'snippets/form_errors.html' with errors_list=form.avatar.errors id="desc_avatar" %} + {% include 'snippets/form_errors.html' with errors_list=form.avatar.errors id="desc_avatar" %}
{{ form.name }} - {% include 'snippets/form_errors.html' with errors_list=form.name.errors id="desc_name" %} + {% include 'snippets/form_errors.html' with errors_list=form.name.errors id="desc_name" %}
{{ form.summary }} - {% include 'snippets/form_errors.html' with errors_list=form.summary.errors id="desc_summary" %} + {% include 'snippets/form_errors.html' with errors_list=form.summary.errors id="desc_summary" %}
{{ form.email }} - {% include 'snippets/form_errors.html' with errors_list=form.email.errors id="desc_email" %} + {% include 'snippets/form_errors.html' with errors_list=form.email.errors id="desc_email" %}