Changeset c2c51a8

Timestamp:

05/30/12 11:37:33 (12 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, lam, nlivemulti, release/1.4.4, storage

Children:

1d503bb

Parents:

3f7636a

git-author:

yomguy <yomguy@…> (05/30/12 11:37:33)

git-committer:

yomguy <yomguy@…> (05/30/12 11:37:33)

Message:

add domain enum

Location:

telemeta

Files:

• locale/de/LC_MESSAGES/django.mo (modified) (previous)
• locale/de/LC_MESSAGES/django.po (modified) (3 diffs)
• locale/de/LC_MESSAGES/djangojs.mo (modified) (previous)
• locale/de/LC_MESSAGES/djangojs.po (modified) (1 diff)
• locale/fr/LC_MESSAGES/django.mo (modified) (previous)
• locale/fr/LC_MESSAGES/django.po (modified) (3 diffs)
• locale/fr/LC_MESSAGES/djangojs.mo (modified) (previous)
• locale/fr/LC_MESSAGES/djangojs.po (modified) (1 diff)
• models/enum.py (modified) (1 diff)
• models/media.py (modified) (1 diff)

telemeta/locale/de/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 10:27+0200\n"
+"POT-Creation-Date: 2012-05-30 11:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -126 +126 @@
 msgstr ""
 
+#: models/enum.py:228 models/media.py:320
+msgid "domain"
+msgstr ""
+
 #: models/format.py:58 models/media.py:390 models/media.py:449
 #: models/media.py:459 models/media.py:470 models/media.py:486
@@ -472 +476 @@
 #: models/media.py:319
 msgid "scientist"
-msgstr ""
-
-#: models/media.py:320
-msgid "domain"
 msgstr ""
 

telemeta/locale/de/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 10:27+0200\n"
+"POT-Creation-Date: 2012-05-30 11:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

telemeta/locale/fr/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 10:27+0200\n"
+"POT-Creation-Date: 2012-05-30 11:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
@@ -125 +125 @@
 msgstr "droits"
 
+#: models/enum.py:228 models/media.py:320
+msgid "domain"
+msgstr "discipline"
+
 #: models/format.py:58 models/media.py:390 models/media.py:449
 #: models/media.py:459 models/media.py:470 models/media.py:486
@@ -474 +478 @@
 msgid "scientist"
 msgstr "reponsable scientifique"
-
-#: models/media.py:320
-msgid "domain"
-msgstr "discipline"
 
 #: models/media.py:321

telemeta/locale/fr/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 10:27+0200\n"
+"POT-Creation-Date: 2012-05-30 11:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"

telemeta/models/enum.py

@@ -220 +220 @@
         db_table = 'rights'
         verbose_name = _("rights")
+
+class Domain(Enumeration):
+    "Domain"
+
+    class Meta(MetaEnumeration):
+        db_table = 'domain'
+        verbose_name = _("domain")

telemeta/models/media.py

@@ -318 +318 @@
 
     scientist             = CharField(_('scientist'))
-    domain                = CharField(_('domain'))
+    domain                = WeakForeignKey('Domain', verbose_name=_('domain'))
     summary               = TextField(_('summary'))
     comment               = TextField(_('remarks'))