validators deactivated, some translations.

locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,67 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-12-21 12:57+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: project_base/templates/newsletter/message/subscribe.html:10
+#: project_base/templates/newsletter/message/subscribe.txt:1
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"you, or someone in your name requested a subscription to %(title)s.\n"
+"\n"
+"If you would like to confirm your subscription, please follow this "
+"activation link:\n"
+"http://%(domain)s%(url)s\n"
+"\n"
+"Kind regards,"
+msgstr ""
+"Hallo %(name)s,\n"
+"\n"
+"Du wurdest beim Suchagenten / Newsletter von %(title)s "
+"angemeldet."
+"\n"
+"Wenn du die Anmeldung bestätigen möchten klicken Sie bitte auf folgenden "
+"Link:\n"
+"https://%(domain)s%(url)s\n"
+"\n"
+"Wir wünschen dir, dass du fündig wirst!"
+"\n"
+"Liebe Grüße,"
+"\n"
+"das Team vom gemeinschaffen.com"
+
+### ********************** /\ *****************************
+### ********************** /\ *****************************
+### ********************** /\ *****************************
+
+
+#: project_base/templates/newsletter/subscription_subscribe.html:5
+#: project_base/templates/newsletter/subscription_subscribe.html:8
+#: project_base/templates/newsletter/subscription_subscribe_email_sent.html:5
+#: project_base/templates/newsletter/subscription_subscribe_email_sent.html:8
+#: project_base/templates/newsletter/subscription_subscribe_user.html:5
+#: project_base/templates/newsletter/subscription_subscribe_user.html:8
+msgid "Newsletter subscribe"
+msgstr "Suchagent- und Newsletteranmeldung"
+
+
+### ********************** /\ *****************************
+### ********************** /\ *****************************
+### ********************** /\ *****************************

makemessages.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+source ./venv/bin/activate
+python ./manage.py makemessages -l 'de' --ignore="site-packages" --extension=html,txt,py,js
+echo "***"
+echo use "source venv/bin/activate && ./manage.py compilemessages -l de" to finish tranlation

marktplatz/forms.py

@@ -74,7 +74,7 @@ class searchAgentForm(forms.ModelForm):
 
     agent_layout = Layout(
         Fieldset(
-            ('Suchagent'),
+            ('Suchagent einrichten'),
             # 'ort',
            Div(
                Div('ort',  css_class='col-sm-6 col-6 checkbox-ort'),
@@ -99,7 +99,7 @@ class searchAgentForm(forms.ModelForm):
 
 class AgentNewslwtterForm( searchAgentForm, GeneralFields):
 
-    email_field = forms.EmailField( label = 'Email', required=True, max_length=254 )
+    email_field = forms.EmailField( label = 'Email', help_text="Du kannst den Suchagenten und den Newsletter jederzeit abbestellen - über einen Link in den Mails.", required=True, max_length=254 )
     subscribe = forms.BooleanField( label = 'Newsletter abonnieren', help_text='', required = False )
     captcha = CaptchaField( label = 'Bitte lösen Sie die Gleichung', generator='captcha.helpers.math_challenge' )
 
@@ -116,7 +116,7 @@ class AgentNewslwtterForm( searchAgentForm, GeneralFields):
            'terms',
            'captcha',
            ButtonHolder(
-               Submit('submit', 'Anmelden', css_class='border-thin border-dark mybtn')
+               Submit('submit', 'Suchagent aktivieren', css_class='border-thin border-dark mybtn')
            ),
        )
 

marktplatz/templates/marktplatz/form.html

@@ -32,7 +32,7 @@
 
       {% csrf_token %}
       <br><br>
-    <button type="submit" class="btn  border-thin mybtn" >Register</button>  </form>
+    <button type="submit" class="btn  border-thin mybtn" >Registrieren</button>  </form>
 
 
 

marktplatz/templates/marktplatz/product_overview.html

@@ -277,8 +277,8 @@ $(document).ready(function(){
   </button>
 
   <div class="row border-dark collapse navbar-collapse tag-line" id="tags">
-
     <div class="container-fluid">
+      <p>Filtere die Projekte, indem du auf einen der folgenden Tags klickst:</p>
       <button  class="show-all border-thin mybtn " style="margin-bottom: 2px; ">#Alle anzeigen</button>
 
       {% for elem in frei_list %}

marktplatz/urls.py

@@ -20,9 +20,9 @@ urlpatterns = [
     path('agent_newsletter/<slug:newsletter_slug>/anmelden/', views.AgentNewslwtterSubscribeView.as_view(   ), name='agent-newsletter-create'),
     # path('suchagent/embed', views.SearchAgentCreate.as_view( embed=True, ), name='search-agent-create-embed'),
     path('suchagent/<int:pk>/<slug:hash>/', views.SearchAgentDelete.as_view(), name='search-agent-delete'),
-    path('product/<int:pk>/', views.DetailView.as_view(), name='product-detail'),
-    path('product/delete/<int:pk>/', views.ProductDelete.as_view(), name='product-delete'),
-    path('product/<int:pk>/embed', views.DetailView.as_view( embed=True, ), name='product-detail-embed'),
+    path('projekt/<int:pk>/', views.DetailView.as_view(), name='product-detail'),
+    path('projekt/delete/<int:pk>/', views.ProductDelete.as_view(), name='product-delete'),
+    path('projekt/<int:pk>/embed', views.DetailView.as_view( embed=True, ), name='product-detail-embed'),
     path('product-card/<int:pk>', views.CardDetailView.as_view(), name='product-detail-card'),
     path('product-card/<int:pk>/embed', views.CardDetailView.as_view( embed=True, ), name='product-detail-card-embed'),
     path('admin_panel/', views.AdminView.as_view(), name='admin-panel'),

marktplatz/views.py

@@ -568,6 +568,7 @@ class registerView(FormView):
     def get(self, request):
         # form = self.form_class()
         context = request.GET.dict()
+        context['form_content'] = '<p>Willkommen! Wir freuen uns, dass du bei uns mitmachen willst!</p> <p>Nach der Registrierung kannst du euer Projekt eintragen.</p> <p><br />Evtl. m&ouml;chtest du Kollegen die M&ouml;glichkeit geben auch zum Projekteintrag beizutragen. Wir haben nichts dagegen, dass du deine Logindaten mit Anderen aus deiner Projektgemeinschaft teilst. Dann k&ouml;nnen sie dir beim Eintragen helfen. Man kann Projekteintr&auml;ge &uuml;brigens auch zwischenspeichern, sodass ihr zeitversetzt daran arbeiten k&ouml;nnt. Wenn mehrere diesen Account teilen w&auml;hle dein Passwort mit Bedacht!</p>'
         context['form'] = RegisterForm
         context['signUp'] = SignUpForm
 

project_base/settings.py

@@ -392,18 +392,21 @@ DATABASES = {
 # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
+    # {
+    #     'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    # },
     {
         'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        'OPTIONS': {
+            'min_length': 16,
+        }
     },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
+    # {
+    #     'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    # },
+    # {
+    #     'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    # },
 ]
 
 
@@ -422,6 +425,24 @@ LANGUAGE_CODE = 'de'
 # system time zone.
 TIME_ZONE = "Europe/Vienna"
 
+LANGUAGES = (
+    # ('en', _('English') ),
+    ('de', _('German') ),
+)
+
+
+DATE_INPUT_FORMATS = [
+    '%d.%m.%Y', '%d/%m/%Y', '%d-%m-%Y', # '2006-10-25', '10/25/2006', '10/25/06'
+    #'%d %b %Y', '%d %b, %Y',            # '25 Oct 2006', '25 Oct, 2006'
+    #'%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006'
+]
+
+DATE_FORMAT = '%d.%m.%Y'
+
+# Tell Django where the project's translation files should be.
+LOCALE_PATHS = (
+    os.path.join(PROJECT_ROOT, "locale"),
+)
 
 
 USE_I18N = True