add translations for machines/

machines/migrations/0101_auto_20190108_1623.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2019-01-08 22:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0100_auto_20190102_1753'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='ouvertureport',
+            options={'verbose_name': 'ports opening', 'verbose_name_plural': 'ports openings'},
+        ),
+        migrations.AlterField(
+            model_name='nas',
+            name='port_access_mode',
+            field=models.CharField(choices=[('802.1X', '802.1X'), ('Mac-address', 'MAC-address')], default='802.1X', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='vlan',
+            name='igmp',
+            field=models.BooleanField(default=False, help_text='v4 multicast management'),
+        ),
+        migrations.AlterField(
+            model_name='vlan',
+            name='mld',
+            field=models.BooleanField(default=False, help_text='v6 multicast management'),
+        ),
+    ]

machines/models.py

@@ -201,7 +201,7 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
         if interfaces_set:
             return str(interfaces_set.domain.name)
         else:
-            return "None"
+            return _("No name")
 
     @cached_property
     def complete_name(self):
@@ -340,7 +340,7 @@ class IpType(RevMixin, AclMixin, models.Model):
             ("use_all_iptype", _("Can use all IP types")),
         )
         verbose_name = _("IP type")
-        verbose_name_plural = "IP types"
+        verbose_name_plural = _("IP types")
 
     @cached_property
     def ip_range(self):
@@ -534,11 +534,11 @@ class Vlan(RevMixin, AclMixin, models.Model):
     dhcpv6_snooping = models.BooleanField(default=False)
     igmp = models.BooleanField(
         default=False,
-        help_text="Gestion multicast v4"
+        help_text=_("v4 multicast management")
     )
     mld = models.BooleanField(
         default=False,
-        help_text="Gestion multicast v6"
+        help_text=_("v6 multicast management")
     )
 
     class Meta:
@@ -559,7 +559,7 @@ class Nas(RevMixin, AclMixin, models.Model):
     default_mode = '802.1X'
     AUTH = (
         ('802.1X', '802.1X'),
-        ('Mac-address', 'Mac-address'),
+        ('Mac-address', _("MAC-address")),
     )
 
     name = models.CharField(max_length=255, unique=True)
@@ -666,7 +666,7 @@ class SOA(RevMixin, AclMixin, models.Model):
         utilisée dans les migrations de la BDD. """
         return cls.objects.get_or_create(
             name=_("SOA to edit"),
-            mail="postmaser@example.com"
+            mail="postmaster@example.com"
         )[0].pk
 
 
@@ -934,7 +934,7 @@ class SshFp(RevMixin, AclMixin, models.Model):
 
     machine = models.ForeignKey('Machine', on_delete=models.CASCADE)
     pub_key_entry = models.TextField(
-        help_text="SSH public key",
+        help_text=_("SSH public key"),
         max_length=2048
     )
     algo = models.CharField(
@@ -942,7 +942,7 @@ class SshFp(RevMixin, AclMixin, models.Model):
         max_length=32
     )
     comment = models.CharField(
-        help_text="Comment",
+        help_text=_("Comment"),
         max_length=255,
         null=True,
         blank=True
@@ -1872,7 +1872,8 @@ class OuverturePort(RevMixin, AclMixin, models.Model):
     )
 
     class Meta:
-        verbose_name = _("ports openings")
+        verbose_name = _("ports opening")
+        verbose_name_plural = _("ports openings")
 
     def __str__(self):
         if self.begin == self.end:

machines/templates/machines/aff_alias.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ alias }}</td>
             <td class="text-right">
                 {% can_edit alias %}
-                    {% include 'buttons/edit.html' with href='machines:edit-alias' id=alias.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-alias' id=alias.id %}
                 {% acl_end %}
                 {% history_button alias %}
             </td>

machines/templates/machines/aff_dname.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ dname.dns_entry }}</td>
             <td class="text-right">
                 {% can_edit dname %}
-                    {% include 'buttons/edit.html' with href='machines:edit-dname' id=dname.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-dname' id=dname.id %}
                 {% acl_end %}
                 {% history_button dname %}
             </td>

machines/templates/machines/aff_extension.html

@@ -54,7 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <td>{{ extension.dnssec|tick }}</td>
                 <td class="text-right">
                     {% can_edit extension %}
-                        {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
                     {% acl_end %}
                     {% history_button extension %}
                 </td>

machines/templates/machines/aff_iptype.html

@@ -56,7 +56,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <td>{{ type.ouverture_ports }}</td>
                 <td class="text-right">
                     {% can_edit type %}
-                        {% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
                     {% acl_end %}
                     {% history_button type %}
                 </td>

machines/templates/machines/aff_ipv6.html

@@ -40,10 +40,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ ipv6.slaac_ip }}</td>
             <td class="text-right">
                 {% can_edit ipv6 %}
-                    {% include 'buttons/edit.html' with href='machines:edit-ipv6list' id=ipv6.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-ipv6list' id=ipv6.id %}
                 {% acl_end %}
                 {% can_delete ipv6 %}
-                    {% include 'buttons/suppr.html' with href='machines:del-ipv6list' id=ipv6.id %}
+                {% include 'buttons/suppr.html' with href='machines:del-ipv6list' id=ipv6.id %}
                 {% acl_end %}
                 {% history_button ipv6 %}
             </td>

machines/templates/machines/aff_machines.html

@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <div class="table-responsive">
     {% if machines_list.paginator %}
-        {% include "pagination.html" with list=machines_list go_to_id="machines" %}
+        {% include 'pagination.html' with list=machines_list go_to_id="machines" %}
     {% endif %}
 
     <table class="table" id="machines_table">
@@ -41,7 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </colgroup>
         <thead>
             {% trans "DNS name" as tr_dns_name %}
-            <th>{% include "buttons/sort.html" with prefix='machine' col='name' text=tr_dns_name %}</th>
+            <th>{% include 'buttons/sort.html' with prefix='machine' col='name' text=tr_dns_name %}</th>
             <th>{% trans "Type" %}</th>
             <th>{% trans "MAC address" %}</th>
             <th>{% trans "IP address" %}</th>
@@ -52,19 +52,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                     <td colspan="4">
                         {% trans "No name" as tr_no_name %}
                         {% trans "View the profile" as tr_view_the_profile %}
-                        <b>{{ machine.get_name|default:'<i>tr_no_name</i>' }}</b> <i class="fa fa-angle-right"></i>
+                        <b>{{ machine.get_name|default:tr_no_name }}</b> <i class="fa fa-angle-right"></i>
                         <a href="{% url 'users:profil' userid=machine.user.id %}" title=tr_view_the_profile>
                             <i class="fa fa-user"></i> {{ machine.user }}
                         </a>
                     </td>
                     <td class="text-right">
-                        {% can_create Interface machine.id %}
+                    {% can_create Interface machine.id %}
-                        {% trans "Create an interface" as tr_create_an_interface %}
+                    {% trans "Create an interface" as tr_create_an_interface %}
-                        {% include 'buttons/add.html' with href='machines:new-interface' id=machine.id desc=tr_create_an_interface %}
+                    {% include 'buttons/add.html' with href='machines:new-interface' id=machine.id desc=tr_create_an_interface %}
                     {% acl_end %}
                     {% history_button machine %}
                     {% can_delete machine %}
-                        {% include 'buttons/suppr.html' with href='machines:del-machine' id=machine.id %}
+                    {% include 'buttons/suppr.html' with href='machines:del-machine' id=machine.id %}
                     {% acl_end %}
                 </td>
             </tr>
@@ -153,7 +153,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             </div>
                             {% history_button interface %}
                             {% can_delete interface %}
-                                {% include 'buttons/suppr.html' with href='machines:del-interface' id=interface.id %}
+                            {% include 'buttons/suppr.html' with href='machines:del-interface' id=interface.id %}
                             {% acl_end %}
                         </div>
                     </td>
@@ -215,6 +215,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     </script>
 
     {% if machines_list.paginator %}
-        {% include "pagination.html" with list=machines_list go_to_id="machines" %}
+        {% include 'pagination.html' with list=machines_list go_to_id="machines" %}
     {% endif %}
 </div>

machines/templates/machines/aff_machinetype.html

@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ type.ip_type }}</td>
             <td class="text-right">
                 {% can_edit type %}
-                    {% include 'buttons/edit.html' with href='machines:edit-machinetype' id=type.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-machinetype' id=type.id %}
                 {% acl_end %}
                 {% history_button type %}
             </td>

machines/templates/machines/aff_mx.html

@@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ mx.name }}</td>
             <td class="text-right">
                 {% can_edit mx %}
-                    {% include 'buttons/edit.html' with href='machines:edit-mx' id=mx.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-mx' id=mx.id %}
                 {% acl_end %}
                 {% history_button mx %}
             </td>

machines/templates/machines/aff_nas.html

@@ -47,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ nas.autocapture_mac|tick }}</td>
             <td class="text-right">
                 {% can_edit nas %}
-                    {% include 'buttons/edit.html' with href='machines:edit-nas' id=nas.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-nas' id=nas.id %}
                 {% acl_end %}
                 {% history_button nas %}
             </td>

machines/templates/machines/aff_ns.html

@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ ns.ns }}</td>
             <td class="text-right">
                 {% can_edit ns %}
-                    {% include 'buttons/edit.html' with href='machines:edit-ns' id=ns.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-ns' id=ns.id %}
                 {% acl_end %}
                 {% history_button ns %}
             </td>

machines/templates/machines/aff_role.html

@@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{% for serv in role.servers.all %}{{ serv }}, {% endfor %}</td>
             <td class="text-right">
                 {% can_edit role %}
-                    {% include 'buttons/edit.html' with href='machines:edit-role' id=role.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-role' id=role.id %}
                 {% acl_end %}
                 {% history_button role %}
             </td>

machines/templates/machines/aff_service.html

@@ -47,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                     class="fa fa-sync"></i></a></td>
             <td class="text-right">
                 {% can_edit service %}
-                    {% include 'buttons/edit.html' with href='machines:edit-service' id=service.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-service' id=service.id %}
                 {% acl_end %}
                 {% history_button service %}
             </td>

machines/templates/machines/aff_soa.html

@@ -48,7 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ soa.ttl }}</td>
             <td class="text-right">
                 {% can_edit soa %}
-                    {% include 'buttons/edit.html' with href='machines:edit-soa' id=soa.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-soa' id=soa.id %}
                 {% acl_end %}
                 {% history_button soa %}
             </td>

machines/templates/machines/aff_srv.html

@@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ srv.target }}</td>
             <td class="text-right">
                 {% can_edit srv %}
-                    {% include 'buttons/edit.html' with href='machines:edit-srv' id=srv.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-srv' id=srv.id %}
                 {% acl_end %}
                 {% history_button srv %}
             </td>

machines/templates/machines/aff_sshfp.html

@@ -41,11 +41,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <td>{{ sshfp.comment }}</td>
                 <td class="text-right">
                     {% can_edit sshfp %}
-                        {% include 'buttons/edit.html' with href='machines:edit-sshfp' id=sshfp.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-sshfp' id=sshfp.id %}
                     {% acl_end %}
                     {% history_button sshfp %}
                     {% can_delete sshfp %}
-                        {% include 'buttons/suppr.html' with href='machines:del-sshfp' id=sshfp.id %}
+                    {% include 'buttons/suppr.html' with href='machines:del-sshfp' id=sshfp.id %}
                     {% acl_end %}
                 </td>
             </tr>

machines/templates/machines/aff_txt.html

@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ txt.dns_entry }}</td>
             <td class="text-right">
                 {% can_edit txt %}
-                    {% include 'buttons/edit.html' with href='machines:edit-txt' id=txt.id %}
+                {% include 'buttons/edit.html' with href='machines:edit-txt' id=txt.id %}
                 {% acl_end %}
                 {% history_button txt %}
             </td>

machines/templates/machines/aff_vlan.html

@@ -45,7 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <td>{% for range in vlan.iptype_set.all %}{{ range }}, {% endfor %}</td>
                 <td class="text-right">
                     {% can_edit vlan %}
-                        {% include 'buttons/edit.html' with href='machines:edit-vlan' id=vlan.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-vlan' id=vlan.id %}
                     {% acl_end %}
                     {% history_button vlan %}
                 </td>

machines/templates/machines/delete.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -26,14 +26,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load bootstrap3 %}
 {% load i18n %}
 
-{% block title %}{% trans "Creation and editing of machines" %}{% endblock %}
+{% block title %}{% trans "Deletion of machines" %}{% endblock %}
 
 {% block content %}
 
     <form class="form" method="post">
         {% csrf_token %}
-        <h4>{% blocktrans %}Warning: are you sure you want to delete this object {{ objet_name }} ( {{ objet }}
+        <h4>{% blocktrans %}Warning: are you sure you want to delete this object {{ objet_name }} ( {{ objet }} )?{% endblocktrans %}</h4>
-            )?{% endblocktrans %}</h4>
         {% trans "Confirm" as tr_confirm %}
         {% bootstrap_button tr_confirm button_type="submit" icon='trash' button_class='btn-danger' %}
     </form>

machines/templates/machines/edit_portlist.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en

machines/templates/machines/index.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
     <h2>{% trans "Machines" %}</h2>
-    {% include "machines/aff_machines.html" with  machines_list=machines_list %}
+    {% include 'machines/aff_machines.html' with  machines_list=machines_list %}
     <br/>
     <br/>
     <br/>

machines/templates/machines/index_alias.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             class="fa fa-plus"></i>{% trans " Add an alias" %}</a>
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-alias'  interface_id %}"><i
             class="fa fa-trash"></i>{% trans " Delete one or several aliases" %}</a>
-    {% include "machines/aff_alias.html" with  alias_list=alias_list %}
+    {% include 'machines/aff_alias.html' with  alias_list=alias_list %}
     <br/>
     <br/>
     <br/>

machines/templates/machines/index_extension.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -39,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-extension' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several extensions" %}
     </a>
-    {% include "machines/aff_extension.html" with  extension_list=extension_list %}
+    {% include 'machines/aff_extension.html' with  extension_list=extension_list %}
 
     <h2>{% trans "List of SOA records" %}</h2>
     {% can_create SOA %}
@@ -50,7 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-soa' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several SOA records" %}
     </a>
-    {% include "machines/aff_soa.html" with  soa_list=soa_list %}
+    {% include 'machines/aff_soa.html' with  soa_list=soa_list %}
 
     <h2>{% trans "List of MX records" %}</h2>
     {% can_create Mx %}
@@ -61,7 +61,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-mx' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several MX records" %}
     </a>
-    {% include "machines/aff_mx.html" with  mx_list=mx_list %}
+    {% include 'machines/aff_mx.html' with  mx_list=mx_list %}
 
     <h2>{% trans "List of NS records" %}</h2>
     {% can_create Ns %}
@@ -72,7 +72,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-ns' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several NS records" %}
     </a>
-    {% include "machines/aff_ns.html" with  ns_list=ns_list %}
+    {% include 'machines/aff_ns.html' with  ns_list=ns_list %}
 
     <h2>{% trans "List of TXT records" %}</h2>
     {% can_create Txt %}
@@ -83,7 +83,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-txt' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several TXT records" %}
     </a>
-    {% include "machines/aff_txt.html" with  txt_list=txt_list %}
+    {% include 'machines/aff_txt.html' with  txt_list=txt_list %}
 
     <h2>{% trans "List of DNAME records" %}</h2>
     {% can_create DName %}
@@ -94,7 +94,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-dname' %}">
         <i class="fa fa-trash"></i> {% trans " Delete one or several DNAME records" %}
     </a>
-    {% include "machines/aff_dname.html" with  dname_list=dname_list %}
+    {% include 'machines/aff_dname.html' with  dname_list=dname_list %}
 
     <h2>{% trans "List of SRV records" %}</h2>
     {% can_create Srv %}
@@ -105,5 +105,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-srv' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several SRV records" %}
     </a>
-    {% include "machines/aff_srv.html" with  srv_list=srv_list %}
+    {% include 'machines/aff_srv.html' with  srv_list=srv_list %}
 {% endblock %}

machines/templates/machines/index_iptype.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -39,5 +39,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-iptype' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several IP types" %}
     </a>
-    {% include "machines/aff_iptype.html" with  iptype_list=iptype_list %}
+    {% include 'machines/aff_iptype.html' with  iptype_list=iptype_list %}
 {% endblock %}

machines/templates/machines/index_ipv6.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <i class="fa fa-plus"></i>{% trans " Add an IPv6 address" %}
         </a>
     {% acl_end %}
-    {% include "machines/aff_ipv6.html" with  ipv6_list=ipv6_list %}
+    {% include 'machines/aff_ipv6.html' with  ipv6_list=ipv6_list %}
     <br/>
     <br/>
     <br/>

machines/templates/machines/index_machinetype.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-machinetype' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several machine types" %}
     </a>
-    {% include "machines/aff_machinetype.html" with  machinetype_list=machinetype_list %}
+    {% include 'machines/aff_machinetype.html' with  machinetype_list=machinetype_list %}
     <br/>
     <br/>
     <br/>

machines/templates/machines/index_nas.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -41,7 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-nas' %}">
         <i class="fa fa-trash"></i>{% trans " Delete one or several NAS device types" %}
     </a>
-    {% include "machines/aff_nas.html" with  nas_list=nas_list %}
+    {% include 'machines/aff_nas.html' with  nas_list=nas_list %}
     <br/>
     <br/>
     <br/>

machines/templates/machines/index_portlist.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 
 {% load bootstrap3 %}
 

machines/templates/machines/index_role.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -37,5 +37,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-role' %}"><i
             class="fa fa-trash"></i>{% trans " Delete one or several roles" %}</a>
-    {% include "machines/aff_role.html" with  role_list=role_list %}
+    {% include 'machines/aff_role.html' with  role_list=role_list %}
 {% endblock %}

machines/templates/machines/index_service.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -37,8 +37,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-service' %}"><i
             class="fa fa-trash"></i>{% trans " Delete one or several services" %}</a>
-    {% include "machines/aff_service.html" with  service_list=service_list %}
+    {% include 'machines/aff_service.html' with  service_list=service_list %}
 
     <h2>{% trans "States of servers" %}</h2>
-    {% include "machines/aff_servers.html" with  servers_list=servers_list %}
+    {% include 'machines/aff_servers.html' with  servers_list=servers_list %}
 {% endblock %}

machines/templates/machines/index_sshfp.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -34,5 +34,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <i class="fa fa-plus"></i>{% trans " Add an SSH fingerprint" %}
     </a>
     {% acl_end %}
-    {% include "machines/aff_sshfp.html" with sshfp_list=sshfp_list %}
+    {% include 'machines/aff_sshfp.html' with sshfp_list=sshfp_list %}
 {% endblock %}

machines/templates/machines/index_vlan.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -37,5 +37,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-vlan' %}"><i
             class="fa fa-trash"></i>{% trans " Delete one or several VLANs" %}</a>
-    {% include "machines/aff_vlan.html" with  vlan_list=vlan_list %}
+    {% include 'machines/aff_vlan.html' with  vlan_list=vlan_list %}
 {% endblock %}

machines/templates/machines/machine.html

@@ -1,4 +1,4 @@
-{% extends "machines/sidebar.html" %}
+{% extends 'machines/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -171,3 +171,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
     </form>
 {% endblock %}
+

machines/templates/machines/sidebar.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -28,57 +28,58 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block sidebar %}
     {% can_view_all Machine %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "Machines" %}
     </a>
     {% acl_end %}
     {% can_view_all MachineType %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index-machinetype" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index-machinetype' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "Machine types" %}
     </a>
     {% acl_end %}
     {% can_view_all Extension %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index-extension" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index-extension' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "Extensions and zones" %}
     </a>
     {% acl_end %}
     {% can_view_all IpType %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index-iptype" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index-iptype' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "IP ranges" %}
     </a>
     {% acl_end %}
     {% can_view_all Vlan %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index-vlan" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index-vlan' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "VLANs" %}
     </a>
     {% acl_end %}
     {% can_view_all Nas %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index-nas" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index-nas' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "NAS devices" %}
     </a>
     {% acl_end %}
     {% can_view_all machines.Service %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index-service" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index-service' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "Services (DHCP, DNS, ...)" %}
     </a>
     {% acl_end %}
     {% can_view_all Role %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index-role" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index-role' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "Server roles" %}
     </a>
     {% acl_end %}
     {% can_view_all OuverturePortList %}
-    <a class="list-group-item list-group-item-info" href="{% url "machines:index-portlist" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'machines:index-portlist' %}">
         <i class="fa fa-list-ul"></i>
         {% trans "Ports openings" %}
     </a>
     {% acl_end %}
 {% endblock %}
+