Changeset 72b372a


Ignore:
Timestamp:
02/13/12 16:37:39 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, production, release/1.4.4, sabiod, security, server, social, storage, telecaster, test
Children:
b85e1be
Parents:
461ebfc
git-author:
yomguy <yomguy@…> (02/13/12 16:37:39)
git-committer:
yomguy <yomguy@…> (02/13/12 16:37:39)
Message:

fix add to list for corpus and fonds
fix locales

Location:
telemeta
Files:
13 edited

Legend:

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

    r461ebfc r72b372a  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-02-13 14:37+0100\n" 
     11"POT-Creation-Date: 2012-02-13 16:36+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    668668msgstr "" 
    669669 
    670 #: templates/telemeta/base.html:86 views/base.py:265 
     670#: templates/telemeta/base.html:86 views/base.py:269 
    671671msgid "Lists" 
    672672msgstr "" 
     
    779779 
    780780#: templates/telemeta/collection_detail.html:5 
    781 #: templates/telemeta/collection_detail_dc.html:5 views/base.py:455 
     781#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459 
    782782msgid "Collection" 
    783783msgstr "" 
     
    793793#: templates/telemeta/mediaitem_detail_video.html:352 
    794794#: templates/telemeta/profile_detail.html:65 
    795 #: templates/telemeta/resource_detail.html:21 
     795#: templates/telemeta/resource_detail.html:43 
    796796#: templates/telemeta/inc/collection_related.html:81 
    797797#: templates/telemeta/inc/mediaitem_related.html:81 
     
    803803#: templates/telemeta/mediaitem_detail.html:98 
    804804#: templates/telemeta/mediaitem_detail_video.html:91 
    805 #: templates/telemeta/resource_detail.html:22 
     805#: templates/telemeta/resource_detail.html:44 
    806806msgid "Copy" 
    807807msgstr "" 
     
    814814#: templates/telemeta/mediaitem_detail.html:101 
    815815#: templates/telemeta/mediaitem_detail_video.html:94 
    816 #: templates/telemeta/resource_detail.html:25 
     816#: templates/telemeta/resource_detail.html:47 
    817817msgid "Add to playlist" 
    818818msgstr "" 
     
    885885#: templates/telemeta/mediaitem_detail.html:320 
    886886#: templates/telemeta/mediaitem_detail_video.html:363 
    887 #: templates/telemeta/resource_detail.html:73 
     887#: templates/telemeta/resource_detail.html:95 
    888888msgid "Delete" 
    889889msgstr "" 
     
    10761076msgstr "" 
    10771077 
    1078 #: templates/telemeta/lists.html:89 
     1078#: templates/telemeta/lists.html:92 
    10791079#: templates/telemeta/inc/module_revisions.html:40 
    10801080msgid "deleted" 
     
    10961096#: templates/telemeta/mediaitem_copy.html:5 
    10971097#: templates/telemeta/mediaitem_detail.html:5 
    1098 #: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:618 
     1098#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:622 
    10991099msgid "Item" 
    11001100msgstr "" 
     
    12311231msgstr "" 
    12321232 
    1233 #: templates/telemeta/profile_detail.html:8 views/base.py:1388 
     1233#: templates/telemeta/profile_detail.html:8 views/base.py:1392 
    12341234msgid "User profile" 
    12351235msgstr "" 
     
    12931293msgstr "" 
    12941294 
    1295 #: templates/telemeta/resource_detail.html:79 
     1295#: templates/telemeta/resource_detail.html:101 
    12961296#: templates/telemeta/resource_detail_dc.html:16 
    12971297msgid "No such resource" 
     
    13901390 
    13911391#: templates/telemeta/inc/module_searches.html:13 
    1392 msgid "Pattern" 
     1392msgid "Criteria" 
    13931393msgstr "" 
    13941394 
     
    15861586msgstr "" 
    15871587 
    1588 #: views/base.py:264 views/base.py:454 views/base.py:617 views/base.py:921 
    1589 #: views/base.py:1387 
     1588#: util/locale_fix.py:9 
     1589msgid "pattern" 
     1590msgstr "" 
     1591 
     1592#: views/base.py:268 views/base.py:458 views/base.py:621 views/base.py:925 
     1593#: views/base.py:1391 
    15901594msgid "Access not allowed" 
    15911595msgstr "" 
    15921596 
    1593 #: views/base.py:266 views/base.py:456 views/base.py:619 views/base.py:923 
    1594 #: views/base.py:1389 
     1597#: views/base.py:270 views/base.py:460 views/base.py:623 views/base.py:927 
     1598#: views/base.py:1393 
    15951599msgid "" 
    15961600"Please login or contact the website administator to get a private access." 
    15971601msgstr "" 
    15981602 
    1599 #: views/base.py:1418 
     1603#: views/base.py:1422 
    16001604msgid "Last changes" 
    16011605msgstr "" 
  • telemeta/locale/de/LC_MESSAGES/djangojs.po

    r461ebfc r72b372a  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-02-13 14:37+0100\n" 
     11"POT-Creation-Date: 2012-02-13 16:36+0100\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

    r461ebfc r72b372a  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-02-13 14:37+0100\n" 
     11"POT-Creation-Date: 2012-02-13 16:36+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Olivier Guilyardi <olivier samalyse com>\n" 
     
    671671msgstr "Bureau" 
    672672 
    673 #: templates/telemeta/base.html:86 views/base.py:265 
     673#: templates/telemeta/base.html:86 views/base.py:269 
    674674msgid "Lists" 
    675675msgstr "Listes" 
     
    784784 
    785785#: templates/telemeta/collection_detail.html:5 
    786 #: templates/telemeta/collection_detail_dc.html:5 views/base.py:455 
     786#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459 
    787787msgid "Collection" 
    788788msgstr "Collection" 
     
    798798#: templates/telemeta/mediaitem_detail_video.html:352 
    799799#: templates/telemeta/profile_detail.html:65 
    800 #: templates/telemeta/resource_detail.html:21 
     800#: templates/telemeta/resource_detail.html:43 
    801801#: templates/telemeta/inc/collection_related.html:81 
    802802#: templates/telemeta/inc/mediaitem_related.html:81 
     
    808808#: templates/telemeta/mediaitem_detail.html:98 
    809809#: templates/telemeta/mediaitem_detail_video.html:91 
    810 #: templates/telemeta/resource_detail.html:22 
     810#: templates/telemeta/resource_detail.html:44 
    811811msgid "Copy" 
    812812msgstr "Copier" 
     
    819819#: templates/telemeta/mediaitem_detail.html:101 
    820820#: templates/telemeta/mediaitem_detail_video.html:94 
    821 #: templates/telemeta/resource_detail.html:25 
     821#: templates/telemeta/resource_detail.html:47 
    822822msgid "Add to playlist" 
    823823msgstr "Ajouter à la liste" 
     
    890890#: templates/telemeta/mediaitem_detail.html:320 
    891891#: templates/telemeta/mediaitem_detail_video.html:363 
    892 #: templates/telemeta/resource_detail.html:73 
     892#: templates/telemeta/resource_detail.html:95 
    893893msgid "Delete" 
    894894msgstr "Supprimer" 
     
    10811081msgstr "Action" 
    10821082 
    1083 #: templates/telemeta/lists.html:89 
     1083#: templates/telemeta/lists.html:92 
    10841084#: templates/telemeta/inc/module_revisions.html:40 
    10851085msgid "deleted" 
     
    11021102#: templates/telemeta/mediaitem_copy.html:5 
    11031103#: templates/telemeta/mediaitem_detail.html:5 
    1104 #: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:618 
     1104#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:622 
    11051105msgid "Item" 
    11061106msgstr "Item" 
     
    12371237msgstr "Profil utilisateur" 
    12381238 
    1239 #: templates/telemeta/profile_detail.html:8 views/base.py:1388 
     1239#: templates/telemeta/profile_detail.html:8 views/base.py:1392 
    12401240msgid "User profile" 
    12411241msgstr "Profil utilisateur" 
     
    12991299msgstr "Nouveau" 
    13001300 
    1301 #: templates/telemeta/resource_detail.html:79 
     1301#: templates/telemeta/resource_detail.html:101 
    13021302#: templates/telemeta/resource_detail_dc.html:16 
    13031303msgid "No such resource" 
     
    13341334#: templates/telemeta/search_results.html:26 
    13351335msgid "Search pattern" 
    1336 msgstr "Recherche" 
     1336msgstr "Mots clés" 
    13371337 
    13381338#: templates/telemeta/inc/children_list.html:8 
     
    13961396 
    13971397#: templates/telemeta/inc/module_searches.html:13 
    1398 msgid "Pattern" 
     1398msgid "Criteria" 
    13991399msgstr "" 
    14001400 
     
    15981598msgstr "Enfants" 
    15991599 
    1600 #: views/base.py:264 views/base.py:454 views/base.py:617 views/base.py:921 
    1601 #: views/base.py:1387 
     1600#: util/locale_fix.py:9 
     1601msgid "pattern" 
     1602msgstr "mots clés" 
     1603 
     1604#: views/base.py:268 views/base.py:458 views/base.py:621 views/base.py:925 
     1605#: views/base.py:1391 
    16021606msgid "Access not allowed" 
    16031607msgstr "Accès non autorisé" 
    16041608 
    1605 #: views/base.py:266 views/base.py:456 views/base.py:619 views/base.py:923 
    1606 #: views/base.py:1389 
     1609#: views/base.py:270 views/base.py:460 views/base.py:623 views/base.py:927 
     1610#: views/base.py:1393 
    16071611msgid "" 
    16081612"Please login or contact the website administator to get a private access." 
     
    16111615"pour obtenir un accès privé." 
    16121616 
    1613 #: views/base.py:1418 
     1617#: views/base.py:1422 
    16141618msgid "Last changes" 
    16151619msgstr "Dernières modifications" 
  • telemeta/locale/fr/LC_MESSAGES/djangojs.po

    r461ebfc r72b372a  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-02-13 14:37+0100\n" 
     11"POT-Creation-Date: 2012-02-13 16:36+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n" 
  • telemeta/templates/telemeta/inc/module_searches.html

    rcc86e27 r72b372a  
    1111      <tr> 
    1212        <th class="highlight">{% trans "Date" %}</th> 
    13         <th>{% trans "Pattern" %}</th> 
     13        <th>{% trans "Criteria" %}</th> 
    1414      </tr> 
    1515    {% for s in searches %} 
     
    1818        <td><a href="{% url telemeta-search-items %}?{{s.criteria.all|build_pattern_string|build_query_string}}"> 
    1919            {% for c in s.criteria.all %} 
    20                 <li>{{ c.key }} : {{ c.value}}</li> 
     20                <li>{% trans c.key %} : {{ c.value}}</li> 
    2121            {% endfor %} 
    2222          </a> 
  • telemeta/templates/telemeta/lists.html

    rcc86e27 r72b372a  
    8787                <a href="{% url telemeta-item-detail-marker resource.element.public_id %}">{{ resource.element }}</a> 
    8888                {% endif %} 
     89                {% if resource.type == "corpus" or resource.type == "fonds" %} 
     90                <a href="{% url telemeta-resource-detail resource.type resource.element.public_id %}">{{ resource.element.title }}</a> 
     91                {% endif %} 
    8992                {% if resource.element == None %}{% trans "deleted" %}{% endif %} 
    9093            </td> 
  • telemeta/templates/telemeta/resource_detail.html

    rd962322 r72b372a  
    66 
    77{% block extra_javascript %} 
     8<script src="{% url telemeta-js "popupdiv.js" %}" type="text/javascript"></script> 
     9<script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script> 
     10<script> 
     11{% if user.is_authenticated %} 
     12jQuery(document).ready(function(){ 
     13    var p = playlistUtils; 
     14     
     15    {% for playlist in playlists %} 
     16    p.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}'); 
     17    {% endfor %} 
     18     
     19    {% if resource %} 
     20    var anchor = jQuery('#_add_to_playlist'); 
     21    if(anchor.length){ 
     22        anchor.click(function(){ 
     23            p.showAddResourceToPlaylist(anchor,'{{type}}','{{resource.id}}',gettrans('resource added to the selected playlist'));return false; 
     24            }); 
     25            } 
     26    {% endif %} 
     27    }); 
     28    {% endif %} 
     29    </script> 
    830{% endblock %} 
    931 
  • telemeta/util/locale_fix.py

    r461ebfc r72b372a  
    77a = _("My searches") 
    88a = _("Children") 
     9a = _("pattern") 
  • telemeta/views/base.py

    r461ebfc r72b372a  
    183183                    if resource.resource_type == 'marker': 
    184184                        element = MediaItemMarker.objects.get(id=resource.resource_id) 
     185                    if resource.resource_type == 'corpus': 
     186                        element = MediaCorpus.objects.get(id=resource.resource_id) 
     187                    if resource.resource_type == 'fonds': 
     188                        element = MediaFonds.objects.get(id=resource.resource_id) 
    185189                except: 
    186190                    element = None 
     
    14961500        related_media = self.related.objects.filter(resource=resource) 
    14971501        check_related_media(related_media) 
     1502        playlists = get_playlists(request) 
    14981503        if self.parent: 
    14991504            parents = self.parent.objects.filter(children=resource) 
     
    15011506            parents = [] 
    15021507 
    1503         return render(request, template, {'resource': resource, 'type': type, 'children': children, 'related_media': related_media, 'parents': parents }) 
     1508        return render(request, template, {'resource': resource, 'type': type, 'children': children, 'related_media': related_media, 'parents': parents, 'playlists': playlists }) 
    15041509 
    15051510    @jsonrpc_method('telemeta.change_fonds') 
Note: See TracChangeset for help on using the changeset viewer.