Merge branch 'Dname' into 'master'

Fix history et i18n

See merge request federez/re2o!207

machines/templates/machines/aff_dname.html

@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load acl %}
+{% load logs_extra %}
 
     <table class="table table-striped">
         <thead>
@@ -38,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% can_edit dname %}
                 {% include 'buttons/edit.html' with href='machines:edit-dname' id=dname.id %}
                 {% acl_end %}
-                {% include 'buttons/history.html' with href='machines:history' name='dname' id=dname.id %}
+		{% history_button dname %}
             </td>
         </tr>
         {% endfor %}

machines/templates/machines/index_extension.html

@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load bootstrap3 %}
 
 {% load acl %}
+{% load i18n %}
 
 {% block title %}Machines{% endblock %}