Use readable/translatable strings for db choices

bookwyrm/migrations/0095_auto_20210911_2053.py

@@ -0,0 +1,45 @@
+# Generated by Django 3.2.4 on 2021-09-11 20:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0094_auto_20210911_1550"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="connector",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("pending", "Pending"),
+                    ("self_deletion", "Self deletion"),
+                    ("moderator_suspension", "Moderator suspension"),
+                    ("moderator_deletion", "Moderator deletion"),
+                    ("domain_block", "Domain block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("pending", "Pending"),
+                    ("self_deletion", "Self deletion"),
+                    ("moderator_suspension", "Moderator suspension"),
+                    ("moderator_deletion", "Moderator deletion"),
+                    ("domain_block", "Domain block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]

bookwyrm/models/base_model.py

@@ -3,21 +3,19 @@ import base64
 from Crypto import Random
 from django.db import models
 from django.dispatch import receiver
+from django.utils.translation import gettext_lazy as _
 
 from bookwyrm.settings import DOMAIN
 from .fields import RemoteIdField
 
 
-DeactivationReason = models.TextChoices(
-    "DeactivationReason",
-    [
-        "pending",
-        "self_deletion",
-        "moderator_suspension",
-        "moderator_deletion",
-        "domain_block",
-    ],
-)
+DeactivationReason = [
+    ("pending", _("Pending")),
+    ("self_deletion", _("Self deletion")),
+    ("moderator_suspension", _("Moderator suspension")),
+    ("moderator_deletion", _("Moderator deletion")),
+    ("domain_block", _("Domain block")),
+]
 
 
 def new_access_code():

bookwyrm/models/connector.py

@@ -19,7 +19,7 @@ class Connector(BookWyrmModel):
     api_key = models.CharField(max_length=255, null=True, blank=True)
     active = models.BooleanField(default=True)
     deactivation_reason = models.CharField(
-        max_length=255, choices=DeactivationReason.choices, null=True, blank=True
+        max_length=255, choices=DeactivationReason, null=True, blank=True
     )
 
     base_url = models.CharField(max_length=255)

bookwyrm/models/federated_server.py

@@ -1,16 +1,16 @@
 """ connections to external ActivityPub servers """
 from urllib.parse import urlparse
+
 from django.apps import apps
 from django.db import models
+from django.utils.translation import gettext_lazy as _
+
 from .base_model import BookWyrmModel
 
-FederationStatus = models.TextChoices(
-    "Status",
-    [
-        "federated",
-        "blocked",
-    ],
-)
+FederationStatus = [
+    ("federated", _("Federated")),
+    ("blocked", _("Blocked")),
+]
 
 
 class FederatedServer(BookWyrmModel):
@@ -18,7 +18,7 @@ class FederatedServer(BookWyrmModel):
 
     server_name = models.CharField(max_length=255, unique=True)
     status = models.CharField(
-        max_length=255, default="federated", choices=FederationStatus.choices
+        max_length=255, default="federated", choices=FederationStatus
     )
     # is it mastodon, bookwyrm, etc
     application_type = models.CharField(max_length=255, null=True, blank=True)

bookwyrm/models/user.py

@@ -134,7 +134,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         max_length=255,
     )
     deactivation_reason = models.CharField(
-        max_length=255, choices=DeactivationReason.choices, null=True, blank=True
+        max_length=255, choices=DeactivationReason, null=True, blank=True
     )
     deactivation_date = models.DateTimeField(null=True, blank=True)
     confirmation_code = models.CharField(max_length=32, default=new_access_code)

bookwyrm/templates/settings/federated_server.html

@@ -29,7 +29,7 @@
                 </div>
                 <div class="is-flex">
                     <dt>{% trans "Status:" %}</dt>
-                    <dd>{{ server.status }}</dd>
+                    <dd>{{ server.get_status_display }}</dd>
                 </div>
             </dl>
         </div>

bookwyrm/templates/settings/federation.html

@@ -34,7 +34,7 @@
         <td><a href="{% url 'settings-federated-server' server.id %}">{{ server.server_name }}</a></td>
         <td>{{ server.created_date }}</td>
         <td>{{ server.application_type }} ({{ server.application_version }})</td>
-        <td>{{ server.status }}</td>
+        <td>{{ server.get_status_display }}</td>
     </tr>
     {% endfor %}
 </table>

bookwyrm/templates/user_admin/user_info.html

@@ -27,7 +27,7 @@
             <p class="notification is-warning">
                 {% trans "Inactive" %}
                 {% if user.deactivation_reason %}
-                ({{ user.deactivation_reason }})
+                <span class="help">({% trans user.get_deactivation_reason_display %})</span>
                 {% endif %}
             </p>
             {% endif %}