Translated foreign keys

lizardsystem · Oct 28, 2015 · e33861d · e33861d
1 parent a8f1887
commit e33861d
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 35 deletions.
diff --git a/lizard_auth_server/locale/en/LC_MESSAGES/django.mo b/lizard_auth_server/locale/en/LC_MESSAGES/django.mo
diff --git a/lizard_auth_server/locale/en/LC_MESSAGES/django.po b/lizard_auth_server/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-28 10:41+0100\n"
+"POT-Creation-Date: 2015-10-28 11:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -143,51 +143,55 @@ msgstr ""
 msgid "visit url"
 msgstr ""
 
-#: models.py:94
+#: models.py:94 models.py:125 models.py:503
 msgid "portal"
 msgstr ""
 
 #: models.py:95
 msgid "portals"
 msgstr ""
 
-#: models.py:140
+#: models.py:134 models.py:357
+msgid "user"
+msgstr ""
+
+#: models.py:142
 msgid "authentication token"
 msgstr ""
 
-#: models.py:141
+#: models.py:143
 msgid "authentication tokens"
 msgstr ""
 
-#: models.py:213
+#: models.py:215
 msgid "user profile"
 msgstr ""
 
-#: models.py:214
+#: models.py:216
 msgid "user profiles"
 msgstr ""
 
-#: models.py:359 models.py:360
+#: models.py:362 models.py:363
 msgid "invitation"
 msgstr ""
 
-#: models.py:504 models.py:505
+#: models.py:508 models.py:509 models.py:560
 msgid "role"
 msgstr ""
 
-#: models.py:537
+#: models.py:541 models.py:557
 msgid "organisation"
 msgstr ""
 
-#: models.py:538
+#: models.py:542
 msgid "organisations"
 msgstr ""
 
-#: models.py:560
+#: models.py:566
 msgid "organisation role"
 msgstr ""
 
-#: models.py:561
+#: models.py:567
 msgid "organisation roles"
 msgstr ""
 

diff --git a/lizard_auth_server/locale/nl/LC_MESSAGES/django.mo b/lizard_auth_server/locale/nl/LC_MESSAGES/django.mo
diff --git a/lizard_auth_server/locale/nl/LC_MESSAGES/django.po b/lizard_auth_server/locale/nl/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lizardsystem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-28 10:41+0100\n"
-"PO-Revision-Date: 2015-10-28 09:43+0000\n"
+"POT-Creation-Date: 2015-10-28 11:00+0100\n"
+"PO-Revision-Date: 2015-10-28 10:00+0000\n"
 "Last-Translator: admin <admin@example.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -147,51 +147,55 @@ msgstr "redirect-url"
 msgid "visit url"
 msgstr "bezoek-url"
 
-#: models.py:94
+#: models.py:94 models.py:125 models.py:503
 msgid "portal"
 msgstr "portaal"
 
 #: models.py:95
 msgid "portals"
 msgstr "portalen"
 
-#: models.py:140
+#: models.py:134 models.py:357
+msgid "user"
+msgstr "gebruiker"
+
+#: models.py:142
 msgid "authentication token"
 msgstr "authenticatieteken"
 
-#: models.py:141
+#: models.py:143
 msgid "authentication tokens"
 msgstr "authenticatietekens"
 
-#: models.py:213
+#: models.py:215
 msgid "user profile"
 msgstr "gebruikersprofiel"
 
-#: models.py:214
+#: models.py:216
 msgid "user profiles"
 msgstr "gebruikersprofielen"
 
-#: models.py:359 models.py:360
+#: models.py:362 models.py:363
 msgid "invitation"
 msgstr "uitnodiging"
 
-#: models.py:504 models.py:505
+#: models.py:508 models.py:509 models.py:560
 msgid "role"
 msgstr "rol"
 
-#: models.py:537
+#: models.py:541 models.py:557
 msgid "organisation"
 msgstr "organisatie"
 
-#: models.py:538
+#: models.py:542
 msgid "organisations"
 msgstr "organisaties"
 
-#: models.py:560
+#: models.py:566
 msgid "organisation role"
 msgstr "organisatierol"
 
-#: models.py:561
+#: models.py:567
 msgid "organisation roles"
 msgstr "organisatierollen"
 

diff --git a/lizard_auth_server/models.py b/lizard_auth_server/models.py
@@ -47,37 +47,37 @@ class Portal(models.Model):
     A portal. If secret/key change, the portal website has to be updated too!
     """
     name = models.CharField(
-        _('name'),
+        verbose_name=_('name'),
         max_length=255,
         null=False,
         blank=False,
         help_text='Name used to refer to this portal.')
     sso_secret = models.CharField(
-        _('shared secret'),
+        verbose_name=_('shared secret'),
         max_length=64,
         unique=True,
         default=gen_key('Portal', 'sso_secret'),
         help_text='Secret shared between SSO client and '
         'server to sign/encrypt communication.')
     sso_key = models.CharField(
-        _('identifying key'),
+        verbose_name=_('identifying key'),
         max_length=64,
         unique=True,
         default=gen_key('Portal', 'sso_key'),
         help_text='String used to identify the SSO client.')
     allowed_domain = models.CharField(
-        _('allowed domain(s)'),
+        verbose_name=_('allowed domain(s)'),
         max_length=255,
         default='',
         help_text=(
             'Allowed domain suffix for redirects using the next parameter. '
             'Multiple, whitespace-separated suffixes may be specified.'))
     redirect_url = models.CharField(
-        _('redirect url'),
+        verbose_name=_('redirect url'),
         max_length=255,
         help_text='URL used in the SSO redirection.')
     visit_url = models.CharField(
-        _('visit url'),
+        verbose_name=_('visit url'),
         max_length=255,
         help_text='URL used in the UI to refer to this portal.')
 
@@ -121,7 +121,8 @@ class Token(models.Model):
     An auth token used to authenticate a user.
     """
     portal = models.ForeignKey(
-        Portal)
+        Portal,
+        verbose_name=_('portal'))
     request_token = models.CharField(
         max_length=64,
         unique=True)
@@ -130,6 +131,7 @@ class Token(models.Model):
         unique=True)
     user = models.ForeignKey(
         User,
+        verbose_name=_('user'),
         null=True)
     created = models.DateTimeField(
         default=lambda: datetime.datetime.now(tz=pytz.UTC))
@@ -352,6 +354,7 @@ class Invitation(models.Model):
         blank=True)
     user = models.ForeignKey(
         User,
+        verbose_name=_('user'),
         null=True,
         blank=True)
 
@@ -496,7 +499,8 @@ class Role(models.Model):
     external_description = models.TextField()
     internal_description = models.TextField()
     portal = models.ForeignKey(
-        Portal)
+        Portal,
+        verbose_name=_('portal'))
 
     class Meta:
         ordering = ['portal', 'name']
@@ -549,9 +553,11 @@ def as_dict(self):
 
 class OrganisationRole(models.Model):
     organisation = models.ForeignKey(
-        Organisation)
+        Organisation,
+        verbose_name=_('organisation'))
     role = models.ForeignKey(
-        Role)
+        Role,
+        verbose_name=_('role'))
     for_all_users = models.BooleanField(
         default=False)