projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Edit comment-notification text
[mediagoblin.git]
/
mediagoblin
/
edit
/
forms.py
diff --git
a/mediagoblin/edit/forms.py
b/mediagoblin/edit/forms.py
index 5c191fba62e7efa40b8183f8cc5b000b0290b0fd..e2882adad02d41440a0c621c4edae6a19d88a3d0 100644
(file)
--- a/
mediagoblin/edit/forms.py
+++ b/
mediagoblin/edit/forms.py
@@
-1,5
+1,5
@@
# GNU MediaGoblin -- federated, autonomous media hosting
# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors. See AUTHORS.
+# Copyright (C) 2011
, 2012
MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@
-18,6
+18,7
@@
import wtforms
from mediagoblin.tools.text import tag_length_validator, TOO_LONG_TAG_WARNING
from mediagoblin.tools.translate import fake_ugettext_passthrough as _
from mediagoblin.tools.text import tag_length_validator, TOO_LONG_TAG_WARNING
from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.licenses import licenses_as_choices
class EditForm(wtforms.Form):
title = wtforms.TextField(
class EditForm(wtforms.Form):
title = wtforms.TextField(
@@
-39,7
+40,10
@@
class EditForm(wtforms.Form):
description=_(
"The title part of this media's address. "
"You usually don't need to change this."))
description=_(
"The title part of this media's address. "
"You usually don't need to change this."))
-
+ license = wtforms.SelectField(
+ _('License'),
+ [wtforms.validators.Optional(),],
+ choices=licenses_as_choices())
class EditProfileForm(wtforms.Form):
bio = wtforms.TextAreaField(
class EditProfileForm(wtforms.Form):
bio = wtforms.TextAreaField(
@@
-51,20
+55,21
@@
class EditProfileForm(wtforms.Form):
url = wtforms.TextField(
_('Website'),
[wtforms.validators.Optional(),
url = wtforms.TextField(
_('Website'),
[wtforms.validators.Optional(),
- wtforms.validators.URL(message=
"""This address contains errors"""
)])
+ wtforms.validators.URL(message=
_("This address contains errors")
)])
class EditAccountForm(wtforms.Form):
old_password = wtforms.PasswordField(
_('Old password'),
class EditAccountForm(wtforms.Form):
old_password = wtforms.PasswordField(
_('Old password'),
- [wtforms.validators.Required()],
description=_(
"Enter your old password to prove you own this account."))
new_password = wtforms.PasswordField(
_('New password'),
description=_(
"Enter your old password to prove you own this account."))
new_password = wtforms.PasswordField(
_('New password'),
- [wtforms.validators.Required(),
- wtforms.validators.Length(min=6, max=30)],
+ [wtforms.validators.Length(min=6, max=30)],
id="password")
id="password")
+ wants_comment_notification = wtforms.BooleanField(
+ _(''),
+ description=_("Email me when others comment on my media"))
class EditAttachmentsForm(wtforms.Form):
class EditAttachmentsForm(wtforms.Form):