This commit is contained in:
Martin Mahner 2012-04-20 11:48:26 +02:00
parent a46b7b6f5a
commit 74cd9345ae
2 changed files with 8 additions and 6 deletions

View file

@ -18,6 +18,7 @@ EXPIRE_CHOICES = (
EXPIRE_DEFAULT = 3600 * 24 * 30 EXPIRE_DEFAULT = 3600 * 24 * 30
class SnippetForm(forms.ModelForm): class SnippetForm(forms.ModelForm):
lexer = forms.ChoiceField(choices=LEXER_LIST, initial=LEXER_DEFAULT, label=_(u'Lexer')) lexer = forms.ChoiceField(choices=LEXER_LIST, initial=LEXER_DEFAULT, label=_(u'Lexer'))
expire_options = forms.ChoiceField(choices=EXPIRE_CHOICES, initial=EXPIRE_DEFAULT, label=_(u'Expires')) expire_options = forms.ChoiceField(choices=EXPIRE_CHOICES, initial=EXPIRE_DEFAULT, label=_(u'Expires'))
@ -91,6 +92,7 @@ USERPREFS_FONT_CHOICES = [(None, _(u'Default'))] + [
USERPREFS_SIZES = [(None, _(u'Default'))] + [(i, '%dpx' % i) for i in range(5, 25)] USERPREFS_SIZES = [(None, _(u'Default'))] + [(i, '%dpx' % i) for i in range(5, 25)]
class UserSettingsForm(forms.Form): class UserSettingsForm(forms.Form):
default_name = forms.CharField(label=_(u'Default Name'), required=False) default_name = forms.CharField(label=_(u'Default Name'), required=False)

View file

@ -2,10 +2,10 @@
import threading import threading
from django.conf import settings
from django.core.mail.backends.base import BaseEmailBackend from django.core.mail.backends.base import BaseEmailBackend
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
class EmailBackend(BaseEmailBackend): class EmailBackend(BaseEmailBackend):
def __init__(self, fail_silently=False, **kwargs): def __init__(self, fail_silently=False, **kwargs):
super(EmailBackend, self).__init__(fail_silently=fail_silently) super(EmailBackend, self).__init__(fail_silently=fail_silently)