Changeset 1362:e378a3bb8ea3

Timestamp:

05/15/10 03:04:42 (2 years ago)

Author:

Mike Crute <mcrute@…>

Branch:

default

Parents:

1353:9bae0266ee9d (diff), 1361:ca86c3bc1042 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging polish translation changes for Ticket 237

Location:

zine

Files:

• forms.py (modified) (1 diff)
• forms.py (modified) (10 diffs)
• shared/admin/img/footerbg.png (deleted)
• templates/admin/import_blogger.html (deleted)
• utils/mail.py (modified) (2 diffs)
• websetup/__init__.py (modified) (2 diffs)
• websetup/__init__.py (modified) (3 diffs)

zine/forms.py

@@ -913 +913 @@
 
     def context_validate(self, data):
+        if self.user.posts.count() is 0:
+            data['action'] = None
         if data['action'] == 'reassign' and not data['reassign_to']:
             raise ValidationError(_('You have to select a user to reassign '

zine/forms.py

@@ -6 +6 @@
     The form classes the zine core uses.
 
-    :copyright: (c) 2009 by the Zine Team, see AUTHORS for more details.
+    :copyright: (c) 2010 by the Zine Team, see AUTHORS for more details.
     :license: BSD, see LICENSE for more details.
 """
@@ -15 +15 @@
 from zine.application import get_application, get_request, emit_event
 from zine.config import DEFAULT_VARS
-from zine.database import db, posts, comments, notification_subscriptions
+from zine.database import db, posts
 from zine.models import User, Group, Comment, Post, Category, Tag, \
      NotificationSubscription, STATUS_DRAFT, STATUS_PUBLISHED, \
@@ -28 +28 @@
 from zine.utils.http import redirect_to
 from zine.utils.validators import ValidationError, is_valid_email, \
-     is_valid_url, is_valid_slug, is_netaddr, is_not_whitespace_only
+     is_valid_url, is_valid_slug, is_not_whitespace_only
 from zine.utils.redirects import register_redirect, change_url_prefix
 
@@ -109 +109 @@
     )])
     body = forms.TextField(lazy_gettext(u'Text'), min_length=2, max_length=6000,
-                           messages=dict(
+                           required=True, messages=dict(
         too_short=lazy_gettext(u'Your comment is too short.'),
         too_long=lazy_gettext(u'Your comment is too long.'),
@@ -140 +140 @@
         if not self.post.comments_enabled:
             raise ValidationError(_('Post is closed for commenting.'))
+        if self.post.comments_closed:
+            raise ValidationError(_('Commenting is no longer possible.'))
 
     def make_comment(self):
@@ -541 +543 @@
         self.comment.bocked_msg = msg
 
+
 class MarkCommentForm(_CommentBoundForm):
     """Form used to block comments."""
@@ -913 +916 @@
             data['action'] = None
         if data['action'] == 'reassign' and not data['reassign_to']:
-            # XXX: Bad wording
-            raise ValidationError(_('You have to select the user that '
-                                    'gets the posts assigned.'))
+            raise ValidationError(_('You have to select a user to reassign '
+                                    'the posts to.'))
 
     def delete_user(self):
@@ -1004 +1006 @@
     """Used for a user to delete a his own account."""
 
+    password = forms.TextField(
+        lazy_gettext(u"Your password is required to delete your account:"),
+        required=True, widget=forms.PasswordInput,
+        messages = dict(required=lazy_gettext(u'Your password is required!'))
+    )
+
     def __init__(self, user, initial=None):
         _UserBoundForm.__init__(self, user, forms.fill_dict(initial,
             action='delete'
         ))
+
+    def validate_password(self, value):
+        if not self.user.check_password(value):
+            raise ValidationError(_(u'Invalid password'))
 
     def delete_user(self):
@@ -1067 +1079 @@
                                      lazy_gettext(u'Comment Moderation'),
                                      widget=forms.RadioButtonGroup)
+    comments_open_for = config_field('comments_open_for',
+        label=lazy_gettext(u'Comments Open Period'))
     pings_enabled = config_field('pings_enabled',
         lazy_gettext(u'Pingbacks enabled'),
@@ -1208 +1222 @@
             else:
                 parent = None
-    # One could probably optimize this by tracking the amount of deleted
-    # comments
+    # XXX: one could probably optimize this by tracking the amount
+    # of deleted comments
     comment.post.sync_comment_count()
 

zine/utils/mail.py

@@ -5 +5 @@
     This module implements some email-related functions and classes.
 
-    :copyright: (c) 2009 by the Zine Team, see AUTHORS for more details.
+    :copyright: (c) 2010 by the Zine Team, see AUTHORS for more details.
     :license: BSD, see LICENSE for more details.
 """
@@ -17 +17 @@
 from urlparse import urlparse
 
-from zine.utils import local
 from zine.utils.validators import is_valid_email, check
 

zine/websetup/__init__.py

@@ -149 +149 @@
         error = None
         database_uri = value('database_uri', '').strip()
+        
+        # set up the initial config
+        config_filename = path.join(self.instance_folder, 'zine.ini')
+        cfg = Configuration(config_filename)
+        t = cfg.edit()
+        t.update(
+            maintenance_mode=environment.MODE != 'development',
+            blog_url=request.url_root,
+            secret_key=gen_secret_key(),
+            database_uri=database_uri,
+            language=request.translations.language,
+            iid=new_iid(),
+            # load one plugin by default for a better theme
+            plugins='vessel_theme',
+            theme='vessel'
+        )
+        cfg._comments['[zine]'] = CONFIG_HEADER
+        try:
+            t.commit()
+        except ConfigurationTransactionError:
+            _ = request.translations.gettext
+            error = _('The configuration file (%s) could not be opened '
+                      'for writing. Please adjust your permissions and '
+                      'try again.') % config_filename
+            return render_response(request, 'error.html', {
+            'finished': False,
+            'error':    error
+            })
 
         try:
@@ -183 +211 @@
             )
 
-            # set up the initial config
-            config_filename = path.join(self.instance_folder, 'zine.ini')
-            cfg = Configuration(config_filename)
-            t = cfg.edit()
-            t.update(
-                maintenance_mode=environment.MODE != 'development',
-                blog_url=request.url_root,
-                secret_key=gen_secret_key(),
-                database_uri=database_uri,
-                language=request.translations.language,
-                iid=new_iid(),
-                # load one plugin by default for a better theme
-                plugins='vessel_theme',
-                theme='vessel'
-            )
-            cfg._comments['[zine]'] = CONFIG_HEADER
-            try:
-                t.commit()
-            except ConfigurationTransactionError:
-                _ = request.translations.gettext
-                error = _('The configuration file (%s) could not be opened '
-                          'for writing. Please adjust your permissions and '
-                          'try again.') % config_filename
 
         # use a local variable, the global render_response could

zine/websetup/__init__.py

@@ -12 +12 @@
     would already be returned by the normal Zine installation.
 
-    :copyright: (c) 2009 by the Zine Team, see AUTHORS for more details.
+    :copyright: (c) 2010 by the Zine Team, see AUTHORS for more details.
     :license: BSD, see LICENSE for more details.
 """
@@ -21 +21 @@
 from zine.api import db
 from zine.config import ConfigurationTransactionError
-from zine.models import User
 from zine.utils.crypto import gen_pwhash, gen_secret_key, new_iid
 from zine.utils.validators import is_valid_email, check
@@ -83 +82 @@
 
     def handle_view(self, request, name, ctx=None):
-        handler = self.views[name]
+        #handler = self.views[name]
         ctx = ctx or {}
         ctx.update({