diff --git a/idhub/admin/forms.py b/idhub/admin/forms.py index 4682579..1919a62 100644 --- a/idhub/admin/forms.py +++ b/idhub/admin/forms.py @@ -19,9 +19,9 @@ from idhub_auth.models import User class ImportForm(forms.Form): - did = forms.ChoiceField(choices=[]) - schema = forms.ChoiceField(choices=[]) - file_import = forms.FileField() + did = forms.ChoiceField(label=_("Did"), choices=[]) + schema = forms.ChoiceField(label=_("Schema"), choices=[]) + file_import = forms.FileField(label=_("File import")) def __init__(self, *args, **kwargs): self._schema = None diff --git a/idhub/admin/tables.py b/idhub/admin/tables.py index 078217c..79c22ba 100644 --- a/idhub/admin/tables.py +++ b/idhub/admin/tables.py @@ -19,10 +19,6 @@ class RolesTable(tables.Table): class DashboardTable(tables.Table): - type = tables.Column(verbose_name=_("Event")) - message = tables.Column(verbose_name=_("Description")) - created = tables.Column(verbose_name=_("Date")) - class Meta: model = Event template_name = "idhub/custom_table.html" diff --git a/idhub/models.py b/idhub/models.py index ee7ebed..3aa6ec8 100644 --- a/idhub/models.py +++ b/idhub/models.py @@ -46,9 +46,10 @@ class Event(models.Model): EV_USR_DEACTIVATED_BY_ADMIN = 29, "User deactivated" EV_USR_ACTIVATED_BY_ADMIN = 30, "User activated" - created = models.DateTimeField(auto_now=True) - message = models.CharField(max_length=350) + created = models.DateTimeField(_("Date"), auto_now=True) + message = models.CharField(_("Description"), max_length=350) type = models.PositiveSmallIntegerField( + _("Event"), choices=Types.choices, ) user = models.ForeignKey( @@ -403,7 +404,7 @@ class Event(models.Model): class DID(models.Model): created_at = models.DateTimeField(auto_now=True) - label = models.CharField(max_length=50) + label = models.CharField(_("Label"), max_length=50) did = models.CharField(max_length=250) # In JWK format. Must be stored as-is and passed whole to library functions. # Example key material: diff --git a/idhub/templates/idhub/admin/roles.html b/idhub/templates/idhub/admin/roles.html index 25bfd93..d3d6593 100644 --- a/idhub/templates/idhub/admin/roles.html +++ b/idhub/templates/idhub/admin/roles.html @@ -24,7 +24,7 @@