From: yomguy <yomguy@parisson.com>
Date: Mon, 13 Feb 2012 14:41:17 +0000 (+0100)
Subject: add form when no list, fix locales
X-Git-Tag: 1.3.10~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=461ebfc909493ecc3521594235fdf2f1a2a2d227;p=telemeta.git

add form when no list, fix locales
---

diff --git a/telemeta/htdocs/js/playlist.js b/telemeta/htdocs/js/playlist.js
index 6a3d1382..81f214e1 100644
--- a/telemeta/htdocs/js/playlist.js
+++ b/telemeta/htdocs/js/playlist.js
@@ -164,10 +164,12 @@ var playlistUtils = {
         for(var i=0; i< playlists.length; i++){
             ar.push(playlists[i].name);
         }
+        var pl = this;
+        
         if(!ar.length){
-            return;
+            pl.showAdd(anchorElement);
         }
-        var pl = this;
+        
         //var addFcn = this.addResourceToPlaylist;
         new PopupDiv({
             invoker:anchorElement,
@@ -175,6 +177,7 @@ var playlistUtils = {
             onOk:function(data){
                 var val = data.selIndex;
                 var callbackok = undefined;
+                    
                 if(optionalOkMessage){
                     callbackok = function(){
                         var p =new PopupDiv({
diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 4d6c3a9b..ae84a61c 100644
Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ
diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po
index c474a73c..668e3039 100644
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 14:02+0100\n"
+"POT-Creation-Date: 2012-02-13 14:37+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"
@@ -1581,6 +1581,10 @@ msgstr ""
 msgid "My searches"
 msgstr ""
 
+#: util/locale_fix.py:8
+msgid "Children"
+msgstr ""
+
 #: views/base.py:264 views/base.py:454 views/base.py:617 views/base.py:921
 #: views/base.py:1387
 msgid "Access not allowed"
diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo
index 4d6c3a9b..ae84a61c 100644
Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ
diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po
index 20fe8ad1..bc610762 100644
--- a/telemeta/locale/de/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 14:02+0100\n"
+"POT-Creation-Date: 2012-02-13 14:37+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"
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 43f21c56..ac3a0278 100644
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index c78a5202..4fd10516 100644
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 14:02+0100\n"
+"POT-Creation-Date: 2012-02-13 14:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1593,6 +1593,10 @@ msgstr "Toutes les dernières modifications"
 msgid "My searches"
 msgstr "Mes recherches"
 
+#: util/locale_fix.py:8
+msgid "Children"
+msgstr "Enfants"
+
 #: views/base.py:264 views/base.py:454 views/base.py:617 views/base.py:921
 #: views/base.py:1387
 msgid "Access not allowed"
diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo
index c8fa31b6..92b4c033 100644
Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ
diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
index 45f93ce3..eda025a5 100644
--- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 14:02+0100\n"
+"POT-Creation-Date: 2012-02-13 14:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index 1fd7e72e..d5eb2665 100644
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -26,7 +26,7 @@
         }
         {% endif %}
     });
-        {% endif %}
+    {% endif %}
 </script>
 {% endblock %}
 
diff --git a/telemeta/templates/telemeta/resource_edit.html b/telemeta/templates/telemeta/resource_edit.html
index 9ce71f47..8b4439f9 100644
--- a/telemeta/templates/telemeta/resource_edit.html
+++ b/telemeta/templates/telemeta/resource_edit.html
@@ -18,7 +18,7 @@
        <tr>
             <tr><td class="error">{{ field.errors }}</td></tr>
             {% if "children" in field.html_name %}
-            <td>{{ field.label_tag }}:</td><td><div class="vscroll"> {{ field }}</div></td>
+            <td>{% trans field.label_tag %}:</td><td><div class="vscroll"> {{ field }}</div></td>
             {% else %}
              <td>{{ field.label_tag }}:</td><td> {{ field }}</td>
             {% endif %}
diff --git a/telemeta/util/locale_fix.py b/telemeta/util/locale_fix.py
index eae085c7..397045c4 100644
--- a/telemeta/util/locale_fix.py
+++ b/telemeta/util/locale_fix.py
@@ -5,3 +5,4 @@ from django.utils.translation import ugettext_lazy as _
 a = _("My last changes")
 a = _("All last changes")
 a = _("My searches")
+a = _("Children")
diff --git a/telemeta/views/base.py b/telemeta/views/base.py
index bd400842..ccd9783a 100644
--- a/telemeta/views/base.py
+++ b/telemeta/views/base.py
@@ -709,7 +709,7 @@ class ItemView(object):
         item = MediaItem.objects.get(public_id=item_public_id)
         media = MediaItemRelated.objects.get(item=item, id=media_id)
         response = HttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type)
-#        response['Content-Disposition'] = 'attachment'
+#        response['Content-Disposition'] = 'attachment; '+'filename='+media.title+'.'+ext
         return response
 
     @method_decorator(permission_required('telemeta.change_mediaitem'))