Commits

catapela  committed 8294c09

0.8.4 runs now under django 1.3

  • Participants
  • Parent commits 08244a3

Comments (0)

Files changed (9)

File src/dynamicLink/README

 
 **Notes**
 
-    * It's tested with Django 1.2
+    * It's tested with Django 1.2 / 1.3
     * Example project is included
 
 ========
 
 **test your installation**
 
-Go to console and type:
+    Go to console and type:
 
     * :~$ python
     * import dynamicLink
     * dynamicLink.VERSION
     * help(dynamicLink)
 
-**Setup**
+=====
+Setup
+=====
 
     * Add "dynamicLink" to you installed apps in the settings file.
     * Make sure that:
     * Add the following to your urls.py:
         -   from dynamicLink import dl_settings
         -   (r'^%s/' % dl_settings.DYNAMIC_LINK_URL_BASE_COMPONENT, include('dynamicLink.urls')),
-    * Change the pattern for your admin in urls.py from (r'^admin/', include(admin.site.urls)), to (r'^%sadmin/(.*)' admin.site.root),
     * Run "python manage.py syncdb".
     * And finally "python manage.py runserver".
 

File src/dynamicLink/admin.py

 
 
 class DownLinkAdmin(admin.ModelAdmin):
-    def __call__(self, request, * args, ** kwargs):
+    def queryset(self, request):
+        """catch the request object for list pages"""
         self.request = request
-        return super(DownLinkAdmin, self).__call__(request, * args, ** kwargs)
+        return super(DownLinkAdmin, self).queryset(request)
 
     list_display = ('slug', 'active', 'file', 'valid', 'clicks', 'timestamp_creation', 'link')
     actions = ['make_link']

File src/dynamicLink/admin.pyc

Binary file modified.

File src/dynamicLink/locale/de/LC_MESSAGES/django.mo

Binary file modified.

File src/dynamicLink/locale/de/LC_MESSAGES/django.po

 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-17 22:28+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-08-17 15:09+0800\n"
+"PO-Revision-Date: 2011-08-17 07:14\n"
+"Last-Translator: Andreas Fritz <catapela@gmx.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Translated-Using: django-rosetta 0.5.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:26
+#: admin.py:27
 msgid "Link"
 msgstr "Verknüpfung"
 
-#: admin.py:29
+#: admin.py:30
 msgid "Aditional values"
 msgstr "Weitere Parameter"
 
-#: admin.py:44
+#: admin.py:45
 msgid "timeout"
 msgstr "abgelaufen"
 
-#: admin.py:48
+#: admin.py:49
 msgid "valid"
 msgstr "gültig"
 
-#: admin.py:54
+#: admin.py:55
 msgid "file"
 msgstr "Datei"
 
-#: admin.py:58 admin.py:68
+#: admin.py:59 admin.py:69
 msgid "from"
 msgstr "von"
 
-#: admin.py:65
+#: admin.py:66
 msgid "max clicks reached"
 msgstr "Maximum erreicht"
 
-#: admin.py:68
+#: admin.py:69
 msgid "unlimited"
 msgstr "Unbeschränkt"
 
-#: admin.py:72
+#: admin.py:73
 msgid "clicks"
 msgstr "Zugriffe"
 
-#: admin.py:80
+#: admin.py:82
 msgid "Site"
 msgstr "Seite"
 
-#: admin.py:82
+#: admin.py:86
 msgid "File"
 msgstr "Datei"
 
-#: admin.py:85
+#: admin.py:90
 msgid "link"
 msgstr "Verknüpfung"
 
-#: admin.py:97
+#: admin.py:102
 msgid "Make from selected a download site link"
 msgstr "Generiere vom selektierten eine Seiten Url"
 
-#: dl_settings.py:18
+#: models.py:19
+msgid "slug"
+msgstr "Schlagwort"
+
+#: models.py:21
+msgid "is aktive"
+msgstr "Ist aktiv"
+
+#: models.py:25
+msgid "Select the content your like                                       to provide."
+msgstr "Wähle den anzubietenden Inhalt aus."
+
+#: models.py:27
+msgid "content to serve"
+msgstr "Anzubietender Inhalt"
+
+#: models.py:36
+msgid "creation time"
+msgstr "Erstellungszeit"
+
+#: models.py:38
+msgid "timout in hours"
+msgstr "Gültigkeit in Stundenk"
+
+#: models.py:39
+msgid "Zero value means no timeout."
+msgstr "Keine Zeitüberschreitung bei Nullwert"
+
+#: models.py:40
+msgid "maximum allowed clicks"
+msgstr "Maximal zugelassene Zugriffe"
+
+#: models.py:41
+msgid "Zero value means no limitation."
+msgstr "Keine Beschränkung bei Nullwert"
+
+#: models.py:42
+msgid "current clicks"
+msgstr "Aktuelle Zugriffe"
+
+#: models.py:72
+msgid "never expires"
+msgstr "Immer gültig"
+
+#: models.py:137
+msgid "Slug"
+msgstr "Schlagwort"
+
+#: models.py:137
+msgid "Filename"
+msgstr "Dateiname"
+
+#: presettings.py:16
 msgid "This request is faulty"
 msgstr "Diese Verknüpfung ist fehlerhaft"
 
-#: dl_settings.py:19
+#: presettings.py:17
 msgid "Sorry, this request is already expired"
 msgstr "Der angeforderte Inhalt ist nicht mehr Verfügbar"
 
-#: models.py:31
-msgid "Platform independent file path field implementation"
-msgstr "Platform unabhängige Dateipfad-Auswahl-Feld Implementierung"
-
-#: models.py:70
-msgid "Files with whitespaces can't be used!"
-msgstr "Dateien mit Leerstellen im Dateinamen können nicht ausgewählt werden!"
-
-#: models.py:82
-msgid "slug"
-msgstr "Schlagwort"
-
-#: models.py:84
-msgid "is aktive"
-msgstr "Ist aktiv"
-
-#: models.py:89
-msgid ""
-"Select the content your like                                      to "
-"provide. File names with whitespaces won't be saved!"
-msgstr ""
-"Dateiauswahl für den zu erstellenden Link.Dateien mit Leerstellen im "
-"Dateinamen werden nicht gespeichert!"
-
-#: models.py:91
-msgid "content to serve"
-msgstr "Anzubietender Inhalt"
-
-#: models.py:103
-msgid "creation time"
-msgstr "Erstellungszeit"
-
-#: models.py:105
-msgid "timout in hours"
-msgstr "Gültigkeit in Stundenk"
-
-#: models.py:106
-msgid "Zero value means no timeout."
-msgstr "Keine Zeitüberschreitung bei Nullwert"
-
-#: models.py:107
-msgid "maximum allowed clicks"
-msgstr "Maximal zugelassene Zugriffe"
-
-#: models.py:108
-msgid "Zero value means no limitation."
-msgstr "Keine Beschränkung bei Nullwert"
-
-#: models.py:109
-msgid "current clicks"
-msgstr "Aktuelle Zugriffe"
-
-#: models.py:139
-msgid "never expires"
-msgstr "Immer gültig"
-
-#: models.py:209
-msgid "Slug"
-msgstr "Schlagwort"
-
-#: models.py:209
-msgid "Filename"
-msgstr "Dateiname"
-
 #: views.py:37
 msgid "Sorry, your request is mot available"
 msgstr "Die Anfrage ist nicht verfügbar"
 
-#: views.py:99
+#: views.py:104
 msgid "File not found!"
 msgstr "Datei nicht gefunden"
 
-#: templates/dynamicLink/not_avallible.html:6
-#: templates/dynamicLink/provide.html:6
+#: templates/dynamicLink/not_avallible.html:5
+#: templates/dynamicLink/provide.html:5
 msgid "download"
 msgstr "Download"
 
-#: templates/dynamicLink/not_avallible.html:14
+#: templates/dynamicLink/not_avallible.html:12
 msgid "If something goes wrong please contact us with "
 msgstr "Im Falle eines Fehlers kontaktieren Sie uns bitte über "
 
-#: templates/dynamicLink/not_avallible.html:15
+#: templates/dynamicLink/not_avallible.html:13
 #: templates/dynamicLink/provide.html:47
 msgid "our contact form"
 msgstr "unser Kontaktformular"
 
-#: templates/dynamicLink/provide.html:7
+#: templates/dynamicLink/provide.html:8
 msgid "for later use please bookmark this page"
 msgstr "Für späteren Zugriff diese Seite zu den Lesezeichen hinzugügen"
 
 msgid "If something goes wrong with your download then contact us with"
 msgstr "Sollten Probleme auftreten kontaktieren Sie uns bitte über"
 
+#~ msgid "Platform independent file path field implementation"
+#~ msgstr "Platform unabhängige Dateipfad-Auswahl-Feld Implementierung"
+
+#~ msgid "Files with whitespaces can't be used!"
+#~ msgstr "Dateien mit Leerstellen im Dateinamen können nicht ausgewählt werden!"
+
 #~ msgid "Select the content your like to provide."
 #~ msgstr "Auswahl der gewünschten Dateien"

File src/dynamicLink/locale/en/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-17 22:28+0800\n"
+"POT-Creation-Date: 2011-08-17 15:09+0800\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin.py:26
+#: admin.py:27
 msgid "Link"
 msgstr ""
 
-#: admin.py:29
+#: admin.py:30
 msgid "Aditional values"
 msgstr ""
 
-#: admin.py:44
+#: admin.py:45
 msgid "timeout"
 msgstr ""
 
-#: admin.py:48
+#: admin.py:49
 msgid "valid"
 msgstr ""
 
-#: admin.py:54
+#: admin.py:55
 msgid "file"
 msgstr ""
 
-#: admin.py:58 admin.py:68
+#: admin.py:59 admin.py:69
 msgid "from"
 msgstr ""
 
-#: admin.py:65
+#: admin.py:66
 msgid "max clicks reached"
 msgstr ""
 
-#: admin.py:68
+#: admin.py:69
 msgid "unlimited"
 msgstr ""
 
-#: admin.py:72
+#: admin.py:73
 msgid "clicks"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:82
 msgid "Site"
 msgstr ""
 
-#: admin.py:82
+#: admin.py:86
 msgid "File"
 msgstr ""
 
-#: admin.py:85
+#: admin.py:90
 msgid "link"
 msgstr ""
 
-#: admin.py:97
+#: admin.py:102
 msgid "Make from selected a download site link"
 msgstr ""
 
-#: dl_settings.py:18
+#: models.py:19
+msgid "slug"
+msgstr ""
+
+#: models.py:21
+msgid "is aktive"
+msgstr ""
+
+#: models.py:25
+msgid ""
+"Select the content your like                                       to "
+"provide."
+msgstr ""
+
+#: models.py:27
+msgid "content to serve"
+msgstr ""
+
+#: models.py:36
+msgid "creation time"
+msgstr ""
+
+#: models.py:38
+msgid "timout in hours"
+msgstr ""
+
+#: models.py:39
+msgid "Zero value means no timeout."
+msgstr ""
+
+#: models.py:40
+msgid "maximum allowed clicks"
+msgstr ""
+
+#: models.py:41
+msgid "Zero value means no limitation."
+msgstr ""
+
+#: models.py:42
+msgid "current clicks"
+msgstr ""
+
+#: models.py:72
+msgid "never expires"
+msgstr ""
+
+#: models.py:137
+msgid "Slug"
+msgstr ""
+
+#: models.py:137
+msgid "Filename"
+msgstr ""
+
+#: presettings.py:16
 msgid "This request is faulty"
 msgstr ""
 
-#: dl_settings.py:19
+#: presettings.py:17
 msgid "Sorry, this request is already expired"
 msgstr ""
 
-#: models.py:31
-msgid "Platform independent file path field implementation"
-msgstr ""
-
-#: models.py:70
-msgid "Files with whitespaces can't be used!"
-msgstr ""
-
-#: models.py:82
-msgid "slug"
-msgstr ""
-
-#: models.py:84
-msgid "is aktive"
-msgstr ""
-
-#: models.py:89
-msgid ""
-"Select the content your like                                      to "
-"provide. File names with whitespaces won't be saved!"
-msgstr ""
-
-#: models.py:91
-msgid "content to serve"
-msgstr ""
-
-#: models.py:103
-msgid "creation time"
-msgstr ""
-
-#: models.py:105
-msgid "timout in hours"
-msgstr ""
-
-#: models.py:106
-msgid "Zero value means no timeout."
-msgstr ""
-
-#: models.py:107
-msgid "maximum allowed clicks"
-msgstr ""
-
-#: models.py:108
-msgid "Zero value means no limitation."
-msgstr ""
-
-#: models.py:109
-msgid "current clicks"
-msgstr ""
-
-#: models.py:139
-msgid "never expires"
-msgstr ""
-
-#: models.py:209
-msgid "Slug"
-msgstr ""
-
-#: models.py:209
-msgid "Filename"
-msgstr ""
-
 #: views.py:37
 msgid "Sorry, your request is mot available"
 msgstr ""
 
-#: views.py:99
+#: views.py:104
 msgid "File not found!"
 msgstr ""
 
-#: templates/dynamicLink/not_avallible.html:6
-#: templates/dynamicLink/provide.html:6
+#: templates/dynamicLink/not_avallible.html:5
+#: templates/dynamicLink/provide.html:5
 msgid "download"
 msgstr ""
 
-#: templates/dynamicLink/not_avallible.html:14
+#: templates/dynamicLink/not_avallible.html:12
 msgid "If something goes wrong please contact us with "
 msgstr ""
 
-#: templates/dynamicLink/not_avallible.html:15
+#: templates/dynamicLink/not_avallible.html:13
 #: templates/dynamicLink/provide.html:47
 msgid "our contact form"
 msgstr ""
 
-#: templates/dynamicLink/provide.html:7
+#: templates/dynamicLink/provide.html:8
 msgid "for later use please bookmark this page"
 msgstr ""
 

File src/dynamicLink/version.py

 # -*- coding:utf-8 -*-
 # This Python file uses the following encoding: utf-8
 
-VERSION = (0,4,7)
+VERSION = (0,4,8)
 APPLICATION_NAME = "Dynamic Link"
 VERSION_str = str(VERSION).strip('()').replace(',','.').replace(' ','')
 VERSION_INFO = """
 Modification date: 03.08.2011
 
 Hints:
+- 0.4.8 -   Runs now under Djang 1.3
 - 0.4.7 -   - Preesettings can now be overwrite in the presettings.py in the project
             folder, or directly in the global settings.py, or in a file
             called dl_settings.py in the same directory as manage.py.
 
 TODO:
     - write more unittests
-""" % (VERSION_str,)
+""" % (VERSION_str,)

File src/dynamicLink/version.pyc

Binary file modified.

File src/example/urls.py

     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
-    (r'^admin/(.*)', admin.site.root),
+    url(r'^admin/', include(admin.site.urls)),
 )