Merge pull request #894 from danielhjames/BK-2349

BK-2349 Interface string fixes from Flossmanuals FR, thanks Nicolas!

Author: ride90

lib/booki/locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Booktype 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-09 10:15+0100\n"
+"POT-Creation-Date: 2018-07-16 18:04+0100\n"
 "PO-Revision-Date: 2014-12-29 15:53+0100\n"
 "Last-Translator: Daniel James <daniel.james@sourcefabric.org>\n"
 "Language-Team: Sourcefabric Localization <contact@sourcefabric.org>\n"
@@ -573,7 +573,8 @@ msgid "send a reply"
 msgstr ""
 
 #: lib/booki/messaging/templates/messaging/post.html:11
-msgid "ago"
+#, python-format
+msgid "%(time_t)s \"ago\" "
 msgstr ""
 
 #: lib/booki/messaging/templates/messaging/post.html:22

lib/booki/messaging/templates/messaging/post.html

@@ -8,7 +8,7 @@
 <a class="action-button" href="{% url "view_profile" post.sender.as_user.username %}" onclick="$.bookiReply($('.post{{post.id}}')[0]);return false">{% trans "send a reply" %}</a>
 <br />
 <div class="post-time">
-{{ post.timestamp|timesince }} {% trans "ago" %}
+{% blocktrans with time_t=post.timestamp|timesince %}{{time_t}} "ago" {% endblocktrans %}
 </div>
 {{ post.content_as_html|safe }}
 {% if post.attachment %}

lib/booktype/apps/account/templates/account/dashboard.html

@@ -174,7 +174,7 @@ <h2 class="box-title">{% trans "Recent Activity" %}</h2>
                     <li>
                         <figure><img src="{{ activity.image_url }}"></figure>
                         <div class="list-info">
-                          <span class="time">{{ base_activ.modified|timesince }} {% trans "ago" %}</span>
+                          <span class="time">{% blocktrans with time_t=base_activ.modified|timesince %}{{time_t}} "ago" {% endblocktrans %}</span>
                           <h4><a href="{% url 'accounts:view_profile' base_activ.user %}">{{ base_activ.user }}</a></h4>
                           <p>
                             {{ activity.verbose }}

lib/booktype/apps/account/templates/account/dashboard_create_book_modal.html

@@ -119,7 +119,8 @@ <h3>{% trans "Creation mode" %}</h3>
                     <p>
                       {% trans "No book skeletons yet." %}
                       {% check_perm 'account.can_manage_book_skeletons' %}
-                      {% trans "You can manage them from the" %} <a href="{% url 'control_center:settings' %}#list-of-skeletons">{% trans "Control Center" %}</a>
+                      {% url 'control_center:settings' as t_url %}
+                      {% blocktrans %}You can manage them from the <a href="{{t_url}}#list-of-skeletons">Control Center</a>{% endblocktrans %}
                       {% endcheck_perm %}
                     </p>
                   </div>

lib/booktype/apps/account/templates/account/dashboard_group_template.html

@@ -8,8 +8,8 @@ <h4>
             </a> - {{ group.description }}
         </h4>
         <span>
-            {% trans "Members" %}: {{ group.members.count }}  
-            {% trans "Books" %}: {{ group.book_set.count }}
+            {% trans "Members:" %} {{ group.members.count }}
+            {% trans "Books:" %} {{ group.book_set.count }}
         </span>
         {% if can_delete %}
         <button type="button" class="btn btn-default btn-xs float-right" data-remote="{% url 'portal:delete_group' group.url_name %}" data-toggle="modal" data-target="#groupDeleteModal">

lib/booktype/apps/edit/templates/edit/panel_settings.html

@@ -135,7 +135,7 @@ <h4>
     {% trans "Roles" %}
   </h4>
   <div class="roles">
-    {% trans "This book doesn't contain invited people. Please invite people in your " %}
-    <a target="_blank" href="{% url "accounts:view_profile" request.user.username %}">{% trans "Dashboard" %}</a>.
+    {% url "accounts:view_profile" request.user.username as t_url%}
+    {% blocktrans %}This book doesn't contain invited people. Please invite people in your <a target="_blank" href="{{t_url}}">Dashboard</a>.{% endblocktrans %}
   </div>
 </script>

lib/booktype/apps/edit/templates/edit/settings/_roles.html

@@ -51,8 +51,8 @@ <h4><a target="_blank" href="{% url 'accounts:view_profile' user.username %}">{{
       </tr>
       {% empty %}
 
-      {% trans "This book doesn't contain invited people. Please invite people in your " %}
-
+      {% url "accounts:view_profile" request.user.username as t_url %}
+      {% blocktrans %}This book doesn't contain invited people. Please invite people in your <a target="_blank" href="{{t_url}}">Dashboard</a>.{% endblocktrans %}
       {% endfor %}
     </tbody>
   </table>

lib/booktype/apps/portal/templates/portal/all_groups.html

@@ -30,7 +30,7 @@ <h2 class="box-title">
                                     {% endif %}
                                 {% endif %}
                                 <h4><a href="{% url "portal:group" group.url_name %}">{{ group.name }}</a> - {{ group.description }}</h4>
-                                <span>{% trans "Members" %}: {{ group.members.all.count }}  {% trans "Books" %}: {{ group.num_books }}</span>
+                                <span>{% trans "Members:" %} {{ group.members.all.count }}  {% trans "Books:" %} {{ group.num_books }}</span>
                             </div>
                     </li>
                     {% empty %}
@@ -69,7 +69,7 @@ <h2 class="box-title">{% trans "Active groups" %}</h2>
                         <figure><img src="{{ active_group.small_group_image }}" /></figure>
                         <div class="list-info">
                             <h4><a href="{% url "portal:group" active_group.url_name %}">{{ active_group.name }}</a> - {{ active_group.description }}</h4>
-                            <span>{% trans "Members" %}: {{ active_group.members.all.count }}  {% trans "Books" %}: {{ active_group.num_books }}</span>
+                            <span>{% trans "Members:" %} {{ active_group.members.all.count }}  {% trans "Books:" %} {{ active_group.num_books }}</span>
                         </div>
                     </li>
                     {% empty %}
@@ -93,7 +93,7 @@ <h2 class="box-title">{% trans "New groups" %}</h2>
                                     {% endif %}
                                 {% endif %}
                                 <h4><a href="{% url "portal:group" group.url_name %}">{{ group.name }}</a> - {{ group.description }}</h4>
-                                <span>{% trans "Members" %}: {{ group.num_members }}  {% trans "Books" %}: {{ group.num_books }}</span>
+                                <span>{% trans "Members:" %} {{ group.num_members }}  {% trans "Books:" %} {{ group.num_books }}</span>
                             </div>
                         </li>
                         {% empty %}

lib/booktype/apps/portal/templates/portal/books.html

@@ -112,7 +112,7 @@ <h2 class="box-title">{% trans "Recent Activity" %}</h2>
                         <li>
                             <figure><img src="{% url "view_profilethumbnail" activity.user %}?width=48" alt="{{ activity.user }}"></figure>
                             <div class="list-info">
-                                <span class="time">{{ activity.modified|timesince}} {% trans "ago" %}</span>
+                                <span class="time">{% blocktrans with time_t=_activity.modified|timesince %}{{time_t}} "ago" {% endblocktrans %}</span>
                                 <h4>
                                   {% has_perm 'account.can_view_user_info' as access %}
                                   {% if access or request.user == activity.user %}

lib/booktype/apps/portal/templates/portal/group.html

@@ -19,8 +19,8 @@
                         <h2 class="box-title">{{ user_group.name }}</h2>
                             <p>{{ user_group.description }}</p>
                             <p>
-                                {% trans "Members" %}: {{ user_group.num_members }}  <br>
-                                 {% trans "Books" %}: {{ user_group.num_books }}
+                                {% trans "Members:" %} {{ user_group.num_members }}  <br>
+                                 {% trans "Books:" %} {{ user_group.num_books }}
                             </p>
                      </div>