Changeset 5a2b932


Ignore:
Timestamp:
07/09/12 01:20:40 (22 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, sabiod, server, storage, telecaster
Children:
8c70403
Parents:
f6bc1e0 (diff), 8d83c067 (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@…> (07/09/12 01:20:40)
git-committer:
yomguy <yomguy@…> (07/09/12 01:20:40)
Message:

Merge branch 'hotfix/registration' into dev

Conflicts:

telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po

Files:
4 added
21 edited

Legend:

Unmodified
Added
Removed
  • CHANGELOG

    r0d62fe4 rf642e59  
    77 * EXPERIMENTAL: WebM and MP4 video handling for items, NO transcode but decode, add a nice video.js player 
    88 * RECOMMEND: install django-extensions 
     9 * transitional package to 1.5 (maybe 1.4.4 *soon*) 
    910 
    1011telemeta (1.4.2-1) unstable; urgency=low 
  • telemeta/locale/de/LC_MESSAGES/django.po

    r19f0503 r5a2b932  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-06-07 10:11+0200\n" 
     11"POT-Creation-Date: 2012-07-09 01:17+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    865865 
    866866#: templates/postman/email_user.txt:17 templates/postman/email_visitor.txt:16 
     867#: templates/telemeta/registration/password_reset_email.html:13 
    867868msgid "The site administrator" 
    868869msgstr "" 
     
    18241825msgstr "" 
    18251826 
    1826 #: templates/telemeta/registration/password_reset_email.html:2 
     1827#: templates/telemeta/registration/password_reset_email.html:1 
     1828msgid "Hello" 
     1829msgstr "" 
     1830 
     1831#: templates/telemeta/registration/password_reset_email.html:3 
    18271832msgid "You're receiving this e-mail because you requested a password reset" 
    18281833msgstr "" 
    18291834 
    1830 #: templates/telemeta/registration/password_reset_email.html:3 
     1835#: templates/telemeta/registration/password_reset_email.html:4 
    18311836#, python-format 
    18321837msgid "for your user account at %(site_name)s" 
    18331838msgstr "" 
    18341839 
    1835 #: templates/telemeta/registration/password_reset_email.html:5 
     1840#: templates/telemeta/registration/password_reset_email.html:6 
    18361841msgid "Please go to the following page and choose a new password:" 
    18371842msgstr "" 
    18381843 
    1839 #: templates/telemeta/registration/password_reset_email.html:9 
     1844#: templates/telemeta/registration/password_reset_email.html:10 
    18401845msgid "Your username, in case you've forgotten:" 
    18411846msgstr "" 
    18421847 
    1843 #: templates/telemeta/registration/password_reset_email.html:11 
    1844 msgid "Thanks for using our site!" 
     1848#: templates/telemeta/registration/password_reset_email.html:12 
     1849msgid "Best regards" 
    18451850msgstr "" 
    18461851 
    18471852#: templates/telemeta/registration/password_reset_email.html:13 
    1848 #, python-format 
    1849 msgid "The %(site_name)s team" 
     1853msgid "of the" 
    18501854msgstr "" 
    18511855 
  • telemeta/locale/de/LC_MESSAGES/djangojs.po

    r19f0503 r8d83c067  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-06-07 10:11+0200\n" 
     11"POT-Creation-Date: 2012-07-09 01:17+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

    r19f0503 r5a2b932  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-06-07 10:11+0200\n" 
     11"POT-Creation-Date: 2012-07-09 01:17+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Olivier Guilyardi <olivier samalyse com>\n" 
     
    867867 
    868868#: templates/postman/email_user.txt:17 templates/postman/email_visitor.txt:16 
     869#: templates/telemeta/registration/password_reset_email.html:13 
    869870msgid "The site administrator" 
    870871msgstr "L'administrateur du site" 
     
    17831784 
    17841785#: templates/telemeta/registration/password_reset_complete.html:4 
    1785 #, fuzzy 
    17861786msgid "Password reset complete" 
    1787 msgstr "Mise à jour du mot de passe effectuée" 
     1787msgstr "Demande de mise à jour du mot de passe envoyée" 
    17881788 
    17891789#: templates/telemeta/registration/password_reset_complete.html:7 
     
    18271827#: templates/telemeta/registration/password_reset_done.html:4 
    18281828msgid "Password reset successful" 
    1829 msgstr "" 
     1829msgstr "Demande de réinitialisation de mot de passe envoyée" 
    18301830 
    18311831#: templates/telemeta/registration/password_reset_done.html:7 
     
    18351835msgstr "" 
    18361836 
    1837 #: templates/telemeta/registration/password_reset_email.html:2 
     1837#: templates/telemeta/registration/password_reset_email.html:1 
     1838msgid "Hello" 
     1839msgstr "Bonjour" 
     1840 
     1841#: templates/telemeta/registration/password_reset_email.html:3 
    18381842msgid "You're receiving this e-mail because you requested a password reset" 
    18391843msgstr "" 
    1840  
    1841 #: templates/telemeta/registration/password_reset_email.html:3 
     1844"Vous recevez cet e-mail car vous avez demandé une demande de " 
     1845"réinitialisation de mot de passe" 
     1846 
     1847#: templates/telemeta/registration/password_reset_email.html:4 
    18421848#, python-format 
    18431849msgid "for your user account at %(site_name)s" 
    1844 msgstr "" 
    1845  
    1846 #: templates/telemeta/registration/password_reset_email.html:5 
     1850msgstr "pour votre compte utilisateur du site %(site_name)s" 
     1851 
     1852#: templates/telemeta/registration/password_reset_email.html:6 
    18471853msgid "Please go to the following page and choose a new password:" 
    18481854msgstr "" 
    18491855 
    1850 #: templates/telemeta/registration/password_reset_email.html:9 
     1856#: templates/telemeta/registration/password_reset_email.html:10 
    18511857msgid "Your username, in case you've forgotten:" 
    18521858msgstr "" 
    18531859 
    1854 #: templates/telemeta/registration/password_reset_email.html:11 
    1855 msgid "Thanks for using our site!" 
     1860#: templates/telemeta/registration/password_reset_email.html:12 
     1861msgid "Best regards" 
    18561862msgstr "" 
    18571863 
    18581864#: templates/telemeta/registration/password_reset_email.html:13 
    1859 #, python-format 
    1860 msgid "The %(site_name)s team" 
     1865msgid "of the" 
    18611866msgstr "" 
    18621867 
  • telemeta/locale/fr/LC_MESSAGES/djangojs.po

    r19f0503 r8d83c067  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-06-07 10:11+0200\n" 
     11"POT-Creation-Date: 2012-07-09 01:17+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n" 
  • telemeta/templates/telemeta/registration/password_reset_done.html

    r566f17d r8d83c067  
    22{% load i18n %} 
    33 
    4 {% block title %}<br />{% trans 'Password reset successful' %}{% endblock %} 
     4{% block title %}<br />{% trans "Password reset successful" %}{% endblock %} 
    55 
    66{% block content %} 
  • telemeta/templates/telemeta/registration/password_reset_email.html

    r566f17d r8d83c067  
    1 {% load i18n %}{% autoescape off %} 
     1{% load telemeta_utils %}{% load i18n %}{% autoescape off %}{% trans "Hello" %}, 
     2 
    23{% trans "You're receiving this e-mail because you requested a password reset" %} 
    34{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}. 
     
    910{% trans "Your username, in case you've forgotten:" %} {{ user.username }} 
    1011 
    11 {% trans "Thanks for using our site!" %} 
    12  
    13 {% blocktrans %}The {{ site_name }} team{% endblocktrans %} 
     12{% trans "Best regards" %}, 
     13{% trans "The site administrator" %} {% trans "of the" %} {% organization %} 
    1414 
    1515{% endautoescape %} 
  • telemeta/models/dublincore.py

    r5c42a44 rf6bc1e0  
    6666        result = [] 
    6767        for element in self.elements: 
    68             result.append((element.name, unicode(element.value))) 
     68            if isinstance(element.value, str): 
     69                value = element.value.decode('utf8') 
     70            else: 
     71                value = element.value 
     72            result.append((element.name, unicode(value))) 
    6973        return result 
    7074 
  • telemeta/models/enum.py

    r64bc9e8 r521a3e9  
    221221        verbose_name = _("rights") 
    222222 
    223 class Subject(Enumeration): 
    224     "Scientific subject" 
    225  
    226     class Meta(MetaEnumeration): 
    227         db_table = 'subject' 
    228         verbose_name = _("subject") 
     223class Topic(Enumeration): 
     224    "Topic, subject of the study, research, etc.." 
     225 
     226    class Meta(MetaEnumeration): 
     227        db_table = 'topic' 
     228        verbose_name = _("topic") 
  • telemeta/models/location.py

    r305d2e3 r188eaaa  
    164164        db_table = 'location_types' 
    165165        ordering = ['name'] 
    166         verbose_name_plural = _('lieux types') 
     166        verbose_name_plural = _('location types') 
    167167 
    168168class LocationAlias(ModelCore): 
  • telemeta/models/media.py

    r64bc9e8 rf6bc1e0  
    216216 
    217217    # Technical data 
    218     code                  = CharField(_('code'), unique=True, required=True, validators=[is_valid_collection_code]) 
     218    code                  = CharField(_('code'), unique=True, required=True, 
     219                                      validators=[is_valid_collection_code]) 
    219220    old_code              = CharField(_('old code'), unique=False, null=True, blank=True) 
    220221    approx_duration       = DurationField(_('approximative duration')) 
     
    318319 
    319320    scientist             = CharField(_('scientist')) 
    320     subject               = WeakForeignKey('Subject', verbose_name=_('subject')) 
     321    topic                 = WeakForeignKey('Topic', verbose_name=_('topic')) 
    321322    summary               = TextField(_('summary')) 
    322323    comment               = TextField(_('remarks')) 
     
    382383        if self.code: 
    383384            return self.code 
    384         return self.id 
     385        return str(self.id) 
    385386 
    386387    class Meta(MetaCore): 
  • telemeta/models/system.py

    rfad4d14 rf6bc1e0  
    8585    institution     = CharField(_('Institution')) 
    8686    department      = CharField(_('Department')) 
    87     attachment      = CharField(_('attachment')) 
     87    attachment      = CharField(_('Attachment')) 
    8888    function        = CharField(_('Function')) 
    8989    address         = TextField(_('Address')) 
  • telemeta/static/telemeta/css/telemeta.css

    rf0c855e rf6bc1e0  
    727727    text-decoration: none; 
    728728    margin: 0; 
    729     background: #fff url(more.png) no-repeat left top; 
     729    background: #fff url(/static/telemeta/images/more.png) no-repeat left top; 
    730730    background-position: 0 -16px; 
    731731    padding-bottom: 2px; 
  • telemeta/templates/telemeta/mediaitem_detail.html

    ra7f10c1 rf6bc1e0  
    4343 
    4444        //initializing the visualizers to be passed to the player 
     45        {% block graphers %} 
    4546        var visualizers = {}; 
    4647        {% for v in visualizers %} 
    4748            visualizers["{{v.name}}"] = "{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}"; 
    4849        {% endfor %} 
     50        {% endblock graphers %} 
     51 
    4952        {% if user.is_superuser %} 
    5053             loadPlayer('{% url telemeta-item-analyze-xml item.public_id %}', 
  • telemeta/urls.py

    rc676291 rf6bc1e0  
    115115    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/simple/$', item_view.item_detail, 
    116116        dict(template='telemeta/mediaitem_player_simple.html'), name="telemeta-item-player-simple"), 
     117    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/countour/$', item_view.item_detail, 
     118        dict(template='telemeta/mediaitem_player_contour.html'), name="telemeta-item-player-contour"), 
    117119    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/performances/$', item_view.item_performances_edit, 
    118120        dict(template='telemeta/mediaitem_performances_edit.html'), name="telemeta-item-performances_edit"), 
  • tools/dev/push.sh

    rd7de29b rf6bc1e0  
    2222#echo "Update jimi.parisson.com:" 
    2323echo "Update angus.parisson.com:" 
    24 ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \ 
    25                         cd /home/telemeta/telemeta-develop; git pull; \ 
    26                         cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations; 
    27                         cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;  
    28                         cd /home/telemeta/parisson/; ./manage.py migrate telemeta --delete-ghost-migrations; " 
     24ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \ 
     25                        cd /home/telemeta/telemeta-develop; git pull origin dev; \ 
     26                        cd /home/telemeta/demo/; ./manage.py migrate --delete-ghost-migrations; 
     27                        cd /home/telemeta/sandbox/; ./manage.py migrate --delete-ghost-migrations;  
     28                        cd /home/telemeta/parisson/; ./manage.py migrate --delete-ghost-migrations; " 
    2929 
    3030echo "Done !" 
Note: See TracChangeset for help on using the changeset viewer.