Update language strings

- Reworded some form validation strings (and better consistency across
other forms):
    - Field label & description: Only the first word starts with a
capitalised letter.
    - Headlines & Buttons: Camel Case
- General language consistency
- Did my best to eliminate my own grammar mistakes

flaskbb/auth/forms.py

@@ -25,34 +25,34 @@ is_username = regexp(USERNAME_RE,
 
 
 class LoginForm(Form):
-    login = StringField(_("Username or E-Mail Address"), validators=[
-        DataRequired(message=_("A Username or E-Mail Address is required."))]
-    )
+    login = StringField(_("Username or Email address"), validators=[
+        DataRequired(message=_("Please enter your username or email address."))
+    ])
 
     password = PasswordField(_("Password"), validators=[
-        DataRequired(message=_("A Password is required."))])
+        DataRequired(message=_("Please enter your password."))])
 
     recaptcha = RecaptchaField(_("Captcha"))
 
-    remember_me = BooleanField(_("Remember Me"), default=False)
+    remember_me = BooleanField(_("Remember me"), default=False)
 
     submit = SubmitField(_("Login"))
 
 
 class RegisterForm(Form):
     username = StringField(_("Username"), validators=[
-        DataRequired(message=_("A Username is required.")),
+        DataRequired(message=_("A valid username is required.")),
         is_username])
 
-    email = StringField(_("E-Mail Address"), validators=[
-        DataRequired(message=_("A E-Mail Address is required.")),
-        Email(message=_("Invalid E-Mail Address."))])
+    email = StringField(_("Email address"), validators=[
+        DataRequired(message=_("A valid email address is required.")),
+        Email(message=_("Invalid email address."))])
 
     password = PasswordField(_('Password'), validators=[
         InputRequired(),
         EqualTo('confirm_password', message=_('Passwords must match.'))])
 
-    confirm_password = PasswordField(_('Confirm Password'))
+    confirm_password = PasswordField(_('Confirm password'))
 
     recaptcha = RecaptchaField(_("Captcha"))
 
@@ -65,12 +65,12 @@ class RegisterForm(Form):
     def validate_username(self, field):
         user = User.query.filter_by(username=field.data).first()
         if user:
-            raise ValidationError(_("This Username is already taken."))
+            raise ValidationError(_("This username is already taken."))
 
     def validate_email(self, field):
         email = User.query.filter_by(email=field.data).first()
         if email:
-            raise ValidationError(_("This E-Mail Address is already taken."))
+            raise ValidationError(_("This email address is already taken."))
 
     def save(self):
         user = User(username=self.username.data,
@@ -84,14 +84,14 @@ class RegisterForm(Form):
 
 class ReauthForm(Form):
     password = PasswordField(_('Password'), validators=[
-        DataRequired(message=_("A Password is required."))])
+        DataRequired(message=_("Please enter your password."))])
 
     submit = SubmitField(_("Refresh Login"))
 
 
 class ForgotPasswordForm(Form):
-    email = StringField(_('E-Mail Address'), validators=[
-        DataRequired(message=_("A E-Mail Address is reguired.")),
+    email = StringField(_('Email address'), validators=[
+        DataRequired(message=_("A valid email address is required.")),
         Email()])
 
     recaptcha = RecaptchaField(_("Captcha"))
@@ -102,32 +102,32 @@ class ForgotPasswordForm(Form):
 class ResetPasswordForm(Form):
     token = HiddenField('Token')
 
-    email = StringField(_('E-Mail Address'), validators=[
-        DataRequired(message=_("A E-Mail Address is required.")),
+    email = StringField(_('Email address'), validators=[
+        DataRequired(message=_("A valid email address is required.")),
         Email()])
 
     password = PasswordField(_('Password'), validators=[
         InputRequired(),
         EqualTo('confirm_password', message=_('Passwords must match.'))])
 
-    confirm_password = PasswordField(_('Confirm Password'))
+    confirm_password = PasswordField(_('Confirm password'))
 
-    submit = SubmitField(_("Reset Password"))
+    submit = SubmitField(_("Reset password"))
 
     def validate_email(self, field):
         email = User.query.filter_by(email=field.data).first()
         if not email:
-            raise ValidationError(_("Wrong E-Mail Address."))
+            raise ValidationError(_("Wrong email address."))
 
 
 class RequestActivationForm(Form):
     username = StringField(_("Username"), validators=[
-        DataRequired(message=_("A Username is required.")),
+        DataRequired(message=_("A valid username is required.")),
         is_username])
 
-    email = StringField(_("E-Mail Address"), validators=[
-        DataRequired(message=_("A E-Mail Address is required.")),
-        Email(message=_("Invalid E-Mail Address."))])
+    email = StringField(_("Email address"), validators=[
+        DataRequired(message=_("A valid email address is required.")),
+        Email(message=_("Invalid email address."))])
 
     submit = SubmitField(_("Send Confirmation Mail"))
 
@@ -135,16 +135,16 @@ class RequestActivationForm(Form):
         self.user = User.query.filter_by(email=field.data).first()
         # check if the username matches the one found in the database
         if not self.user.username == self.username.data:
-            raise ValidationError(_("Account does not exist."))
+            raise ValidationError(_("User does not exist."))
 
         if self.user.activated is not None:
-            raise ValidationError(_("Account is already active."))
+            raise ValidationError(_("User is already active."))
 
 
 class AccountActivationForm(Form):
-    token = StringField(_("E-Mail Confirmation Token"), validators=[
+    token = StringField(_("Email confirmation token"), validators=[
         DataRequired(message=_("Please enter the token that we have sent to "
                                "you."))
     ])
 
-    submit = SubmitField(_("Confirm E-Mail"))
+    submit = SubmitField(_("Confirm Email"))

flaskbb/auth/views.py

@@ -92,7 +92,7 @@ def login():
             login_user(user, remember=form.remember_me.data)
             return redirect_or_next(url_for("forum.index"))
         except AuthenticationError:
-            flash(_("Wrong Username or Password."), "danger")
+            flash(_("Wrong username or password."), "danger")
 
     return render_template("auth/login.html", form=form,
                            login_recaptcha=login_recaptcha)
@@ -170,10 +170,10 @@ def forgot_password():
 
         if user:
             send_reset_token(user)
-            flash(_("E-Mail sent! Please check your inbox."), "info")
+            flash(_("Email sent! Please check your inbox."), "info")
             return redirect(url_for("auth.forgot_password"))
         else:
-            flash(_("You have entered a Username or E-Mail Address that is "
+            flash(_("You have entered an username or email address that is "
                     "not linked with your account."), "danger")
     return render_template("auth/forgot_password.html", form=form)
 
@@ -190,17 +190,17 @@ def reset_password(token):
                                                   "reset_password")
 
         if invalid:
-            flash(_("Your Password Token is invalid."), "danger")
+            flash(_("Your password token is invalid."), "danger")
             return redirect(url_for("auth.forgot_password"))
 
         if expired:
-            flash(_("Your Password Token is expired."), "danger")
+            flash(_("Your password token is expired."), "danger")
             return redirect(url_for("auth.forgot_password"))
 
         if user:
             user.password = form.password.data
             user.save()
-            flash(_("Your Password has been updated."), "success")
+            flash(_("Your password has been updated."), "success")
             return redirect(url_for("auth.login"))
 
     form.token.data = token
@@ -257,7 +257,7 @@ def activate_account(token=None):
             logout_user()
             login_user(user)
 
-        flash(_("Your Account has been activated.", "success"))
+        flash(_("Your account has been activated.", "success"))
         return redirect(url_for("forum.index"))
 
     return render_template("auth/account_activation.html", form=form)

flaskbb/forum/forms.py

@@ -19,7 +19,7 @@ from flaskbb.user.models import User
 
 
 class QuickreplyForm(Form):
-    content = TextAreaField(_("Quick Reply"), validators=[
+    content = TextAreaField(_("Quick reply"), validators=[
         DataRequired(message=_("You cannot post a reply without content."))])
 
     submit = SubmitField(_("Reply"))
@@ -33,7 +33,7 @@ class ReplyForm(Form):
     content = TextAreaField(_("Content"), validators=[
         DataRequired(message=_("You cannot post a reply without content."))])
 
-    track_topic = BooleanField(_("Track this Topic"), default=False,
+    track_topic = BooleanField(_("Track this topic"), default=False,
                                validators=[Optional()])
 
     submit = SubmitField(_("Reply"))
@@ -48,13 +48,13 @@ class ReplyForm(Form):
 
 
 class NewTopicForm(ReplyForm):
-    title = StringField(_("Topic Title"), validators=[
-        DataRequired(message=_("Please choose a Topic Title."))])
+    title = StringField(_("Topic title"), validators=[
+        DataRequired(message=_("Please choose a title for your topic."))])
 
     content = TextAreaField(_("Content"), validators=[
         DataRequired(message=_("You cannot post a reply without content."))])
 
-    track_topic = BooleanField(_("Track this Topic"), default=False,
+    track_topic = BooleanField(_("Track this topic"), default=False,
                                validators=[Optional()])
 
     submit = SubmitField(_("Post Topic"))
@@ -71,10 +71,10 @@ class NewTopicForm(ReplyForm):
 
 class ReportForm(Form):
     reason = TextAreaField(_("Reason"), validators=[
-        DataRequired(message=_("What's the reason for reporting this post?"))
+        DataRequired(message=_("What is the reason for reporting this post?"))
     ])
 
-    submit = SubmitField(_("Report Post"))
+    submit = SubmitField(_("Report post"))
 
     def save(self, user, post):
         report = Report(reason=self.reason.data)

flaskbb/forum/views.py

@@ -304,7 +304,7 @@ def manage_forum(forum_id, slug=None):
 
         if not len(tmp_topics) > 0:
             flash(_("In order to perform this action you have to select at "
-                    " least one topic."), "danger")
+                    "least one topic."), "danger")
             return redirect(mod_forum_url)
 
         # locking/unlocking
@@ -312,33 +312,33 @@ def manage_forum(forum_id, slug=None):
             changed = do_topic_action(topics=tmp_topics, user=current_user,
                                       action="locked", reverse=False)
 
-            flash(_("%(count)s Topics locked.", count=changed), "success")
+            flash(_("%(count)s topics locked.", count=changed), "success")
             return redirect(mod_forum_url)
 
         elif "unlock" in request.form:
             changed = do_topic_action(topics=tmp_topics, user=current_user,
                                       action="locked", reverse=True)
-            flash(_("%(count)s Topics unlocked.", count=changed), "success")
+            flash(_("%(count)s topics unlocked.", count=changed), "success")
             return redirect(mod_forum_url)
 
         # highlighting/trivializing
         elif "highlight" in request.form:
             changed = do_topic_action(topics=tmp_topics, user=current_user,
                                       action="important", reverse=False)
-            flash(_("%(count)s Topics highlighted.", count=changed), "success")
+            flash(_("%(count)s topics highlighted.", count=changed), "success")
             return redirect(mod_forum_url)
 
         elif "trivialize" in request.form:
             changed = do_topic_action(topics=tmp_topics, user=current_user,
                                       action="important", reverse=True)
-            flash(_("%(count)s Topics trivialized.", count=changed), "success")
+            flash(_("%(count)s topics trivialized.", count=changed), "success")
             return redirect(mod_forum_url)
 
         # deleting
         elif "delete" in request.form:
             changed = do_topic_action(topics=tmp_topics, user=current_user,
                                       action="delete", reverse=False)
-            flash(_("%(count)s Topics deleted.", count=changed), "success")
+            flash(_("%(count)s topics deleted.", count=changed), "success")
             return redirect(mod_forum_url)
 
         # moving

flaskbb/management/forms.py

@@ -50,12 +50,12 @@ def select_primary_group():
 
 class UserForm(Form):
     username = StringField(_("Username"), validators=[
-        DataRequired(message=_("A Username is required.")),
+        DataRequired(message=_("A valid username is required.")),
         is_username])
 
-    email = StringField(_("E-Mail Address"), validators=[
-        DataRequired(message=_("A E-Mail Address is required.")),
-        Email(message=_("Invalid E-Mail Address."))])
+    email = StringField(_("Email address"), validators=[
+        DataRequired(message=_("A valid email address is required.")),
+        Email(message=_("Invalid email address."))])
 
     password = PasswordField("Password", validators=[
         Optional()])
@@ -78,7 +78,7 @@ class UserForm(Form):
     avatar = StringField(_("Avatar"), validators=[
         Optional(), URL()])
 
-    signature = TextAreaField(_("Forum Signature"), validators=[
+    signature = TextAreaField(_("Forum signature"), validators=[
         Optional(), Length(min=0, max=250)])
 
     notes = TextAreaField(_("Notes"), validators=[
@@ -88,12 +88,12 @@ class UserForm(Form):
         Optional()])
 
     primary_group = QuerySelectField(
-        _("Primary Group"),
+        _("Primary group"),
         query_factory=select_primary_group,
         get_label="name")
 
     secondary_groups = QuerySelectMultipleField(
-        _("Secondary Groups"),
+        _("Secondary groups"),
         # TODO: Template rendering errors "NoneType is not callable"
         #       without this, figure out why.
         query_factory=select_primary_group,
@@ -113,7 +113,7 @@ class UserForm(Form):
             user = User.query.filter(User.username.like(field.data)).first()
 
         if user:
-            raise ValidationError(_("This Username is already taken."))
+            raise ValidationError(_("This username is already taken."))
 
     def validate_email(self, field):
         if hasattr(self, "user"):
@@ -127,7 +127,7 @@ class UserForm(Form):
             user = User.query.filter(User.email.like(field.data)).first()
 
         if user:
-            raise ValidationError(_("This E-Mail Address is already taken."))
+            raise ValidationError(_("This email address is already taken."))
 
     def save(self):
         data = self.data
@@ -148,63 +148,63 @@ class EditUserForm(UserForm):
 
 
 class GroupForm(Form):
-    name = StringField(_("Group Name"), validators=[
-        DataRequired(message=_("A Group name is required."))])
+    name = StringField(_("Group name"), validators=[
+        DataRequired(message=_("Please enter a name for the group."))])
 
     description = TextAreaField(_("Description"), validators=[
         Optional()])
 
     admin = BooleanField(
-        _("Is Admin Group?"),
+        _("Is 'Admin' group?"),
         description=_("With this option the group has access to "
                       "the admin panel.")
     )
     super_mod = BooleanField(
-        _("Is Super Moderator Group?"),
-        description=_("Check this if the users in this group are allowed to "
+        _("Is 'Super Moderator' group?"),
+        description=_("Check this, if the users in this group are allowed to "
                       "moderate every forum.")
     )
     mod = BooleanField(
-        _("Is Moderator Group?"),
-        description=_("Check this if the users in this group are allowed to "
+        _("Is 'Moderator' group?"),
+        description=_("Check this, if the users in this group are allowed to "
                       "moderate specified forums.")
     )
     banned = BooleanField(
-        _("Is Banned Group?"),
-        description=_("Only one Banned group is allowed.")
+        _("Is 'Banned' group?"),
+        description=_("Only one group of type 'Banned' is allowed.")
     )
     guest = BooleanField(
-        _("Is Guest Group?"),
-        description=_("Only one Guest group is allowed.")
+        _("Is 'Guest' group?"),
+        description=_("Only one group of type 'Guest' is allowed.")
     )
     editpost = BooleanField(
         _("Can edit posts"),
-        description=_("Check this if the users in this group can edit posts.")
+        description=_("Check this, if the users in this group can edit posts.")
     )
     deletepost = BooleanField(
         _("Can delete posts"),
-        description=_("Check this if the users in this group can delete "
+        description=_("Check this, if the users in this group can delete "
                       "posts.")
     )
     deletetopic = BooleanField(
         _("Can delete topics"),
-        description=_("Check this if the users in this group can delete "
+        description=_("Check this, if the users in this group can delete "
                       "topics.")
     )
     posttopic = BooleanField(
         _("Can create topics"),
-        description=_("Check this if the users in this group can create "
+        description=_("Check this, if the users in this group can create "
                       "topics.")
     )
     postreply = BooleanField(
         _("Can post replies"),
-        description=_("Check this if the users in this group can post "
+        description=_("Check this, if the users in this group can post "
                       "replies.")
     )
 
     mod_edituser = BooleanField(
         _("Moderators can edit user profiles"),
-        description=_("Allow moderators to edit a another users profile "
+        description=_("Allow moderators to edit another user's profile "
                       "including password and email changes.")
     )
 
@@ -227,7 +227,7 @@ class GroupForm(Form):
             group = Group.query.filter(Group.name.like(field.data)).first()
 
         if group:
-            raise ValidationError(_("This Group name is already taken."))
+            raise ValidationError(_("This group name is already taken."))
 
     def validate_banned(self, field):
         if hasattr(self, "group"):
@@ -241,7 +241,8 @@ class GroupForm(Form):
             group = Group.query.filter_by(banned=True).count()
 
         if field.data and group > 0:
-            raise ValidationError(_("There is already a Banned group."))
+            raise ValidationError(_("There is already a group of type "
+                                    "'Banned'."))
 
     def validate_guest(self, field):
         if hasattr(self, "group"):
@@ -255,7 +256,8 @@ class GroupForm(Form):
             group = Group.query.filter_by(guest=True).count()
 
         if field.data and group > 0:
-            raise ValidationError(_("There is already a Guest group."))
+            raise ValidationError(_("There is already a group of type "
+                                    "'Guest'."))
 
     def save(self):
         data = self.data
@@ -277,20 +279,21 @@ class AddGroupForm(GroupForm):
 
 class ForumForm(Form):
     title = StringField(
-        _("Forum Title"),
-        validators=[DataRequired(message=_("A Forum Title is required."))]
+        _("Forum title"),
+        validators=[DataRequired(message=_("Please enter a forum title."))]
     )
 
     description = TextAreaField(
         _("Description"),
         validators=[Optional()],
-        description=_("You can format your description with BBCode.")
+        description=_("You can format your description with Markdown.")
     )
 
     position = IntegerField(
         _("Position"),
         default=1,
-        validators=[DataRequired(message=_("The Forum Position is required."))]
+        validators=[DataRequired(message=_("Please enter a position for the"
+                                           "forum."))]
     )
 
     category = QuerySelectField(
@@ -302,20 +305,20 @@ class ForumForm(Form):
     )
 
     external = StringField(
-        _("External Link"),
+        _("External link"),
         validators=[Optional(), URL()],
         description=_("A link to a website i.e. 'http://flaskbb.org'.")
     )
 
     moderators = StringField(
         _("Moderators"),
-        description=_("Comma seperated usernames. Leave it blank if you do "
+        description=_("Comma separated usernames. Leave it blank if you do "
                       "not want to set any moderators.")
     )
 
     show_moderators = BooleanField(
-        _("Show Moderators"),
-        description=_("Do you want show the moderators on the index page?")
+        _("Show moderators"),
+        description=_("Do you want to show the moderators on the index page?")
     )
 
     locked = BooleanField(
@@ -324,10 +327,10 @@ class ForumForm(Form):
     )
 
     groups = QuerySelectMultipleField(
-        _("Group Access to Forum"),
+        _("Group access"),
         query_factory=selectable_groups,
         get_label="name",
-        description=_("Select user groups that can access this forum.")
+        description=_("Select the groups that can access this forum.")
     )
 
     submit = SubmitField(_("Save"))
@@ -336,7 +339,8 @@ class ForumForm(Form):
         if hasattr(self, "forum"):
             if self.forum.topics.count() > 0:
                 raise ValidationError(_("You cannot convert a forum that "
-                                        "contain topics in a external link."))
+                                        "contains topics into an "
+                                        "external link."))
 
     def validate_show_moderators(self, field):
         if field.data and not self.moderators.data:
@@ -393,20 +397,20 @@ class AddForumForm(ForumForm):
 
 
 class CategoryForm(Form):
-    title = StringField(_("Category Title"), validators=[
-        DataRequired(message=_("A Category Title is required."))])
+    title = StringField(_("Category title"), validators=[
+        DataRequired(message=_("Please enter a category title."))])
 
     description = TextAreaField(
         _("Description"),
         validators=[Optional()],
-        description=_("You can format your description with BBCode.")
+        description=_("You can format your description with Markdown.")
     )
 
     position = IntegerField(
         _("Position"),
         default=1,
-        validators=[DataRequired(message=_("The Category Position is "
-                                           "required."))]
+        validators=[DataRequired(message=_("Please enter a position for the "
+                                           "category."))]
     )
 
     submit = SubmitField(_("Save"))

flaskbb/management/views.py

@@ -181,7 +181,7 @@ def edit_user(user_id):
 
         user.save(groups=form.secondary_groups.data)
 
-        flash(_("User successfully updated."), "success")
+        flash(_("User updated."), "success")
         return redirect(url_for("management.edit_user", user_id=user.id))
 
     return render_template("management/user_form.html", form=form,
@@ -212,7 +212,7 @@ def delete_user(user_id=None):
                 })
 
         return jsonify(
-            message="{} Users deleted.".format(len(data)),
+            message="{} users deleted.".format(len(data)),
             category="success",
             data=data,
             status=200
@@ -224,7 +224,7 @@ def delete_user(user_id=None):
         return redirect(url_for("management.users"))
 
     user.delete()
-    flash(_("User successfully deleted."), "success")
+    flash(_("User deleted."), "success")
     return redirect(url_for("management.users"))
 
 
@@ -234,7 +234,7 @@ def add_user():
     form = AddUserForm()
     if form.validate_on_submit():
         form.save()
-        flash(_("User successfully added."), "success")
+        flash(_("User added."), "success")
         return redirect(url_for("management.users"))
 
     return render_template("management/user_form.html", form=form,
@@ -298,7 +298,7 @@ def ban_user(user_id=None):
                 })
 
         return jsonify(
-            message="{} Users banned.".format(len(data)),
+            message="{} users banned.".format(len(data)),
             category="success",
             data=data,
             status=200
@@ -347,7 +347,7 @@ def unban_user(user_id=None):
                 })
 
         return jsonify(
-            message="{} Users unbanned.".format(len(data)),
+            message="{} users unbanned.".format(len(data)),
             category="success",
             data=data,
             status=200
@@ -409,7 +409,7 @@ def report_markread(report_id=None):
             })
 
         return jsonify(
-            message="{} Reports marked as read.".format(len(data)),
+            message="{} reports marked as read.".format(len(data)),
             category="success",
             data=data,
             status=200
@@ -471,7 +471,7 @@ def edit_group(group_id):
         if group.guest:
             Guest.invalidate_cache()
 
-        flash(_("Group successfully updated."), "success")
+        flash(_("Group updated."), "success")
         return redirect(url_for("management.groups", group_id=group.id))
 
     return render_template("management/group_form.html", form=form,
@@ -497,7 +497,7 @@ def delete_group(group_id=None):
                 })
 
             return jsonify(
-                message="{} Groups deleted.".format(len(data)),
+                message="{} groups deleted.".format(len(data)),
                 category="success",
                 data=data,
                 status=200
@@ -512,15 +512,15 @@ def delete_group(group_id=None):
     if group_id is not None:
         if group_id <= 5:  # there are 5 standard groups
             flash(_("You cannot delete the standard groups. "
-                    "Try renaming them instead.", "danger"))
+                    "Try renaming it instead.", "danger"))
             return redirect(url_for("management.groups"))
 
         group = Group.query.filter_by(id=group_id).first_or_404()
         group.delete()
-        flash(_("Group successfully deleted."), "success")
+        flash(_("Group deleted."), "success")
         return redirect(url_for("management.groups"))
 
-    flash(_("No group choosen.."), "danger")
+    flash(_("No group chosen."), "danger")
     return redirect(url_for("management.groups"))
 
 
@@ -530,7 +530,7 @@ def add_group():
     form = AddGroupForm()
     if form.validate_on_submit():
         form.save()
-        flash(_("Group successfully added."), "success")
+        flash(_("Group added."), "success")
         return redirect(url_for("management.groups"))
 
     return render_template("management/group_form.html", form=form,
@@ -553,7 +553,7 @@ def edit_forum(forum_id):
     form = EditForumForm(forum)
     if form.validate_on_submit():
         form.save()
-        flash(_("Forum successfully updated."), "success")
+        flash(_("Forum updated."), "success")
         return redirect(url_for("management.edit_forum", forum_id=forum.id))
     else:
         if forum.moderators:
@@ -577,7 +577,7 @@ def delete_forum(forum_id):
 
     forum.delete(involved_users)
 
-    flash(_("Forum successfully deleted."), "success")
+    flash(_("Forum deleted."), "success")
     return redirect(url_for("management.forums"))
 
 
@@ -589,7 +589,7 @@ def add_forum(category_id=None):
 
     if form.validate_on_submit():
         form.save()
-        flash(_("Forum successfully added."), "success")
+        flash(_("Forum added."), "success")
         return redirect(url_for("management.forums"))
     else:
         form.groups.data = Group.query.order_by(Group.id.asc()).all()
@@ -608,7 +608,7 @@ def add_category():
 
     if form.validate_on_submit():
         form.save()
-        flash(_("Category successfully added."), "success")
+        flash(_("Category added."), "success")
         return redirect(url_for("management.forums"))
 
     return render_template("management/category_form.html", form=form,
@@ -624,7 +624,7 @@ def edit_category(category_id):
 
     if form.validate_on_submit():
         form.populate_obj(category)
-        flash(_("Category successfully updated."), "success")
+        flash(_("Category updated."), "success")
         category.save()
 
     return render_template("management/category_form.html", form=form,
@@ -659,7 +659,8 @@ def enable_plugin(plugin):
     plugin = get_plugin_from_all(plugin)
 
     if plugin.enabled:
-        flash(_("Plugin is already enabled."), "danger")
+        flash(_("Plugin %(plugin)s is already enabled.", plugin=plugin.name),
+              "info")
         return redirect(url_for("management.plugins"))
 
     try:
@@ -669,7 +670,7 @@ def enable_plugin(plugin):
     except OSError:
         flash(_("It seems that FlaskBB does not have enough filesystem "
                 "permissions. Try removing the 'DISABLED' file by "
-                "yourself."), "danger")
+                "yourself instead."), "danger")
 
     return redirect(url_for("management.plugins"))
 
@@ -690,7 +691,7 @@ def disable_plugin(plugin):
     except OSError:
         flash(_("It seems that FlaskBB does not have enough filesystem "
                 "permissions. Try creating the 'DISABLED' file by "
-                "yourself."), "danger")
+                "yourself instead."), "danger")
 
     return redirect(url_for("management.plugins"))
 
@@ -705,7 +706,7 @@ def uninstall_plugin(plugin):
 
         flash(_("Plugin has been uninstalled."), "success")
     else:
-        flash(_("Cannot uninstall Plugin."), "danger")
+        flash(_("Cannot uninstall plugin."), "danger")
 
     return redirect(url_for("management.plugins"))
 
@@ -720,6 +721,6 @@ def install_plugin(plugin):
 
         flash(_("Plugin has been installed."), "success")
     else:
-        flash(_("Cannot install Plugin."), "danger")
+        flash(_("Cannot install plugin."), "danger")
 
     return redirect(url_for("management.plugins"))

flaskbb/message/forms.py

@@ -19,14 +19,14 @@ from flaskbb.message.models import Conversation, Message
 
 
 class ConversationForm(Form):
-    to_user = StringField(_("To User"), validators=[
-        DataRequired(message=_("A Username is required."))])
+    to_user = StringField(_("Recipient"), validators=[
+        DataRequired(message=_("A valid username is required."))])
 
     subject = StringField(_("Subject"), validators=[
         DataRequired(message=_("A Subject is required."))])
 
     message = TextAreaField(_("Message"), validators=[
-        DataRequired(message=_("A Message is required."))])
+        DataRequired(message=_("A message is required."))])
 
     send_message = SubmitField(_("Start Conversation"))
     save_message = SubmitField(_("Save Conversation"))
@@ -34,7 +34,8 @@ class ConversationForm(Form):
     def validate_to_user(self, field):
         user = User.query.filter_by(username=field.data).first()
         if not user:
-            raise ValidationError(_("The Username you entered doesn't exist"))
+            raise ValidationError(_("The username you entered does not "
+                                    "exist."))
         if user.id == current_user.id:
             raise ValidationError(_("You cannot send a PM to yourself."))
 
@@ -56,7 +57,7 @@ class ConversationForm(Form):
 
 class MessageForm(Form):
     message = TextAreaField(_("Message"), validators=[
-        DataRequired(message=_("A Message is required."))])
+        DataRequired(message=_("A message is required."))])
     submit = SubmitField(_("Send Message"))
 
     def save(self, conversation, user_id, unread=False):

flaskbb/message/views.py

@@ -68,7 +68,7 @@ def view_conversation(conversation_id):
             count()
 
         if message_count >= flaskbb_config["MESSAGE_QUOTA"]:
-            flash(_("You cannot send any messages anymore because you have"
+            flash(_("You cannot send any messages anymore because you have "
                     "reached your message limit."), "danger")
             return redirect(url_for("message.view_conversation",
                                     conversation_id=conversation.id))
@@ -124,7 +124,7 @@ def new_conversation():
         count()
 
     if message_count >= flaskbb_config["MESSAGE_QUOTA"]:
-        flash(_("You cannot send any messages anymore because you have"
+        flash(_("You cannot send any messages anymore because you have "
                 "reached your message limit."), "danger")
         return redirect(url_for("message.inbox"))
 

flaskbb/plugins/portal/views.py

@@ -34,7 +34,7 @@ def index():
     except KeyError:
         forum_ids = []
         flash(_("Please install the plugin first to configure the forums "
-              "which should be displayed"), "warning")
+                "which should be displayed."), "warning")
 
     group_ids = [group.id for group in current_user.groups]
     forums = Forum.query.filter(Forum.groups.any(Group.id.in_(group_ids)))

flaskbb/user/forms.py

@@ -33,17 +33,17 @@ class GeneralSettingsForm(Form):
 
 
 class ChangeEmailForm(Form):
-    old_email = StringField(_("Old E-Mail Address"), validators=[
-        DataRequired(message=_("A E-Mail Address is required.")),
-        Email(message=_("Invalid E-Mail Address."))])
+    old_email = StringField(_("Old email address"), validators=[
+        DataRequired(message=_("A valid email address is required.")),
+        Email(message=_("Invalid email address."))])
 
-    new_email = StringField(_("New E-Mail Address"), validators=[
+    new_email = StringField(_("New email address"), validators=[
         InputRequired(),
-        EqualTo('confirm_new_email', message=_("E-Mails must match.")),
-        Email(message=_("Invalid E-Mail Address."))])
+        EqualTo('confirm_new_email', message=_("Email addresses must match.")),
+        Email(message=_("Invalid email address."))])
 
-    confirm_new_email = StringField(_("Confirm E-Mail Address"), validators=[
-        Email(message=_("Invalid E-Mail Address."))])
+    confirm_new_email = StringField(_("Confirm email address"), validators=[
+        Email(message=_("Invalid email address."))])
 
     submit = SubmitField(_("Save"))
 
@@ -57,24 +57,25 @@ class ChangeEmailForm(Form):
                                  User.email.like(field.data),
                                  db.not_(User.id == self.user.id))).first()
         if user:
-            raise ValidationError(_("This E-Mail Address is already taken."))
+            raise ValidationError(_("This email address is already taken."))
 
 
 class ChangePasswordForm(Form):
-    old_password = PasswordField(_("Old Password"), validators=[
-        DataRequired(message=_("Password required"))])
+    old_password = PasswordField(_("Password"), validators=[
+        DataRequired(message=_("Please enter your password."))])
 
-    new_password = PasswordField(_('Password'), validators=[
+    new_password = PasswordField(_('New password'), validators=[
         InputRequired(),
-        EqualTo('confirm_new_password', message=_('Passwords must match.'))])
+        EqualTo('confirm_new_password', message=_('New passwords must match.'))
+    ])
 
-    confirm_new_password = PasswordField(_('Confirm New Password'))
+    confirm_new_password = PasswordField(_('Confirm new password'))
 
     submit = SubmitField(_("Save"))
 
     def validate_old_password(self, field):
         if not current_user.check_password(field.data):
-            raise ValidationError(_("Old Password is wrong."))
+            raise ValidationError(_("Old password is wrong."))
 
 
 class ChangeUserDetailsForm(Form):

flaskbb/user/views.py

@@ -91,7 +91,7 @@ def change_email():
         current_user.email = form.new_email.data
         current_user.save()
 
-        flash(_("E-Mail Address updated."), "success")
+        flash(_("Email address updated."), "success")
     return render_template("user/change_email.html", form=form)
 
 
@@ -104,6 +104,6 @@ def change_user_details():
         form.populate_obj(current_user)
         current_user.save()
 
-        flash(_("Details updated."), "success")
+        flash(_("User details updated."), "success")
 
     return render_template("user/change_user_details.html", form=form)