Changeset 6a2413f

Timestamp:

06/22/11 18:37:59 (2 years ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

8f0f9d0

Parents:

40265bd

git-author:

yomguy <yomguy@…> (06/22/11 18:37:59)

git-committer:

yomguy <yomguy@…> (06/22/11 18:37:59)

Message:

fix collection delete url, add js locale

Location:

telemeta

Files:

• locale/de/LC_MESSAGES/djangojs.mo (modified) (previous)
• locale/de/LC_MESSAGES/djangojs.po (modified) (2 diffs)
• locale/fr/LC_MESSAGES/djangojs.mo (modified) (previous)
• locale/fr/LC_MESSAGES/djangojs.po (modified) (2 diffs)
• urls.py (modified) (1 diff)

telemeta/locale/de/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-22 18:34+0200\n"
+"POT-Creation-Date: 2011-06-22 18:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -62 +62 @@
 msgid "delete the item permanently?"
 msgstr ""
+
+#: htdocs/js/locale.js:13
+msgid "delete the collection permanently?"
+msgstr ""

telemeta/locale/fr/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-22 18:34+0200\n"
+"POT-Creation-Date: 2011-06-22 18:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
@@ -62 +62 @@
 msgid "delete the item permanently?"
 msgstr "supprimer l'item définitivement ?"
+
+#: htdocs/js/locale.js:13
+msgid "delete the collection permanently?"
+msgstr "supprimer la collection définitivement ?"

telemeta/urls.py

@@ -146 +146 @@
     url(r'^collections/(?P<public_id>[A-Za-z0-9._-]+)/add_item/$', item_view.item_add,
         dict(template='telemeta/mediaitem_add.html'), name="telemeta-collection-additem"),
-    url(r'^collections/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', collection_view.item_delete, name="telemeta-collection-delete"),
+    url(r'^collections/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', collection_view.collection_delete, name="telemeta-collection-delete"),
     
     # search