Initial DSC & Django update

docs/_build/html/_modules/core/forms/conditional_form.html

@@ -152,7 +152,7 @@
 
   <h1>Source code for core.forms.conditional_form</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django</span> <span class="k">import</span> <span class="n">forms</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">..utils</span> <span class="k">import</span> <span class="n">is_empty</span>
 

docs/_build/html/_modules/core/forms/mixins.html

@@ -155,7 +155,7 @@ <h1>Source code for core.forms.mixins</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.forms.fields</span> <span class="k">import</span> <span class="n">Field</span><span class="p">,</span> <span class="n">FileField</span>
 <span class="kn">from</span> <span class="nn">django.forms.models</span> <span class="k">import</span> <span class="n">InlineForeignKeyField</span><span class="p">,</span> <span class="n">construct_instance</span>
 <span class="kn">from</span> <span class="nn">django.forms.utils</span> <span class="k">import</span> <span class="n">ErrorDict</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext</span> <span class="k">as</span> <span class="n">_</span>
 
 
 <div class="viewcode-block" id="SoftValidationMixin"><a class="viewcode-back" href="../../../reference/core.forms.mixins.html#core.forms.mixins.SoftValidationMixin">[docs]</a><span class="k">class</span> <span class="nc">SoftValidationMixin</span><span class="p">:</span>

docs/_build/html/_modules/core/models.html

@@ -152,7 +152,7 @@
 
   <h1>Source code for core.models</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.db</span> <span class="k">import</span> <span class="n">models</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">python_2_unicode_compatible</span>
 
 <span class="n">YES</span> <span class="o">=</span> <span class="s1">&#39;Y&#39;</span>

docs/_build/html/_modules/core/utils.html

@@ -154,7 +154,7 @@ <h1>Source code for core.utils</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.conf</span> <span class="k">import</span> <span class="n">settings</span>
 <span class="kn">from</span> <span class="nn">django.contrib.auth</span> <span class="k">import</span> <span class="n">get_user_model</span>
 <span class="kn">from</span> <span class="nn">django.db.models</span> <span class="k">import</span> <span class="n">Q</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 <span class="kn">import</span> <span class="nn">django.utils.six</span> <span class="k">as</span> <span class="nn">six</span>
 
 <span class="n">YES_NO</span> <span class="o">=</span> <span class="p">[(</span><span class="kc">True</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;ja&#39;</span><span class="p">)),</span> <span class="p">(</span><span class="kc">False</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;nee&#39;</span><span class="p">))]</span>

docs/_build/html/_modules/core/validators.html

@@ -154,7 +154,7 @@ <h1>Source code for core.validators</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.core.exceptions</span> <span class="k">import</span> <span class="n">ValidationError</span>
 <span class="kn">from</span> <span class="nn">django.core.files.uploadedfile</span> <span class="k">import</span> <span class="n">UploadedFile</span>
 <span class="kn">from</span> <span class="nn">django.core.validators</span> <span class="k">import</span> <span class="n">BaseValidator</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span><span class="p">,</span> <span class="n">ungettext_lazy</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span><span class="p">,</span> <span class="n">ungettext_lazy</span>
 
 <span class="n">ALLOWED_CONTENT_TYPES</span> <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;application/pdf&#39;</span><span class="p">,</span> <span class="s1">&#39;application/msword&#39;</span><span class="p">,</span>
                          <span class="s1">&#39;application/vnd.openxmlformats-officedocument.wordprocessingml.document&#39;</span><span class="p">]</span>
@@ -173,7 +173,7 @@ <h1>Source code for core.validators</h1><div class="highlight"><pre>
 <div class="viewcode-block" id="validate_pdf_or_doc"><a class="viewcode-back" href="../../reference/core.validators.html#core.validators.validate_pdf_or_doc">[docs]</a><span class="k">def</span> <span class="nf">validate_pdf_or_doc</span><span class="p">(</span><span class="n">value</span><span class="p">):</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">value</span><span class="o">.</span><span class="n">file</span>
     <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">f</span><span class="p">,</span> <span class="n">UploadedFile</span><span class="p">)</span> <span class="ow">and</span> <span class="n">f</span><span class="o">.</span><span class="n">content_type</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">ALLOWED_CONTENT_TYPES</span><span class="p">:</span>
-        <span class="k">raise</span> <span class="n">ValidationError</span><span class="p">(</span><span class="n">ugettext_lazy</span><span class="p">(</span><span class="s1">&#39;Alleen .pdf- of .doc(x)-bestanden zijn toegestaan.&#39;</span><span class="p">))</span></div>
+        <span class="k">raise</span> <span class="n">ValidationError</span><span class="p">(</span><span class="n">gettext_lazy</span><span class="p">(</span><span class="s1">&#39;Alleen .pdf- of .doc(x)-bestanden zijn toegestaan.&#39;</span><span class="p">))</span></div>
 </pre></div>
 
            </div>

docs/_build/html/_modules/django/contrib/auth/models.html

@@ -164,7 +164,7 @@ <h1>Source code for django.contrib.auth.models</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils</span> <span class="k">import</span> <span class="n">six</span><span class="p">,</span> <span class="n">timezone</span>
 <span class="kn">from</span> <span class="nn">django.utils.deprecation</span> <span class="k">import</span> <span class="n">CallableFalse</span><span class="p">,</span> <span class="n">CallableTrue</span>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">python_2_unicode_compatible</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">.validators</span> <span class="k">import</span> <span class="n">ASCIIUsernameValidator</span><span class="p">,</span> <span class="n">UnicodeUsernameValidator</span>
 

docs/_build/html/_modules/django/db/models/fields/files.html

@@ -166,7 +166,7 @@ <h1>Source code for django.db.models.fields.files</h1><div class="highlight"><pr
 <span class="kn">from</span> <span class="nn">django.utils</span> <span class="k">import</span> <span class="n">six</span>
 <span class="kn">from</span> <span class="nn">django.utils.deprecation</span> <span class="k">import</span> <span class="n">RemovedInDjango20Warning</span>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">force_str</span><span class="p">,</span> <span class="n">force_text</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 
 <span class="k">class</span> <span class="nc">FieldFile</span><span class="p">(</span><span class="n">File</span><span class="p">):</span>

docs/_build/html/_modules/faqs/models.html

@@ -152,7 +152,7 @@
 
   <h1>Source code for faqs.models</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.db</span> <span class="k">import</span> <span class="n">models</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">python_2_unicode_compatible</span>
 
 <div class="viewcode-block" id="Faq"><a class="viewcode-back" href="../../reference/faqs.models.html#faqs.models.Faq">[docs]</a><span class="nd">@python_2_unicode_compatible</span>

docs/_build/html/_modules/feedback/models.html

@@ -153,7 +153,7 @@
   <h1>Source code for feedback.models</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.db</span> <span class="k">import</span> <span class="n">models</span>
 <span class="kn">from</span> <span class="nn">django.conf</span> <span class="k">import</span> <span class="n">settings</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="n">STATUS_CODES</span> <span class="o">=</span> <span class="p">(</span>
     <span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Open&#39;</span><span class="p">)),</span>

docs/_build/html/_modules/feedback/views.html

@@ -153,7 +153,7 @@
   <h1>Source code for feedback.views</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.contrib.messages.views</span> <span class="k">import</span> <span class="n">SuccessMessageMixin</span>
 <span class="kn">from</span> <span class="nn">django.urls</span> <span class="k">import</span> <span class="n">reverse</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 <span class="kn">from</span> <span class="nn">django.views</span> <span class="k">import</span> <span class="n">generic</span>
 
 <span class="kn">from</span> <span class="nn">braces.views</span> <span class="k">import</span> <span class="n">LoginRequiredMixin</span>

docs/_build/html/_modules/interventions/models.html

@@ -153,7 +153,7 @@
   <h1>Source code for interventions.models</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">__future__</span> <span class="k">import</span> <span class="n">unicode_literals</span>
 <span class="kn">from</span> <span class="nn">django.db</span> <span class="k">import</span> <span class="n">models</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">SettingModel</span>
 <span class="kn">from</span> <span class="nn">studies.models</span> <span class="k">import</span> <span class="n">Study</span>

docs/_build/html/_modules/interventions/utils.html

@@ -152,7 +152,7 @@
 
   <h1>Source code for interventions.utils</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.urls</span> <span class="k">import</span> <span class="n">reverse</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.utils</span> <span class="k">import</span> <span class="n">AvailableURL</span>
 

docs/_build/html/_modules/interventions/views.html

@@ -152,7 +152,7 @@
 
   <h1>Source code for interventions.views</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.urls</span> <span class="k">import</span> <span class="n">reverse</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.views</span> <span class="k">import</span> <span class="n">CreateView</span><span class="p">,</span> <span class="n">UpdateView</span><span class="p">,</span> <span class="n">AllowErrorsOnBackbuttonMixin</span>
 <span class="kn">from</span> <span class="nn">studies.models</span> <span class="k">import</span> <span class="n">Study</span>

docs/_build/html/_modules/observations/models.html

@@ -156,7 +156,7 @@ <h1>Source code for observations.models</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.core.validators</span> <span class="k">import</span> <span class="n">MaxValueValidator</span>
 <span class="kn">from</span> <span class="nn">django.db</span> <span class="k">import</span> <span class="n">models</span>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">python_2_unicode_compatible</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">SettingModel</span>
 <span class="kn">from</span> <span class="nn">core.validators</span> <span class="k">import</span> <span class="n">validate_pdf_or_doc</span>

docs/_build/html/_modules/observations/utils.html

@@ -152,7 +152,7 @@
 
   <h1>Source code for observations.utils</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.urls</span> <span class="k">import</span> <span class="n">reverse</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.utils</span> <span class="k">import</span> <span class="n">AvailableURL</span>
 

docs/_build/html/_modules/observations/views.html

@@ -152,7 +152,7 @@
 
   <h1>Source code for observations.views</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span> <span class="nn">django.urls</span> <span class="k">import</span> <span class="n">reverse</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.views</span> <span class="k">import</span> <span class="n">CreateView</span><span class="p">,</span> <span class="n">UpdateView</span><span class="p">,</span> <span class="n">AllowErrorsOnBackbuttonMixin</span>
 <span class="kn">from</span> <span class="nn">fetc</span> <span class="k">import</span> <span class="n">settings</span>

docs/_build/html/_modules/proposals/forms.html

@@ -158,7 +158,7 @@ <h1>Source code for proposals.forms</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.contrib.auth</span> <span class="k">import</span> <span class="n">get_user_model</span>
 <span class="kn">from</span> <span class="nn">django.db.models</span> <span class="k">import</span> <span class="n">Q</span>
 <span class="kn">from</span> <span class="nn">django.utils.safestring</span> <span class="k">import</span> <span class="n">mark_safe</span>
-<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
+<span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">gettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.forms</span> <span class="k">import</span> <span class="n">ConditionalModelForm</span><span class="p">,</span> <span class="n">SoftValidationMixin</span>
 <span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">NO</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YES_NO_DOUBT</span>