Merge pull request #255 from webu/features/tpl_homogen

Template and translations homogenization

pybb/templates/pybb/_button_forum_subscription.html

@@ -1 +1 @@
-{% load i18n %}<a href="{% url 'pybb:forum_subscription' pk=forum.id %}" class="forum-subscription btn btn-primary">{% if subscription %}{% trans 'Manage subscription' %}{% else %}{% trans "Subscribe" %}{% endif %}</a>
+{% load i18n %}<a href="{% url 'pybb:forum_subscription' pk=forum.id %}" class="forum-subscription btn btn-primary">{% if subscription %}{% trans 'Manage subscription' %}{% else %}{% trans 'Subscribe' %}{% endif %}</a>

pybb/templates/pybb/_button_new_topic.html

@@ -1 +1 @@
-{% load i18n %}<a href="{% url 'pybb:add_topic' forum.id %}" class="new-topic btn btn-primary">{% trans "New topic" %}</a>
+{% load i18n %}<a href="{% url 'pybb:add_topic' forum.id %}" class="new-topic btn btn-primary">{% trans 'New topic' %}</a>

pybb/templates/pybb/_button_save.html

@@ -1 +1 @@
-{% load i18n %}<input type="submit" class="btn btn-primary" value="{% trans "Save" %}" />
+{% load i18n %}<input type="submit" class="btn btn-primary" value="{% trans 'Save' %}" />

pybb/templates/pybb/_button_submit.html

@@ -1 +1 @@
-{% load i18n %}<input type="submit" class="btn btn-primary" value="{% if submit_text %}{{ submit_text }}{% else %}{% trans "Submit" %}{% endif %}" />
+{% load i18n %}<input type="submit" class="btn btn-primary" value="{% if submit_text %}{{ submit_text }}{% else %}{% trans 'Submit' %}{% endif %}" />

pybb/templates/pybb/_markitup.html

@@ -22,23 +22,23 @@
     mySettings['previewPosition'] = 'before';
     mySettings['resizeHandle'] = true;
     mySettings['markupSet'] = [
-        {name:'{% trans 'Bold' %}', key:'B', openWith:'[b]', closeWith:'[/b]'},
-        {name:'{% trans 'Italic' %}', key:'I', openWith:'[i]', closeWith:'[/i]'},
-        {name:'{% trans 'Underline' %}', key:'U', openWith:'[u]', closeWith:'[/u]'},
-        {name:'{% trans 'Stroke' %}', key:'S', openWith:'[s]', closeWith:'[/s]'},
+        {name:'{% trans "Bold" as txt %}{{ txt|escapejs }}', key:'B', openWith:'[b]', closeWith:'[/b]'},
+        {name:'{% trans "Italic" as txt %}{{ txt|escapejs }}', key:'I', openWith:'[i]', closeWith:'[/i]'},
+        {name:'{% trans "Underline" as txt %}{{ txt|escapejs }}', key:'U', openWith:'[u]', closeWith:'[/u]'},
+        {name:'{% trans "Stroke" as txt %}{{ txt|escapejs }}', key:'S', openWith:'[s]', closeWith:'[/s]'},
         {separator:'---------------' },
-        {name:'{% trans 'Picture' %}', key:'P', replaceWith:'[img][![Url]!][/img]'},
-        {name:'{% trans 'Link' %}', key:'L', openWith:'[url=[![Url]!]]', closeWith:'[/url]', placeHolder:'Your text to link here...'},
+        {name:'{% trans "Picture" as txt %}{{ txt|escapejs }}', key:'P', replaceWith:'[img][![Url]!][/img]'},
+        {name:'{% trans "Link" as txt %}{{ txt|escapejs }}', key:'L', openWith:'[url=[![Url]!]]', closeWith:'[/url]', placeHolder:'Your text to link here...'},
         {separator:'---------------' },
-        {name:'{% trans 'Bulleted list' %}', openWith:'[list]\n', closeWith:'\n[/list]'},
-        {name:'{% trans 'Numeric list' %}', openWith:'[list=[![Starting number]!]]\n', closeWith:'\n[/list]'},
-        {name:'{% trans 'List item' %}', openWith:'[*] '},
+        {name:'{% trans "Bulleted list" as txt %}{{ txt|escapejs }}', openWith:'[list]\n', closeWith:'\n[/list]'},
+        {name:'{% trans "Numeric list" as txt %}{{ txt|escapejs }}', openWith:'[list=[![Starting number]!]]\n', closeWith:'\n[/list]'},
+        {name:'{% trans "List item" as txt %}{{ txt|escapejs }}', openWith:'[*] '},
         {separator:'---------------' },
-        {name:'{% trans 'Quotes' %}', openWith:'[quote]', closeWith:'[/quote]'},
-        {name:'{% trans 'Code' %}', openWith:'[code]', closeWith:'[/code]'},
+        {name:'{% trans "Quotes" as txt %}{{ txt|escapejs }}', openWith:'[quote]', closeWith:'[/quote]'},
+        {name:'{% trans "Code" as txt %}{{ txt|escapejs }}', openWith:'[code]', closeWith:'[/code]'},
         {separator:'---------------' },
-        {name:'{% trans 'Clean' %}', className:"clean", replaceWith:function(markitup) { return markitup.selection.replace(/\[(.*?)\]/g, "") } },
-        {name:'{% trans 'Preview' %}', className:"preview", call:'preview' }
+        {name:'{% trans "Clean" as txt %}{{ txt|escapejs }}', className:"clean", replaceWith:function(markitup) { return markitup.selection.replace(/\[(.*?)\]/g, "") } },
+        {name:'{% trans "Preview" as txt %}{{ txt|escapejs }}', className:"preview", call:'preview' }
     ];
     $('textarea:not([class="no-markitup"])').markItUp(mySettings);
 

pybb/templates/pybb/_need_to_login_message.html

@@ -1,2 +1,2 @@
 {% load i18n %}
-<a href="{% url 'registration_register' %}">{% trans "Register" %}</a> {% trans "or" %} <a href="{% url 'auth_login' %}?next={{ next }}">{% trans "login" %}</a> {% trans "to create to post a reply" %}.
+<a href="{% url 'registration_register' %}">{% trans 'Register' %}</a> {% trans 'or' %} <a href="{% url 'auth_login' %}?next={{ next }}">{% trans 'login' %}</a> {% trans 'to create to post a reply' %}.

pybb/templates/pybb/add_post.html

@@ -2,7 +2,7 @@
 {% load i18n pybb_tags staticfiles %}
 
 {% block title %}
-{% if forum %}{% trans "New topic" %}{% else %}{% trans "New reply" %}{% endif %}
+{% if forum %}{% trans 'New topic' %}{% else %}{% trans 'New reply' %}{% endif %}
 {% endblock %}
 
 {% block extra_head %}
@@ -29,7 +29,7 @@
 
 {% block content %}
 
-<h1>{% if forum %}{% trans "New topic" %}{% else %}{% trans "New reply" %}{% endif %}</h1>
+<h1>{% if forum %}{% trans 'New topic' %}{% else %}{% trans 'New reply' %}{% endif %}</h1>
 
 {% include "pybb/post_form.html" %}
 {% endblock content %}

pybb/templates/pybb/attachments_formset.html

@@ -3,21 +3,21 @@
 {% if request.user|pybb_may_attach_files %}
     {% load i18n %}
     <div class="attachments-form">
-        <a class='attachment-link' style="display:none;" href='#'>{% trans "Add attachments" %}</a>
+        <a class="attachment-link" style="display:none;" href="#">{% trans 'Add attachments' %}</a>
         {{ aformset.management_form }}
             <table class="attachment-list">
                 {% for form in aformset %}
                     <tr class="attachment-item">
                         <td>
                             {{ form.id }}{{ form.file }}
                             {% if attachment_max_size %}
-                                <span title="{% trans 'If you need to upload larger files, please use an external storage website.' %}" class="help">{% blocktrans with max_size=attachment_max_size|filesizeformat%}(max size : {{ max_size }}){% endblocktrans %}</span>
+                                <span title="{% trans 'If you need to upload larger files, please use an external storage website.' %}" class="help">{% blocktrans with max_size=attachment_max_size|filesizeformat%}(max size: {{ max_size }}){% endblocktrans %}</span>
                             {% endif %}
                         </td>
-                        <td>{% if form.instance.pk %}{{ form.DELETE }} {% trans "delete" %}{% endif %}</td>
+                        <td>{% if form.instance.pk %}{{ form.DELETE }} {% trans 'delete' %}{% endif %}</td>
                         <td>
                             <span class="attachment-ref">
-                                <abbr title="{% trans 'Reference to your file' %}">Ref</abbr> : 
+                                <abbr title="{% trans 'Reference to your file' %}">{% trans 'Ref' %}</abbr>{% trans ':' %} 
                                 <span class="attachment-ref-value">[file-{{ forloop.counter }}]</span>
                                 <img style="display:none;" class="attachment-ref-insert-link" src="{% static 'pybb/img/attachment.png' %}" alt="{% trans 'link' %}" title="{% trans 'Insert a link to your file inside your post.' %}" />
                                 <img style="display:none;" class="attachment-ref-insert-image" src="{% static 'pybb/img/image.png' %}" alt="{% trans 'image' %}" title="{% trans 'Insert your image inside your post.' %}" />

pybb/templates/pybb/base.html

@@ -7,8 +7,8 @@
 {% block extra_head %}
     {{ block.super }}
     <!-- Feeds -->
-    <link rel="alternate" type="application/atom+xml" href="{% url 'pybb:feed_posts' %}" title="{% trans "Latest posts on forum" %}" >
-    <link rel="alternate" type="application/atom+xml" href="{% url 'pybb:feed_topics' %}" title="{% trans "Latest topics on forum" %}" >
+    <link rel="alternate" type="application/atom+xml" href="{% url 'pybb:feed_posts' %}" title="{% trans 'Latest posts on forum' %}" >
+    <link rel="alternate" type="application/atom+xml" href="{% url 'pybb:feed_topics' %}" title="{% trans 'Latest topics on forum' %}" >
 {% endblock %}
 
 {% block breadcrumb %}

pybb/templates/pybb/breadcrumb.html

@@ -1,7 +1,7 @@
 {% load i18n pybb_tags %}
-<ul class='breadcrumb'>
+<ul class="breadcrumb">
     {% include "pybb/breadcrumb_top_extra_crumb.html" %}
-    <li><a href="{% url 'pybb:index' %}">{% trans "Home" %}</a> <span class="divider">/</span></li>
+    <li><a href="{% url 'pybb:index' %}">{% trans 'Home' %}</a> <span class="divider">/</span></li>
     {% if object %}
         {% if object.get_parents %}
             {% for obj in object.get_parents %}

pybb/templates/pybb/category.html

@@ -1,6 +1,6 @@
 {% load i18n pybb_tags %}
 
-<div class='category'>
-    <h1>{{ category.name }} {% if category.hidden %}[{% trans "Hidden" %}]{% endif %}</h1>
+<div class="category">
+    <h1>{{ category.name }} {% if category.hidden %}[{% trans 'Hidden' %}]{% endif %}</h1>
     {% include 'pybb/forum_list.html' with forum_list=category.forums_accessed category=category parent_forum='' %}
 </div>

pybb/templates/pybb/delete_post.html

@@ -2,15 +2,15 @@
 {% load i18n pybb_tags %}
 
 {% block content %}
-    <h1>{% trans "Are you sure you want to delete this message?" %}</h1>
+    <h1>{% trans 'Are you sure you want to delete this message?' %}</h1>
     <div class="post-preview well">
         {{ post.body_html|safe }}
     </div>
     <form method="post" action=".">
         {% csrf_token %}
         <p>
-            <a class='btn' href="{{ post.get_absolute_url }}">← {% trans "No, take me back" %}</a>
-            <input type="submit" class='btn btn-danger' value="{% trans 'Yes, I am sure' %}" />
+            <a class="btn" href="{{ post.get_absolute_url }}">← {% trans 'No, take me back' %}</a>
+            <input type="submit" class="btn btn-danger" value="{% trans 'Yes, I am sure' %}" />
         </p>
     </form>
 {% endblock content %}

pybb/templates/pybb/edit_post.html

@@ -1,7 +1,7 @@
 {% extends 'pybb/base.html' %}
 {% load pybb_tags i18n staticfiles %}
 
-{% block title %}{% trans "Editing the post" %}{% endblock title %}
+{% block title %}{% trans 'Editing the post' %}{% endblock title %}
 
 {% block extra_head %}
     {{ block.super }}
@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block content %}
-    <h1>{% trans "Editing the post" %}</h1>
+    <h1>{% trans 'Editing the post' %}</h1>
     {% include "pybb/post_form.html" %}
 {% endblock content %}
 

pybb/templates/pybb/edit_privileges.html

@@ -2,10 +2,10 @@
 
 {% load i18n pybb_tags %}
 
-{% block title %}{% trans "Grant moderator privileges" %}{% endblock title %}
+{% block title %}{% trans 'Grant moderator privileges' %}{% endblock title %}
 
 {% block content %}
-    <h1>{% trans "Grant moderator privileges" %}</h1>
+    <h1>{% trans 'Grant moderator privileges' %}</h1>
         <form method="post" action="" class="privileges-edit">
             {% csrf_token %}
             <fieldset>

pybb/templates/pybb/edit_profile.html

@@ -2,27 +2,27 @@
 
 {% load i18n pybb_tags %}
 
-{% block title %}{% trans "Profile editing" %}{% endblock title %}
+{% block title %}{% trans 'Profile editing' %}{% endblock title %}
 
 {% block content %}
-    <h1>{% trans "Profile editing" %}</h1>
+    <h1>{% trans 'Profile editing' %}</h1>
     {% include 'pybb/avatar.html' with user=user %}
     <form method="post" enctype="multipart/form-data" class="profile-edit">
         {% csrf_token %}
         <fieldset>
-            <legend>{% trans "Profile editing" %}</legend>
+            <legend>{% trans 'Profile editing' %}</legend>
             {% include "pybb/form.html" %}
             <p>{% include "pybb/_button_save.html" %}</p>
         </fieldset>
     </form>
-    <h1>{% trans "Subscriptions on topics" %}</h1>
+    <h1>{% trans 'Subscriptions on topics' %}</h1>
     <ul>
         {% for sub in user.subscriptions.all %}
             <li>
                 {% pybb_link sub %}
                 &mdash;
                 <strong>
-                    <a href="{% url 'pybb:delete_subscription' sub.id %}">{% trans "delete" %}</a>
+                    <a href="{% url 'pybb:delete_subscription' sub.id %}">{% trans 'delete' %}</a>
                 </strong>
             </li>
         {% endfor %}

pybb/templates/pybb/forum_list.html

@@ -5,16 +5,16 @@
         <thead>
             <tr class="forum-row head-row">
                 <th class="forum-name">
-                    {% trans "Forum" %}
+                    {% trans 'Forum' %}
                 </th>
                 <th class="forum-topic-count">
-                    {% trans "Topics" %}
+                    {% trans 'Topics' %}
                 </th>
                 <th class="forum-post-count">
-                    {% trans "Posts" %}
+                    {% trans 'Posts' %}
                 </th>
                 <th class="forum-last-post">
-                    {% trans "Last posts" %}
+                    {% trans 'Last posts' %}
                 </th>
             </tr>
         </thead>
@@ -23,7 +23,7 @@
             <tr class="forum-row">
                 <td class="forum-name {% if forum.unread %} forum-unread{% endif %}">
                     <div class="state-indicator"></div>
-                    <a href="{{ forum.get_absolute_url }}">{{ forum.name }}</a> {% if forum.hidden %}[{% trans "Hidden" %}]{% endif %}
+                    <a href="{{ forum.get_absolute_url }}">{{ forum.name }}</a> {% if forum.hidden %}[{% trans 'Hidden' %}]{% endif %}
                     <div class="forum-description">
                         {{ forum.description|safe }}
                     </div>
@@ -40,8 +40,8 @@
             </tr>
         {% empty %}
             {% if category %}
-                <h3>{% trans "No forums created" %}</h3>
-                <a href="{% url 'admin:pybb_forum_add' %}">{% trans "Add forum now" %}</a>
+                <h3>{% trans 'No forums created' %}</h3>
+                <a href="{% url 'admin:pybb_forum_add' %}">{% trans 'Add forum now' %}</a>
             {%  endif %}
         {% endfor %}
         </tbody>

pybb/templates/pybb/forum_subscription.html

@@ -1,7 +1,7 @@
 {% extends 'pybb/base.html' %}
 {% load pybb_tags i18n %}
 
-{% block title %}{{ forum.name }} - {% trans 'Subscription' %}{% endblock title %}
+{% block title %}{% blocktrans with forum=forum.name context 'page title' %}{{ forum }} - Subscription{% endblocktrans %}{% endblock title %}
 
 {% block breadcrumb %}
     {% with forum as object %}
@@ -11,7 +11,7 @@
 
 {% block content %}
     <div class="forum_subscription">
-        <h1>{{ forum.name }} - {% trans 'Subscription' %}</h1>
+        <h1>{% blocktrans with forum=forum.name context 'content heading' %}{{ forum }} - Subscription{% endblocktrans %}</h1>
         <form class="forum_subscription" action="" method="POST">
             {% csrf_token %}
             {% include "pybb/form_errors.html" %}

pybb/templates/pybb/index.html

@@ -14,13 +14,13 @@
             {% include 'pybb/category.html' %}
         {% endfor %}
     {% else %}
-        <h2>{% trans "Forum categories are not created" %}</h2>
-        <a href="{% url 'admin:pybb_category_add' %}">{% trans "Add a category now" %}</a>
+        <h2>{% trans 'Forum categories are not created' %}</h2>
+        <a href="{% url 'admin:pybb_category_add' %}">{% trans 'Add a category now' %}</a>
     {% endif %}
     {% if user.is_authenticated %}
-        <div id='mark-all-as-read'>
-            <a href='{% url 'pybb:topic_latest' %}'>{% trans "Last updates in topics" %}</a> /
-            <a href='{% url 'pybb:mark_all_as_read' %}'>{% trans "Mark all forums as read" %}</a>
+        <div id="mark-all-as-read">
+            <a href="{% url 'pybb:topic_latest' %}">{% trans 'Last updates in topics' %}</a> /
+            <a href="{% url 'pybb:mark_all_as_read' %}">{% trans 'Mark all forums as read' %}</a>
         </div>
     {% endif %}
 {% endblock content %}

pybb/templates/pybb/latest_topics.html

@@ -2,7 +2,7 @@
 
 {% load pybb_tags i18n %}
 
-{% block title %}{% trans "Last updates in topics" %}{% endblock title %}
+{% block title %}{% trans 'Last updates in topics' %}{% endblock title %}
 
 {% block breadcrumb %}
     {% with extra_crumb=_("Last updates in topics") %}
@@ -12,7 +12,7 @@
 
 {% block content %}
     <div class="forum">
-        <h1>{% trans "Last updates in topics" %}</h1>
+        <h1>{% trans 'Last updates in topics' %}</h1>
         {% if forum.headline %}
             <div class="forum-headline alert alert-block">
                 {{ forum.headline|safe }}
@@ -26,9 +26,9 @@ <h1>{% trans "Last updates in topics" %}</h1>
         {% include "pybb/pagination.html" %}
 
         {% if user.is_authenticated %}
-            <div id='mark-all-as-read'>
-                <a href='{% url 'pybb:mark_all_as_read' %}'>
-                    {% trans "Mark all topics as read" %}
+            <div id="mark-all-as-read">
+                <a href="{% url 'pybb:mark_all_as_read' %}">
+                    {% trans 'Mark all topics as read' %}
                 </a>
             </div>
         {% endif %}

pybb/templates/pybb/mail_templates/forum_subscription_email_body.html

@@ -1,9 +1,9 @@
 {% load i18n pybb_tags %}
 {% pybb_get_profile user=topic.user as profile %}
 
-{% trans "User" %} {{ profile.get_display_name }} {% trans "post a new topic in forum to which you are subscribed." %} ({{ topic.forum.name }})
-{% trans "Link to topic:" %} http://{{site}}{{ topic.get_absolute_url }}
-{% trans "Link to forum:" %} http://{{site}}{{ topic.forum.get_absolute_url }}
+{% blocktrans with username=profile.get_display_name forum_name=topic.forum.name %}User {{ username }} post a new topic in forum to which you are subscribed ({{ forum_name }}).{% endblocktrans %}
+{% trans 'Link to topic' %}{% trans ':' %} http://{{site}}{{ topic.get_absolute_url }}
+{% trans 'Link to forum' %}{% trans ':' %} http://{{site}}{{ topic.forum.get_absolute_url }}
 
 -----
-{% trans "If you don't want to receive notifications on new topics in this forum visit following link:" %} http://{{site}}{{ manage_url }}
+{% blocktrans %}If you don't want to receive notifications on new topics in this forum visit following link{% endblocktrans %}{% trans ':' %} http://{{site}}{{ manage_url }}

pybb/templates/pybb/mail_templates/forum_subscription_email_subject.html

@@ -1,2 +1,2 @@
 {% load i18n %}
-{% trans "New topic in forum that you subscribed." %}
+{% trans 'New topic in forum that you subscribed.' %}

pybb/templates/pybb/mail_templates/subscription_email_body-html.html

@@ -11,6 +11,6 @@
         </p>
 
         <hr />
-        {% blocktrans with link_start='<a href="'|add:delete_url_full|add:'">'|safe %}If you don't want to receive notifications on new posts in this topic visit following {{ link_start}} this link{{ link_end }}.{% endblocktrans%}
+        {% blocktrans with link_start='<a href="'|add:delete_url_full|add:'">'|safe %}If you don't want to receive notifications on new posts in this topic visit {{ link_start}}this link{{ link_end }}.{% endblocktrans%}
     {% endwith %}
 {% endblock %}

pybb/templates/pybb/mail_templates/subscription_email_body.html

@@ -1,10 +1,10 @@
 {% extends PYBB_TEMPLATE_MAIL_TXT|default:"pybb/mail_templates/base.html" %}
 {% load i18n pybb_tags %}
 {% block content %}{% pybb_get_profile user=post.user as profile %}{% autoescape off %}{% blocktrans with username=profile.get_display_name %}User {{ username }} replied in topic to which you are subscribed.{% endblocktrans%}
-{% trans "Link to post:" %} {{ post_url }}
-{% trans "Link to topic:" %} {{ topic_url }}
+{% trans 'Link to post' %}{% trans ':' %} {{ post_url }}
+{% trans 'Link to topic' %}{% trans ':' %} {{ topic_url }}
 
 -----
-{% trans "If you don't want to receive notifications on new messages in this topic visit following link:" %} {{ delete_url_full }}
+{% blocktrans %}If you don't want to receive notifications on new messages in this topic visit following link: {{ delete_url_full }}{% endblocktrans %} 
 {% endautoescape %}
 {% endblock %}

pybb/templates/pybb/mail_templates/subscription_email_subject.html

@@ -1,2 +1,2 @@
 {% load i18n %}
-{% trans "New answer in topic that you subscribed." %}
+{% trans 'New answer in topic that you subscribed.' %}