Merge branch 'master' into master

templates/blogs/new.html.tera

@@ -9,7 +9,6 @@
 <form method="post">
     <label for="title">{{ "Title" | _ }}</label>
     <input type="text" id="title" name="title" />
-
-    <input type="submit" value="{{ "Create blog"}}" />
+    <input type="submit" value="{{ "Create blog" | _ }}"/>
 </form>
- | _ {% endblock content %}
+{% endblock content %}

templates/macros.html.tera

@@ -10,7 +10,14 @@
             <p>{{ article.post.content | striptags | truncate(length=200) }}</p>
         </main>
         <p class="author">
-        	By <a href="/@/{{ article.author.fqn }}/">{{ name }}</a> ⋅ {{ article.date | date(format="%B %e") }}
+        	{{ "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}" | _(
+                link_1='<a href="/@/',
+                link_2=article.author.fqn,
+                link_3='/">',
+                name=name,
+                link_4="</a>")
+            }}
+            ⋅ {{ article.date | date(format="%B %e") }}
         </p>
     </div>
 {% endmacro post_card %}

templates/notifications/index.html.tera

@@ -9,7 +9,7 @@
     <div class="list">
         {% for notification in notifications %}
             <div class="card">
-                <h3><a href="{% if notification.link %}{{ notification.link }}/{% else %}#{% endif %}">{{ notification.title }}</h3>
+                <h3><a href="{% if notification.link %}{{ notification.link }}/{% else %}#{% endif %}">{{ notification.title | _(data=notification.data) }}</h3>
                 {% if notification.content %}
                     <p>{{ notification.content }}</p>
                 {% endif %}