diff --git a/po/plume.pot b/po/plume.pot
index 7d698ede..d64da1b3 100644
--- a/po/plume.pot
+++ b/po/plume.pot
@@ -249,3 +249,5 @@ msgstr ""
 msgid "You need to be logged in order to edit your profile"
 msgstr ""
 
+msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}"
+msgstr ""
diff --git a/templates/blogs/new.html.tera b/templates/blogs/new.html.tera
index 0f89bced..036cd2a6 100644
--- a/templates/blogs/new.html.tera
+++ b/templates/blogs/new.html.tera
@@ -10,6 +10,6 @@
     <label for="title">{{ "Title" | _ }}</label>
     <input name="title">
 
-    <input type="submit" value="{{ "Create blog"}}"/>            
+    <input type="submit" value="{{ "Create blog" | _ }}"/>            
 </form>
- | _ {% endblock content %}
+{% endblock content %}
diff --git a/templates/macros.html.tera b/templates/macros.html.tera
index 3cce7285..80ad8024 100644
--- a/templates/macros.html.tera
+++ b/templates/macros.html.tera
@@ -7,6 +7,14 @@
     <div class="card">
         <h3><a href="{{ article.url }}">{{ article.post.title }}</a></h3>
         <main><p>{{ article.post.content | striptags | truncate(length=200) }}</p></main>
-        <p>By <a href="/@/{{ article.author.fqn }}/">{{ name }}</a> ⋅ {{ article.date | date(format="%B %e") }}</p>
+        <p>
+            {{ "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 %}
diff --git a/templates/notifications/index.html.tera b/templates/notifications/index.html.tera
index bbe79618..194581d5 100644
--- a/templates/notifications/index.html.tera
+++ b/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 | _ }}</h3>
                 {% if notification.content %}
                     <p>{{ notification.content }}</p>
                 {% endif %}