Better translation consistency

flaskbb/auth/forms.py

@@ -25,7 +25,7 @@ is_username = regexp(USERNAME_RE,
 
 
 class LoginForm(Form):
-    login = StringField(_("Username or E-Mail"), validators=[
+    login = StringField(_("Username or E-Mail Address"), validators=[
         DataRequired(message=_("A Username or E-Mail Address is required."))]
     )
 
@@ -42,7 +42,7 @@ class RegisterForm(Form):
         DataRequired(message=_("A Username is required.")),
         is_username])
 
-    email = StringField(_("E-Mail"), validators=[
+    email = StringField(_("E-Mail Address"), validators=[
         DataRequired(message=_("A E-Mail Address is required.")),
         Email(message=_("Invalid E-Mail Address."))])
 
@@ -87,7 +87,7 @@ class ReauthForm(Form):
 
 
 class ForgotPasswordForm(Form):
-    email = StringField(_('E-Mail'), validators=[
+    email = StringField(_('E-Mail Address'), validators=[
         DataRequired(message=_("A E-Mail Address is reguired.")),
         Email()])
 
@@ -97,7 +97,7 @@ class ForgotPasswordForm(Form):
 class ResetPasswordForm(Form):
     token = HiddenField('Token')
 
-    email = StringField(_('E-Mail'), validators=[
+    email = StringField(_('E-Mail Address'), validators=[
         DataRequired(message=_("A E-Mail Address is required.")),
         Email()])
 
@@ -112,4 +112,4 @@ class ResetPasswordForm(Form):
     def validate_email(self, field):
         email = User.query.filter_by(email=field.data).first()
         if not email:
-            raise ValidationError(_("Wrong E-Mail."))
+            raise ValidationError(_("Wrong E-Mail Address."))

flaskbb/auth/views.py

@@ -42,7 +42,7 @@ def login():
             return redirect(request.args.get("next") or
                             url_for("forum.index"))
 
-        flash(_("Wrong username or password"), "danger")
+        flash(_("Wrong Username or Password."), "danger")
     return render_template("auth/login.html", form=form)
 
 
@@ -57,7 +57,7 @@ def reauth():
         form = ReauthForm(request.form)
         if form.validate_on_submit():
             confirm_login()
-            flash(_("Reauthenticated"), "success")
+            flash(_("Reauthenticated."), "success")
             return redirect(request.args.get("next") or
                             url_for("user.profile"))
         return render_template("auth/reauth.html", form=form)
@@ -93,7 +93,7 @@ def register():
         user = form.save()
         login_user(user)
 
-        flash(_("Thanks for registering"), "success")
+        flash(_("Thanks for registering."), "success")
         return redirect(url_for("user.profile", username=current_user.username))
     return render_template("auth/register.html", form=form)
 
@@ -118,8 +118,8 @@ def forgot_password():
             flash(_("E-Mail sent! Please check your inbox."), "info")
             return redirect(url_for("auth.forgot_password"))
         else:
-            flash(_("You have entered an username or email that is not linked "
-                    "with your account"), "danger")
+            flash(_("You have entered a Username or E-Mail Address that is "
+                    "not linked with your account"), "danger")
     return render_template("auth/forgot_password.html", form=form)
 
 
@@ -138,17 +138,17 @@ def reset_password(token):
         expired, invalid, data = user.verify_reset_token(form.token.data)
 
         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 is expired."), "danger")
+            flash(_("Your Password Token is expired."), "danger")
             return redirect(url_for("auth.forgot_password"))
 
         if user and data:
             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

flaskbb/forum/forms.py

@@ -19,7 +19,7 @@ from flaskbb.user.models import User
 
 
 class QuickreplyForm(Form):
-    content = TextAreaField(_("Quickreply"), validators=[
+    content = TextAreaField(_("Quick Reply"), validators=[
         DataRequired(message=_("You cannot post a reply without content."))])
 
     submit = SubmitField(_("Reply"))
@@ -49,7 +49,7 @@ class ReplyForm(Form):
 
 class NewTopicForm(ReplyForm):
     title = StringField(_("Topic Title"), validators=[
-        DataRequired(message=_("Please choose a Topic title."))])
+        DataRequired(message=_("Please choose a Topic Title."))])
 
     content = TextAreaField(_("Content"), validators=[
         DataRequired(message=_("You cannot post a reply without content."))])

flaskbb/forum/views.py

@@ -186,7 +186,7 @@ def delete_topic(topic_id, slug=None):
 
     if not can_delete_topic(user=current_user, topic=topic):
 
-        flash(_("You do not have the permissions to delete the topic"),
+        flash(_("You do not have the permissions to delete this topic."),
               "danger")
         return redirect(topic.forum.url)
 
@@ -205,7 +205,8 @@ def lock_topic(topic_id, slug=None):
     # TODO: Bulk lock
 
     if not can_moderate(user=current_user, forum=topic.forum):
-        flash(_("You do not have the permissions to lock this topic"), "danger")
+        flash(_("You do not have the permissions to lock this topic."),
+              "danger")
         return redirect(topic.url)
 
     topic.locked = True
@@ -223,7 +224,7 @@ def unlock_topic(topic_id, slug=None):
 
     # Unlock is basically the same as lock
     if not can_moderate(user=current_user, forum=topic.forum):
-        flash(_("You do not have the permissions to unlock this topic"),
+        flash(_("You do not have the permissions to unlock this topic."),
               "danger")
         return redirect(topic.url)
 
@@ -239,7 +240,7 @@ def highlight_topic(topic_id, slug=None):
     topic = Topic.query.filter_by(id=topic_id).first_or_404()
 
     if not can_moderate(user=current_user, forum=topic.forum):
-        flash(_("You do not have the permissions to highlight this topic"),
+        flash(_("You do not have the permissions to highlight this topic."),
               "danger")
         return redirect(topic.url)
 
@@ -256,7 +257,7 @@ def trivialize_topic(topic_id, slug=None):
 
     # Unlock is basically the same as lock
     if not can_moderate(user=current_user, forum=topic.forum):
-        flash(_("You do not have the permissions to trivialize this topic"),
+        flash(_("You do not have the permissions to trivialize this topic."),
               "danger")
         return redirect(topic.url)
 
@@ -277,15 +278,16 @@ def move_topic(topic_id, forum_id, topic_slug=None, forum_slug=None):
     # TODO: Bulk move
 
     if not can_moderate(user=current_user, forum=topic.forum):
-        flash(_("You do not have the permissions to move this topic"), "danger")
+        flash(_("You do not have the permissions to move this topic."),
+              "danger")
         return redirect(forum_instance.url)
 
     if not topic.move(forum_instance):
-        flash(_("Could not move the topic to forum %(title)s",
+        flash(_("Could not move the topic to forum %(title)s.",
                 title=forum_instance.title), "danger")
         return redirect(topic.url)
 
-    flash(_("Topic was moved to forum %(title)s",
+    flash(_("Topic was moved to forum %(title)s.",
             title=forum_instance.title), "success")
     return redirect(topic.url)
 
@@ -301,15 +303,15 @@ def merge_topic(old_id, new_id, old_slug=None, new_slug=None):
 
     # Looks to me that the user should have permissions on both forums, right?
     if not can_moderate(user=current_user, forum=_old_topic.forum):
-        flash(_("You do not have the permissions to merge this topic"),
+        flash(_("You do not have the permissions to merge this topic."),
               "danger")
         return redirect(_old_topic.url)
 
     if not _old_topic.merge(_new_topic):
-        flash(_("Could not merge the topic."), "danger")
+        flash(_("Could not merge the topics."), "danger")
         return redirect(_old_topic.url)
 
-    flash(_("Topic succesfully merged."), "success")
+    flash(_("Topics succesfully merged."), "success")
     return redirect(_new_topic.url)
 
 
@@ -320,7 +322,8 @@ def new_post(topic_id, slug=None):
     topic = Topic.query.filter_by(id=topic_id).first_or_404()
 
     if not can_post_reply(user=current_user, topic=topic):
-        flash(_("You do not have the permissions to post here"), "danger")
+        flash(_("You do not have the permissions to post in this topic."),
+              "danger")
         return redirect(topic.forum.url)
 
     form = ReplyForm()
@@ -346,7 +349,7 @@ def reply_post(topic_id, post_id):
     post = Post.query.filter_by(id=post_id).first_or_404()
 
     if not can_post_reply(user=current_user, topic=topic):
-        flash(_("You do not have the permissions to post in this topic"),
+        flash(_("You do not have the permissions to post in this topic."),
               "danger")
         return redirect(topic.forum.url)
 
@@ -372,7 +375,7 @@ def edit_post(post_id):
     post = Post.query.filter_by(id=post_id).first_or_404()
 
     if not can_edit_post(user=current_user, post=post):
-        flash(_("You do not have the permissions to edit this post"), "danger")
+        flash(_("You do not have the permissions to edit this post."), "danger")
         return redirect(post.topic.url)
 
     form = ReplyForm()
@@ -402,7 +405,8 @@ def delete_post(post_id, slug=None):
     # TODO: Bulk delete
 
     if not can_delete_post(user=current_user, post=post):
-        flash(_("You do not have the permissions to edit this post"), "danger")
+        flash(_("You do not have the permissions to delete this post."),
+              "danger")
         return redirect(post.topic.url)
 
     first_post = post.first_post
@@ -462,6 +466,9 @@ def markread(forum_id=None, slug=None):
         db.session.add(forumsread)
         db.session.commit()
 
+        flash(_("Forum %(forum)s marked as read.", forum=forum_instance.title),
+              "success")
+
         return redirect(forum_instance.url)
 
     # Mark all forums as read
@@ -481,6 +488,8 @@ def markread(forum_id=None, slug=None):
     db.session.add_all(forumsread_list)
     db.session.commit()
 
+    flash(_("All forums marked as read."), "success")
+
     return redirect(url_for("forum.index"))
 
 

flaskbb/management/views.py

@@ -81,8 +81,8 @@ def settings(slug=None):
                     new_settings[key] = form[key].data
             except KeyError:
                 pass
-
         Setting.update(settings=new_settings, app=current_app)
+        flash(_("Settings saved."), "success")
     else:
         for key, values in iteritems(old_settings):
             try:
@@ -141,7 +141,7 @@ def edit_user(user_id):
 
         user.save(groups=form.secondary_groups.data)
 
-        flash(_("User successfully edited"), "success")
+        flash(_("User successfully updated."), "success")
         return redirect(url_for("management.edit_user", user_id=user.id))
 
     return render_template("management/user_form.html", form=form,
@@ -153,7 +153,7 @@ def edit_user(user_id):
 def delete_user(user_id):
     user = User.query.filter_by(id=user_id).first_or_404()
     user.delete()
-    flash(_("User successfully deleted"), "success")
+    flash(_("User successfully deleted."), "success")
     return redirect(url_for("management.users"))
 
 
@@ -210,7 +210,7 @@ def ban_user(user_id):
         return redirect(url_for("management.overview"))
 
     if user.ban():
-        flash(_("User was banned successfully."), "success")
+        flash(_("User is now banned."), "success")
     else:
         flash(_("Could not ban user."), "danger")
 
@@ -268,14 +268,14 @@ def report_markread(report_id=None):
 
         report = Report.query.filter_by(id=report_id).first_or_404()
         if report.zapped:
-            flash(_("Report %(id)s is already marked as read", id=report.id),
+            flash(_("Report %(id)s is already marked as read.", id=report.id),
                   "success")
             return redirect(url_for("management.reports"))
 
         report.zapped_by = current_user.id
         report.zapped = datetime.utcnow()
         report.save()
-        flash(_("Report %(id)s marked as read", id=report.id), "success")
+        flash(_("Report %(id)s marked as read.", id=report.id), "success")
         return redirect(url_for("management.reports"))
 
     # mark all as read
@@ -289,7 +289,7 @@ def report_markread(report_id=None):
     db.session.add_all(report_list)
     db.session.commit()
 
-    flash(_("All reports were marked as read"), "success")
+    flash(_("All reports were marked as read."), "success")
     return redirect(url_for("management.reports"))
 
 
@@ -320,7 +320,7 @@ def edit_group(group_id):
         if group.guest:
             Guest.invalidate_cache()
 
-        flash(_("Group successfully edited."), "success")
+        flash(_("Group successfully updated."), "success")
         return redirect(url_for("management.groups", group_id=group.id))
 
     return render_template("management/group_form.html", form=form,
@@ -367,7 +367,7 @@ def edit_forum(forum_id):
         form.populate_obj(forum)
         forum.save(moderators=form.moderators.data)
 
-        flash(_("Forum successfully edited."), "success")
+        flash(_("Forum successfully updated."), "success")
         return redirect(url_for("management.edit_forum", forum_id=forum.id))
     else:
         if forum.moderators:
@@ -421,7 +421,7 @@ def add_category():
 
     if form.validate_on_submit():
         form.save()
-        flash(_("Category successfully created."), "success")
+        flash(_("Category successfully added."), "success")
         return redirect(url_for("management.forums"))
 
     return render_template("management/category_form.html", form=form,
@@ -437,6 +437,7 @@ def edit_category(category_id):
 
     if form.validate_on_submit():
         form.populate_obj(category)
+        flash(_("Category successfully updated."), "success")
         category.save()
 
     return render_template("management/category_form.html", form=form,
@@ -485,7 +486,7 @@ def enable_plugin(plugin):
                 "disk, this won't work - than you need to delete the "
                 "'DISABLED' file by yourself."), "info")
     else:
-        flash(_("Plugin is not enabled"), "danger")
+        flash(_("Couldn't enable Plugin."), "danger")
 
     return redirect(url_for("management.plugins"))
 
@@ -496,7 +497,7 @@ def disable_plugin(plugin):
     try:
         plugin = get_plugin(plugin)
     except KeyError:
-        flash(_("Plugin %(plugin)s not found", plugin=plugin.name), "danger")
+        flash(_("Plugin %(plugin)s not found.", plugin=plugin.name), "danger")
         return redirect(url_for("management.plugins"))
 
     plugin_dir = os.path.join(

flaskbb/templates/auth/login.html

@@ -12,6 +12,13 @@
     {{ horizontal_field(form.password)}}
     {{ horizontal_field(form.remember_me) }}
     {{ horizontal_field(form.submit) }}
+
+    <div class="form-group">
+        <div class="col-sm-offset-3 col-sm-4">
+            <a class="pull-left" href="{{ url_for('auth.register') }}"><small>{% trans %}Not a member yet?{% endtrans %}</small></a>
+            <a class="pull-right" href="{{ url_for('auth.forgot_password') }}"><small>{% trans %}Forgot Password?{% endtrans %}</small></a>
+        </div>
+    </div>
 </form>
 
 {% endblock %}

flaskbb/templates/forum/category_layout.html

@@ -85,7 +85,7 @@
                     {% endif %}
 
                 {% else %}
-                {% trans %}No posts{% endtrans %}
+                {% trans %}No posts.{% endtrans %}
                 {% endif %}
             {% endif %}
             </td>

flaskbb/templates/forum/forum.html

@@ -114,7 +114,7 @@
         {% else %}
         <tr>
             <td colspan="5">
-                {% trans %}No Topics so far.{% endtrans %}
+                {% trans %}No topics.{% endtrans %}
             </td>
         </tr>
         {% endfor %}

flaskbb/templates/forum/search_result.html

@@ -47,7 +47,7 @@
                                 <td>
                                     <strong>{{ post.username }}</strong>
                                     <br />
-                                    Guest
+                                    {% trans %}Guest{% endtrans %}
                                 </td>
                             {% endif %}
                         </tr>
@@ -66,7 +66,7 @@
             </tr>
             {% else %}
             <tr>
-                <td>{% trans %}No posts found matching your search criteria{% endtrans %}</td>
+                <td>{% trans %}No posts found matching your search criteria.{% endtrans %}</td>
             </tr>
             {% endfor %}
             </tbody>
@@ -97,7 +97,7 @@
                 </tr>
             {% else %}
                 <tr>
-                    <td colspan="5">{% trans %}No users found matching your search criteria{% endtrans %}</td>
+                    <td colspan="5">{% trans %}No users found matching your search criteria.{% endtrans %}</td>
                 </tr>
             {% endfor %}
             </tbody>
@@ -169,7 +169,7 @@
                 </tr>
             {% else %}
                 <tr>
-                    <td colspan="5">{% trans %}No topics found matching your search criteria{% trans %}</td>
+                    <td colspan="5">{% trans %}No topics found matching your search criteria.{% trans %}</td>
                 </tr>
             {% endfor %}
             </tbody>
@@ -258,7 +258,7 @@
                         {% endif %}
 
                     {% else %}
-                        {% trans %}No posts{% endtrans %}
+                        {% trans %}No posts.{% endtrans %}
                     {% endif %}
                     {% endif %}
                 </td>
@@ -266,7 +266,7 @@
             {% else %}
             <tr>
                 <td colspan="5">
-                    {% trans %}No forums found matching your search criteria{% endtrans %}
+                    {% trans %}No forums found matching your search criteria.{% endtrans %}
                 </td>
             </tr>
             {% endfor %}

flaskbb/templates/forum/topictracker.html

@@ -79,7 +79,7 @@
         {% else %}
         <tr>
             <td colspan="5">
-                {% trans %}No Topics so far.{% endtrans %}
+                {% trans %}No topics.{% endtrans %}
             </td>
         </tr>
         {% endfor %}

flaskbb/templates/layout.html

@@ -80,7 +80,7 @@
                                 <span class="fa fa-envelope"></span> <span class="badge">{{ current_user.pm_unread }}</span>
                             </button>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ url_for('user.inbox') }}"><span class="fa fa-envelope"></span> {% trans %}Inbox{% endtrans %}</a></li>
+                                <li><a href="{{ url_for('user.inbox') }}"><span class="fa fa-envelope"></span> {% trans %}Private Messages{% endtrans %}</a></li>
                                 <li><a href="{{ url_for('user.new_message') }}"><span class="fa fa-pencil"></span> {% trans %}New Message{% endtrans %}</a></li>
                             </ul>
                         </div>

flaskbb/templates/macros.html

@@ -19,6 +19,53 @@
 {%- endmacro -%}
 
 
+{%- macro render_quickreply(field, rows, cols, div_class='') -%}
+{%- if kwargs['required'] or field.flags.required -%}
+    {% if div_class %}
+        {{ field(class=div_class, required="required", cols=cols, rows=rows, placeholder=field.label.text) }}
+    {% else %}
+        {{ field(class="new-message", required="required", cols=cols, rows=row, placeholder=field.label.text) }}
+    {% endif %}
+{%- else -%}
+    {% if div_class %}
+        {{ field(class=div_class, cols=cols, rows=row, placeholder=field.label.text) }}
+    {% else %}
+        {{ field(class="new-message", cols=cols, rows=row, placeholder=field.label.text) }}
+    {% endif %}
+{%- endif -%}
+
+{{ field_description(field) }}
+{{ field_errors(field) }}
+{%- endmacro -%}
+
+
+{# Renders a non bootstrap input field #}
+{%- macro render_input_field(field, div_class='', placeholder='') -%}
+{%- if div_class -%}
+    <div class="{{ div_class }}">
+{%- endif -%}
+
+{%- if placeholder -%}
+    {% set field_placeholder = placeholder %}
+{%- else -%}
+    {% set field_placeholder = field.label.text %}
+{%- endif -%}
+
+{%- if kwargs['required'] or field.flags.required -%}
+    {{ field(required="required", placeholder=field_placeholder) }}
+{%- else -%}
+    {{ field(placeholder=field_placeholder) }}
+{% endif %}
+
+{%- if div_class -%}
+    </div>
+{%- endif -%}
+
+{{ field_description(field) }}
+{{ field_errors(field) }}
+{%- endmacro -%}
+
+
 {%- macro render_boolean_field(field, inline=False) -%}
 <div class="checkbox {%- if inline -%}inline{%- endif -%}">
     {{ field(**kwargs) }}
@@ -28,6 +75,7 @@
 </div>
 {%- endmacro -%}
 
+
 {%- macro render_select_field(field, div_class='') -%}
 <div class="form-group">
     {% if div_class %}
@@ -60,14 +108,18 @@
 {% endif %}
 {%- endmacro -%}
 
-{%- macro render_field(field, div_class='', rows='') -%}
+{%- macro render_field(field, with_label=True, div_class='', rows='') -%}
 <div class="form-group{%- if field.errors %} has-error{%- endif %}">
     {% if div_class %}
     <div class="{{ div_class }}">
     {% else %}
     <div class="col-sm-5">
     {% endif %}
-        <label>{{ field.label.text }}</label>
+
+        {% if with_label %}
+            <label>{{ field.label.text }}</label>
+        {% endif %}
+
         {%- if kwargs['required'] or field.flags.required -%}
             {% if rows %}
                 {{ field(class="form-control", required="required", rows=rows, placeholder=field.label.text) }}
@@ -138,11 +190,11 @@
 
 
 {%- macro horizontal_boolean_field(field, div_class='') -%}
-{% if div_class %}
+{%- if div_class %}
 <div class="{{ div_class }}">
-{% else %}
+{%- else %}
 <div class="col-sm-offset-3 col-sm-3">
-{% endif %}
+{%- endif %}
     <div class="checkbox">
         {{ field(**kwargs) }}
         {{ field_label(field) }}
@@ -182,7 +234,7 @@
         {% if div_class %}
             <div class="{{ div_class }}">
         {% else %}
-            <div class="col-sm-9">
+            <div class="col-sm-4">
         {% endif %}
 
         {%- if kwargs['required'] or field.flags.required -%}
@@ -198,18 +250,18 @@
                 {{ field(class='form-control', placeholder=field.label.text, **kwargs) }}
             {% endif %}
         {%- endif -%}
-
+    </div> <!-- end div_class -->
     {% endif %}
 
     {{ field_description(field) }}
     {{ field_errors(field) }}
-    </div>
-</div>
+
+</div> <!-- end form-group -->
 {%- endmacro -%}
 
 
-{% macro topnav(endpoint, name, icon='', active=False) %}
-<li {% if endpoint == request.endpoint or active == True %}class="active"{% endif %}>
+{% macro topnav(endpoint, name, icon='', id='', active=False) %}
+<li {% if id %}id={{id}}{% endif %} {% if endpoint == request.endpoint or active == True %}class="active"{% endif %}>
     <a href={{ url_for(endpoint) }}>
         {% if icon %}<i class="{{ icon }}"></i> {% endif %}{{ name }}
     </a>
@@ -224,9 +276,9 @@
 {% endmacro %}
 
 
-{% macro render_pagination(page_obj, url) %}
-<ul class="pagination" style="margin: 0; float:right">
-    <li><span class="pages-label">{% trans %}Pages{% endtrans %}: </span></li>
+{% macro render_pagination(page_obj, url, ul_class='') %}
+<ul class='{%- if ul_class -%}{{ ul_class }}{%- else -%}pagination{%- endif -%}'>
+    <li class="disabled"><a href="#"><span class="pages-label">{% trans %}Pages{% endtrans %}:</span></a></li>
     {%- for page in page_obj.iter_pages() %}
         {% if page %}
             {% if page != page_obj.page %}
@@ -245,6 +297,27 @@
 {% endmacro %}
 
 
+{% macro render_topic_pagination(page_obj, url) %}
+<ul class="pagination pagelink pull-left">
+    <li class="disabled"><a><span class="pages-label">Pages: </span></a></li>
+    {%- for page in page_obj.iter_pages() %}
+        {% if page %}
+            {% if page != page_obj.page %}
+                <li><a href="{{ url }}?page={{ page }}">{{ page }}</a></li>
+            {% else %}
+                <li class="disabled"><a href="#">{{ page }}</a></li>
+            {% endif %}
+        {% endif %}
+    {%- else -%}
+        <li class="disabled"><a href="#">1</a></li>
+    {%- endfor %}
+    {% if page_obj.has_next %}
+        <li><a href="{{ url }}?page={{ page_obj.next_num }}">Next</a></li>
+    {% endif %}
+</ul>
+{% endmacro %}
+
+
 {%- macro topic_pages(topic_obj, per_page=10) -%}
 {% set topic_pages = (topic_obj.post_count / per_page)|round|int %}
 {%- if topic_pages >  1 -%}

flaskbb/templates/management/banned_users.html

@@ -62,7 +62,7 @@
             {% else %}
                 <tr>
                     <td colspan="6">
-                        {% trans %}No users found matching your search query{% endtrans %}
+                        {% trans %}No users found matching your search criteria.{% endtrans %}
                     </td>
                 </tr>
             {% endfor %}

flaskbb/templates/management/users.html

@@ -74,7 +74,7 @@
             {% else %}
                 <tr>
                     <td colspan="6">
-                        {% trans %}No users found matching your search query{% endtrans %}
+                        {% trans %}No users found matching your search criteria.{% endtrans %}
                     </td>
                 </tr>
             {% endfor %}

flaskbb/templates/user/all_posts.html

@@ -37,7 +37,7 @@
     {% else %}
         <tr>
             <td>
-                {% trans %}No Posts so far.{% endtrans %}
+                {% trans %}No posts.{% endtrans %}
             </td>
         </tr>
     {% endfor %}

flaskbb/templates/user/all_topics.html

@@ -69,7 +69,7 @@
         {% else %}
         <tr>
             <td colspan="5">
-                {% trans %}No Topics so far.{% endtrans %}
+                {% trans %}No topics.{% endtrans %}
             </td>
         </tr>
         {% endfor %}

flaskbb/user/forms.py

@@ -39,7 +39,7 @@ class GeneralSettingsForm(Form):
 class ChangeEmailForm(Form):
     old_email = StringField(_("Old E-Mail Address"), validators=[
         DataRequired(message=_("A E-Mail Address is required.")),
-        Email(message=_("This E-Mail is invalid"))])
+        Email(message=_("Invalid E-Mail Address."))])
 
     new_email = StringField(_("New E-Mail Address"), validators=[
         InputRequired(),
@@ -61,7 +61,7 @@ class ChangeEmailForm(Form):
                                  User.email.like(field.data),
                                  db.not_(User.id == self.user.id))).first()
         if user:
-            raise ValidationError(_("This E-Mail is taken."))
+            raise ValidationError(_("This E-Mail Address is already taken."))
 
 
 class ChangePasswordForm(Form):

flaskbb/user/views.py

@@ -66,7 +66,7 @@ def settings():
         current_user.language = form.language.data
         current_user.save()
 
-        flash(_("Your settings have been updated!"), "success")
+        flash(_("Settings updated."), "success")
     else:
         form.theme.data = current_user.theme
         form.theme.data = current_user.language
@@ -82,7 +82,7 @@ def change_password():
         current_user.password = form.new_password.data
         current_user.save()
 
-        flash(_("Your password have been updated!"), "success")
+        flash(_("Password updated."), "success")
     return render_template("user/change_password.html", form=form)
 
 
@@ -94,7 +94,7 @@ def change_email():
         current_user.email = form.new_email.data
         current_user.save()
 
-        flash(_("Your email have been updated!"), "success")
+        flash(_("E-Mail Address updated."), "success")
     return render_template("user/change_email.html", form=form)
 
 
@@ -107,7 +107,7 @@ def change_user_details():
         form.populate_obj(current_user)
         current_user.save()
 
-        flash(_("Your details have been updated!"), "success")
+        flash(_("Details updated."), "success")
 
     return render_template("user/change_user_details.html", form=form)
 
@@ -213,7 +213,7 @@ def edit_message(message_id):
     message = PrivateMessage.query.filter_by(id=message_id).first_or_404()
 
     if not message.draft:
-        flash(_("You cannot edit a sent message"), "danger")
+        flash(_("You cannot edit a sent message."), "danger")
         return redirect(url_for("user.inbox"))
 
     form = EditMessageForm()
@@ -227,7 +227,7 @@ def edit_message(message_id):
             message.to_user = to_user.id
             message.save()
 
-            flash(_("Message saved!"), "success")
+            flash(_("Message saved."), "success")
             return redirect(url_for("user.drafts"))
 
         if "send_message" in request.form and form.validate():
@@ -244,7 +244,7 @@ def edit_message(message_id):
             message.date_created = datetime.utcnow()
             message.save()
 
-            flash(_("Message sent!"), "success")
+            flash(_("Message sent."), "success")
             return redirect(url_for("user.sent"))
     else:
         form.to_user.data = message.to_user.username
@@ -261,7 +261,7 @@ def move_message(message_id):
     message = PrivateMessage.query.filter_by(id=message_id).first_or_404()
     message.trash = True
     message.save()
-    flash(_("Message moved to Trash!"), "success")
+    flash(_("Message moved to Trash."), "success")
     return redirect(url_for("user.inbox"))
 
 
@@ -271,7 +271,7 @@ def restore_message(message_id):
     message = PrivateMessage.query.filter_by(id=message_id).first_or_404()
     message.trash = False
     message.save()
-    flash(_("Message restored from Trash!"), "success")
+    flash(_("Message restored from Trash."), "success")
     return redirect(url_for("user.inbox"))
 
 
@@ -280,5 +280,5 @@ def restore_message(message_id):
 def delete_message(message_id):
     message = PrivateMessage.query.filter_by(id=message_id).first_or_404()
     message.delete()
-    flash(_("Message deleted!"), "success")
+    flash(_("Message deleted."), "success")
     return redirect(url_for("user.inbox"))