Merge branch 'mandrag0ra-pu_translations'

AUTHORS

@@ -4,3 +4,7 @@ The nsupdate.info software is written and maintained by:
 - Fabian Faessler <fabi@fabif.de>
 - Thomas Waldmann <tw@waldmann-edv.de>
 
+
+Contributions:
+- mandrag0ra <mandrag0ra@icloud.com> (i18n code, french translation)
+

nsupdate/accounts/templates/accounts/user_profile.html

@@ -1,11 +1,10 @@
 {% extends "base.html" %}
-{% load i18n %}
-{% load bootstrap %}
+{% load i18n %}{% load bootstrap %}
 
 {% block content %}
 <div class="row">
     <div class="col-md-7">
-        <h2>User Profile of {{ request.user.username }}</h2>
+        <h2>{% trans "User Profile of" %} {{ request.user.username }}</h2>
         <hr />
         <form class="form-horizontal" role="form" method="post">
             {% csrf_token %}
@@ -18,14 +17,14 @@ <h2>User Profile of {{ request.user.username }}</h2>
         </form>
     </div>
     <div class="col-md-5">
-        <h3>Associate with remote Account</h3>
+        <h3>{% trans "Associate with remote Account" %}</h3>
         {% for backend in backends.not_associated %}
             <form method="get" action="{% url 'social:begin' backend %}"
                   style="display: inline-block;">
                 <button type="submit" class="btn btn-xs btn-success">{{ backend }}</button>
             </form>
         {% endfor %}
-        <h3>Deassociate from remote Account</h3>
+        <h3>{% trans "Deassociate from remote Account" %}</h3>
         {% for socauth in backends.associated %}
             <form method="post" action="{% url 'social:disconnect_individual' socauth.provider socauth.pk %}"
                   style="display: inline-block;">

nsupdate/accounts/templates/registration/activate.html

@@ -1,5 +1,5 @@
 {% extends "registration/registration_base.html" %}
-{% load i18n %}
+{% load i18n %}{% load bootstrap %}
 {% url 'auth_login' as auth_login_url %}
 {% block title %}{% if account %}{% trans "Activation complete" %}{% else %}{% trans "Activation problem" %}{% endif %}{% endblock %}
 {% block content %}

nsupdate/accounts/templates/registration/activation_complete.html

@@ -1,5 +1,5 @@
 {% extends "registration/registration_base.html" %}
-{% load i18n %}
+{% load i18n %}{% load bootstrap %}
 {% block title %}Activation complete{% endblock %}
 {% block content %}
 <h1>Thanks, activation complete!</h1>

nsupdate/accounts/templates/registration/activation_email.html

@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n %}{% load bootstrap %}
 {% comment %}
 This template is used for the html alternative of the activation email
 if you use a django-registration backend that looks for it. e.g.

nsupdate/accounts/templates/registration/registration_base.html

@@ -1,2 +1,2 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n %}{% load bootstrap %}

nsupdate/accounts/templates/registration/registration_complete.html

@@ -1,5 +1,5 @@
 {% extends "registration/registration_base.html" %}
-{% load i18n %}
+{% load i18n %}{% load bootstrap %}
 {% block title %}{% trans "Activation email sent" %}{% endblock %}
 {% block content %}
 {% blocktrans %}An activation email has been sent.

nsupdate/accounts/templates/registration/registration_form.html

@@ -1,43 +1,47 @@
 {% extends "registration/registration_base.html" %}
-{% load i18n %}
+{% load i18n %}{% load bootstrap %}
 {% load bootstrap %}
 {% block title %}{% trans "Register for an account" %}{% endblock %}
 {% block content %}
 <div class="row">
   <div class="col-md-6">
-    <h2>No registration required for testing</h2>
+    <h2>{% trans "No registration required for testing" %}</h2>
     <p>
-        You can easily test the service and see what you get.
+        {% trans "You can easily test the service and see what you get." %}
     </p>
     <p>
-        Just directly log in as:
+        {% trans "Just directly log in as:" %}
     </p>
     <ul>
-        <li>username: test</li>
-        <li>password: test</li>
+        <li>{% trans "username: test" %}</li>
+        <li>{% trans "password: test" %}</li>
     </ul>
     <p>
+        {% blocktrans %}
         <b>Note:</b> if that doesn't work, the service administrator did not set up
         the test account yet or discontinued offering it. In that case, you can
-        still just register a new account.
+        still just register a new account.{% endblocktrans %}
     </p>
-    <h2>test account is <b>only</b> for testing</h2>
+    <h2>{% blocktrans %}test account is <b>only</b> for testing{% endblocktrans %}</h2>
     <p>
+        {% blocktrans %}
         Any data (hosts, domains, ...) entered using the test account might be removed
-        at any time and without prior notice.
+        at any time and without prior notice.{% endblocktrans %}
     </p>
     <p>
+        {% blocktrans %}
         So if you'ld like your stuff to stay, please register for a regular account after
-        finishing your initial evaluation.
+        finishing your initial evaluation.{% endblocktrans %}
     </p>
   </div>
   <div class="col-md-6">
-    <h2>Register new account</h2>
+    <h2>{% trans "Register new account" %}</h2>
     <p>
+        {% blocktrans %}
         Username: should be related to your <em>person or organisation</em>
         (not: to the host(s) you want to register).<br>
         E-Mail address: must be a <em>working</em> one, we'll send you an activation E-Mail there.<br>
-        Password: please use a sane one, we trust you.
+        Password: please use a sane one, we trust you.{% endblocktrans %}
     </p>
     <form class="form-horizontal" role="form" method="post" action="">
         {% csrf_token %}