Merge branch 'ci-integration' into 'master'

translation

See merge request !14

circle/dashboard/templates/dashboard/_ci-data-help.html

@@ -9,19 +9,19 @@
     <div class="card card-body">
       <b> {% trans "Use Jinja2 template syntax, values: " %}</b>
       <ul>
-        <li>{% trans "<code>hostname</code> - vm hostname" %}</li>
-        <li>{% trans "<code>sysuser</code> - vm system default user (cloud)" %}</li>
-        <li>{% trans "<code>password</code> - default user password (use 'hash' filter to convert sha512)" %}</li>
-        <li>{% trans "<code>owner</code> - vm owner django username" %}</li>
-        <li>{% trans "<code>acl.allusers</code> - get all associated user's username to vm (list)" %}</li>
-        <li>{% trans "<code>acl.operators</code> - get all associated operator level user's username to vm (list)" %}</li>
-        <li>{% trans "<code>acl.users</code> - get all associated user level user's username to vm (list)" %}</li>
-        <li>{% trans "<code>net.ipv4</code> - default host ip address" %}</li>
-        <li>{% trans "<code>net.ipv6</code> - default host ipv6 address" %}</li>
-        <li>{% trans "<code>net.vlans</code> - associated vlans: list of objects (name: vlan name, ipv4/ipv6: host ip in vlan)" %}</li>
-        <li>{% trans "<code>ssh.keys</code> - owner's ssh-keys dictionary: the key is the ssh-key's name" %}</li>
-        <li>{% trans "<code>ci.rndstr(len: int)</code> - function: make random string with 'len' charachters lenght" %}</li>
-        <li>{% trans "<code>ci.loadjson(url: str)</code> - load json object from remote url" %}</li>
+        <li><code>hostname</code> - {% trans "vm hostname" %}</li>
+        <li><code>sysuser</code>  - {% trans "vm system default user (cloud)" %}</li>
+        <li><code>password</code> - {% trans "default user password (use 'hash' filter to convert sha512)" %}</li>
+        <li><code>owner</code>    - {% trans "vm owner django username" %}</li>
+        <li><code>acl.allusers</code> - {% trans "get all associated user's username to vm (list)" %}</li>
+        <li><code>acl.operators</code> - {% trans "get all associated operator level user's username to vm (list)" %}</li>
+        <li><code>acl.users</code> - {% trans "get all associated user level user's username to vm (list)" %}</li>
+        <li><code>net.ipv4</code> - {% trans "default host ip address" %}</li>
+        <li><code>net.ipv6</code> - {% trans "default host ipv6 address" %}</li>
+        <li><code>net.vlans</code> - {% trans "associated vlans: list of objects (name: vlan name, ipv4/ipv6: host ip in vlan)" %}</li>
+        <li><code>ssh.keys</code> - {% trans "owner's ssh-keys dictionary: the key is the ssh-key's name" %}</li>
+        <li><code>ci.rndstr(len: int)</code> - {% trans "function: make random string with 'len' charachters lenght" %}</li>
+        <li><code>ci.loadjson(url: str)</code> - {% trans "load json object from remote url" %}</li>
        </ul> 
        <p>{% trans "Filters: hash - sha512 hash method" %}</p>
        <p>{% trans "Use this commands, to clean cloud-init setup (for save as template example):" %}</p>

circle/dashboard/templates/dashboard/vm-detail/cloudinit.html

@@ -23,7 +23,7 @@
             id="vm-details-cidata-save" data-vm="{{ instance.pk }}"
             {% if not save_resources_enabled %}disabled{% endif %}>
             <i class="fa fa-floppy-o"></i> {% trans "Validate & Save" %}
-          </button>{% if not save_resources_enabled %} Stop your VM to change cloud-init options.{% endif %}
+          </button>{% if not save_resources_enabled %}{% trans "Stop your VM to change cloud-init options." %}{% endif %}
         </form>
       </div>
     </div>