Changeset c805c90


Ignore:
Timestamp:
05/30/12 11:37:44 (23 months ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, server, storage, telecaster
Children:
64bc9e8
Parents:
efa5176 (diff), c2c51a8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (05/30/12 11:37:44)
git-committer:
yomguy <yomguy@…> (05/30/12 11:37:44)
Message:

Merge branch 'develop' into lam

Location:
telemeta
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • telemeta/locale/de/LC_MESSAGES/django.po

    r3f7636a rc2c51a8  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-30 10:27+0200\n" 
     11"POT-Creation-Date: 2012-05-30 11:37+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    126126msgstr "" 
    127127 
     128#: models/enum.py:228 models/media.py:320 
     129msgid "domain" 
     130msgstr "" 
     131 
    128132#: models/format.py:58 models/media.py:390 models/media.py:449 
    129133#: models/media.py:459 models/media.py:470 models/media.py:486 
     
    472476#: models/media.py:319 
    473477msgid "scientist" 
    474 msgstr "" 
    475  
    476 #: models/media.py:320 
    477 msgid "domain" 
    478478msgstr "" 
    479479 
  • telemeta/locale/de/LC_MESSAGES/djangojs.po

    r3f7636a rc2c51a8  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-30 10:27+0200\n" 
     11"POT-Creation-Date: 2012-05-30 11:37+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
  • telemeta/locale/fr/LC_MESSAGES/django.po

    r3f7636a rc2c51a8  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-30 10:27+0200\n" 
     11"POT-Creation-Date: 2012-05-30 11:37+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Olivier Guilyardi <olivier samalyse com>\n" 
     
    125125msgstr "droits" 
    126126 
     127#: models/enum.py:228 models/media.py:320 
     128msgid "domain" 
     129msgstr "discipline" 
     130 
    127131#: models/format.py:58 models/media.py:390 models/media.py:449 
    128132#: models/media.py:459 models/media.py:470 models/media.py:486 
     
    474478msgid "scientist" 
    475479msgstr "reponsable scientifique" 
    476  
    477 #: models/media.py:320 
    478 msgid "domain" 
    479 msgstr "discipline" 
    480480 
    481481#: models/media.py:321 
  • telemeta/locale/fr/LC_MESSAGES/djangojs.po

    r3f7636a rc2c51a8  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-30 10:27+0200\n" 
     11"POT-Creation-Date: 2012-05-30 11:37+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n" 
  • telemeta/models/enum.py

    r3f7636a rc2c51a8  
    220220        db_table = 'rights' 
    221221        verbose_name = _("rights") 
     222 
     223class Domain(Enumeration): 
     224    "Domain" 
     225 
     226    class Meta(MetaEnumeration): 
     227        db_table = 'domain' 
     228        verbose_name = _("domain") 
  • telemeta/models/media.py

    r305d2e3 rc2c51a8  
    318318 
    319319    scientist             = CharField(_('scientist')) 
    320     domain                = CharField(_('domain')) 
     320    domain                = WeakForeignKey('Domain', verbose_name=_('domain')) 
    321321    summary               = TextField(_('summary')) 
    322322    comment               = TextField(_('remarks')) 
  • telemeta/__init__.py

    raa83e80 ra7f10c1  
    1313 
    1414__docformat__ = 'epytext en' 
    15 __version__ = '1.4.3' 
     15__version__ = '1.4.4' 
    1616__url__ = 'http://telemeta.org' 
    1717__copyright__ = '(C) 2007-2012 Parisson' 
  • telemeta/templates/telemeta/mediaitem_detail.html

    r9fa4646 ra7f10c1  
    191191            {% dl_field item "title" placeholder %} 
    192192            {% dl_field item "alt_title" %} 
    193  
    194193            {% dl_field item "collector" placeholder %} 
    195194            <dt>{% field_label item "collection" %}</dt> 
     
    198197 
    199198            <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd> 
     199 
     200            <dt>{% trans "Remarks" %}</dt> 
     201            <dd>{{ item.comment|html_line_break|safe }}</dd> 
    200202 
    201203            {% if last_revision %} 
     
    272274            <h4><a href="#">{% trans "General informations" %}</a></h4> 
    273275            <dl class="listing"> 
    274                 <dt>{% trans "Remarks" %}</dt> 
    275                 <dd>{{ item.comment|html_line_break|safe }}</dd> 
    276                 {% dl_field item "collector_selection" %} 
     276 
    277277            </dl> 
    278278        </div> 
Note: See TracChangeset for help on using the changeset viewer.