From: Patrick Samson Date: Sun, 27 Oct 2013 09:51:46 +0000 (+0100) Subject: Renamed test_urls.py to urls_for_tests.py ; Converted some translations to lazy X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7ab862375a0b78146ba03d02c6bedc55dbd40fe2;p=django-postman.git Renamed test_urls.py to urls_for_tests.py ; Converted some translations to lazy --- diff --git a/CHANGELOG b/CHANGELOG index be75a53..f7beab3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,13 @@ Django Postman changelog ======================== +Version 3.0.2, October 2013 +--------------------------- +* Rename test_urls.py to urls_for_tests.py, for adjustment with the new test discovery feature of Django 1.6. +* Fix the need for some translations to become lazy, introduced by the conversion to class-based views. +* Fix issue #36, BooleanField definition needs an explicit default value for Django 1.6. +* Fix issue #35, the app can work without the sites framework. + Version 3.0.1, August 2013 -------------------------- * Fix issue #32, an IndexError when a Paginator is used and the folder is empty. diff --git a/docs/conf.py b/docs/conf.py index 0894775..9a8fe1d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,7 +47,7 @@ copyright = u'2010, Patrick Samson' # The short X.Y version. version = '3.0' # The full version, including alpha/beta/rc tags. -release = '3.0.1.post1' +release = '3.0.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/postman/__init__.py b/postman/__init__.py index 86783a7..5f7f5b9 100644 --- a/postman/__init__.py +++ b/postman/__init__.py @@ -4,9 +4,9 @@ A messaging application for Django from __future__ import unicode_literals # following PEP 386: N.N[.N]+[{a|b|c|rc}N[.N]+][.postN][.devN] -VERSION = (3, 0, 1) +VERSION = (3, 0, 2) PREREL = () -POST = 1 +POST = 0 DEV = 0 # options diff --git a/postman/locale/nl/LC_MESSAGES/django.mo b/postman/locale/nl/LC_MESSAGES/django.mo index cb43240..da1c034 100644 Binary files a/postman/locale/nl/LC_MESSAGES/django.mo and b/postman/locale/nl/LC_MESSAGES/django.mo differ diff --git a/postman/locale/nl/LC_MESSAGES/django.po b/postman/locale/nl/LC_MESSAGES/django.po index 0b8cf93..cd61737 100644 --- a/postman/locale/nl/LC_MESSAGES/django.po +++ b/postman/locale/nl/LC_MESSAGES/django.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the django-postman package. # # Translators: -# Patrick Samson , 2011. +# Gwildor , 2013 +# Patrick Samson , 2011 msgid "" msgstr "" "Project-Id-Version: django-postman\n" "Report-Msgid-Bugs-To: http://bitbucket.org/psam/django-postman/issues\n" -"POT-Creation-Date: 2012-12-10 23:13+0100\n" -"PO-Revision-Date: 2010-12-27 15:10+0000\n" -"Last-Translator: Patrick Samson \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2012-12-10 23:00+0100\n" +"PO-Revision-Date: 2013-10-11 14:53+0000\n" +"Last-Translator: Gwildor \n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/django-postman/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -137,7 +138,7 @@ msgstr "" #: .\models.py:28 msgid "Accepted" -msgstr "" +msgstr "Geaccepteerd" #: .\models.py:29 .\templates\postman\view.html.py:14 msgid "Rejected" @@ -245,11 +246,7 @@ msgid "" "\n" "{sender} wrote:\n" "{body}\n" -msgstr "" -"\n" -"\n" -"{sender} schreef:\n" -"{body}\n" +msgstr "\n\n{sender} schreef:\n{body}\n" #: .\utils.py:63 msgid "Re: {subject}" @@ -261,7 +258,7 @@ msgstr "Bericht succesvol verstuurd." #: .\views.py:146 .\views.py:208 msgid "Message rejected for at least one recipient." -msgstr "" +msgstr "Bericht geweigerd voor ten minste een ontvanger." #: .\views.py:299 msgid "Select at least one object." @@ -311,7 +308,7 @@ msgstr[1] "Herstel de fouten hieronder." #: .\templates\admin\postman\pendingmessage\submit_line.html.py:6 msgid "Accept" -msgstr "" +msgstr "Accepteer" #: .\templates\admin\postman\pendingmessage\submit_line.html.py:7 msgid "Reject" @@ -325,7 +322,7 @@ msgstr "" msgid "" "Messages in this folder will never be removed. You can use this folder for " "long term storage." -msgstr "" +msgstr "Berichten in deze map worden nooit verwijderd. Je kunt deze map gebruiken voor langdurige opslag." #: .\templates\postman\base.html.py:4 msgid "Messaging" @@ -423,7 +420,7 @@ msgstr "" #: .\templates\postman\email_user.txt.py:5 #: .\templates\postman\email_visitor.txt.py:5 msgid ", for the following reason:" -msgstr "" +msgstr ", voor de volgende reden:" #: .\templates\postman\email_user.txt.py:9 #: .\templates\postman\email_visitor.txt.py:10 @@ -460,7 +457,7 @@ msgstr "De sitebeheerder" msgid "" "Note: This message is issued by an automated system.\n" "Do not reply, this would not be taken into account." -msgstr "" +msgstr "NB: Dit bericht is verstuurd door een automatisch systeem.\nReageren helpt niet, dat wordt niet verwerkt." #: .\templates\postman\email_user_subject.txt.py:1 #: .\templates\postman\email_visitor_subject.txt.py:1 @@ -509,7 +506,7 @@ msgstr "Verwijderde berichten" msgid "" "Messages in this folder can be removed from time to time. For long term " "storage, use instead the archive folder." -msgstr "" +msgstr "Berichten in deze map kunnen van tijd tot tijd verwijderd worden. Gebruik de archiefmap voor langdurige opslag." #: .\templates\postman\view.html.py:6 msgid "Conversation" diff --git a/postman/test_urls.py b/postman/test_urls.py deleted file mode 100644 index 3aaca9c..0000000 --- a/postman/test_urls.py +++ /dev/null @@ -1,142 +0,0 @@ -""" -URLconf for tests.py usage. - -""" -from __future__ import unicode_literals - -from django.conf import settings -try: - from django.conf.urls import patterns, include, url # django 1.4 -except ImportError: - from django.conf.urls.defaults import * # "patterns, include, url" is enough for django 1.3, "*" for django 1.2 -from django.forms import ValidationError -from django.views.generic.base import RedirectView - -from . import OPTIONS -from .views import (InboxView, SentView, ArchivesView, TrashView, - WriteView, ReplyView, MessageView, ConversationView, - ArchiveView, DeleteView, UndeleteView) - - -# user_filter function set -def user_filter_reason(user): - if user.get_username() == 'bar': - return 'some reason' - return None -def user_filter_no_reason(user): - return '' -def user_filter_false(user): - return False -def user_filter_exception(user): - if user.get_username() == 'bar': - raise ValidationError(['first good reason', "anyway, I don't like {0}".format(user.get_username())]) - return None - -# exchange_filter function set -def exch_filter_reason(sender, recipient, recipients_list): - if recipient.get_username() == 'bar': - return 'some reason' - return None -def exch_filter_no_reason(sender, recipient, recipients_list): - return '' -def exch_filter_false(sender, recipient, recipients_list): - return False -def exch_filter_exception(sender, recipient, recipients_list): - if recipient.get_username() == 'bar': - raise ValidationError(['first good reason', "anyway, I don't like {0}".format(recipient.get_username())]) - return None - -# auto-moderation function set -def moderate_as_51(message): - return 51 -def moderate_as_48(message): - return (48, "some reason") -moderate_as_48.default_reason = 'some default reason' - -# quote formatters -def format_subject(subject): - return "Re_ " + subject -def format_body(sender, body): - return "{0} _ {1}".format(sender, body) - -postman_patterns = patterns('postman.views', - # Basic set - url(r'^inbox/(?:(?P