Merge branch 'feature/localization' into develop

django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-11 07:48+0200\n"
+"POT-Creation-Date: 2020-10-11 21:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Commander1024 <commander@commander1024.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,6 +50,22 @@ msgstr "Längengrad"
 msgid "Longitude in decimal format: e. g. 2.17403"
 msgstr "Breitengrad in dezimaler Form: z. B. 7.4840155"
 
+#: models/abstract_models.py:59
+msgid "Submission date"
+msgstr "Einreichungsdatum"
+
+#: models/abstract_models.py:67
+msgid "Submitter"
+msgstr "Einreicher"
+
+#: models/abstract_models.py:79
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+#: models/abstract_models.py:82
+msgid "Expiration date"
+msgstr "Ablaufdatum"
+
 #: models/external_links.py:13
 msgid "URL"
 msgstr "Adresse (URL)"
@@ -96,7 +112,7 @@ msgstr "Zurück"
 
 #: templates/global.html:32
 msgid "Logout"
-msgstr "Abmelden"
+msgstr "Ausloggen"
 
 #: templates/global.html:34
 msgid "Admin"
@@ -108,8 +124,8 @@ msgid "Login"
 msgstr "Anmelden"
 
 #: templates/global.html:40 templates/registration/login.html:29
-#: templates/signup.html:12 templates/signup.html:41
+#: templates/signup.html:6 templates/signup.html:12 templates/signup.html:41
-msgid "Sign Up"
+msgid "Sign up"
 msgstr "Registrieren"
 
 #: templates/global.html:50 templates/home.html:10
@@ -122,11 +138,11 @@ msgstr "UrBex Codex"
 
 #: templates/global.html:56 templates/place/place_create.html:5
 #: templates/place/place_create.html:10
-msgid "Create Place"
+msgid "Create place"
 msgstr "Place erstellen"
 
 #: templates/global.html:57
-msgid "All Places"
+msgid "All places"
 msgstr "Alle Places"
 
 #: templates/home.html:20 templates/home_unauth.html:20
@@ -247,7 +263,8 @@ msgid "Submit a photo album"
 msgstr "Fotoalbum hinzufügen"
 
 #: templates/photo_album/photo_album_create.html:8
-#: templates/place/place_detail.html:18
+#: templates/place/place_detail.html:18 templates/place/place_update.html:5
+#: templates/place/place_update.html:10
 msgid "Edit place"
 msgstr "Place bearbeiten"
 
@@ -265,12 +282,13 @@ msgid "Create"
 msgstr "Erstellen"
 
 #: templates/place/place_delete.html:5
-msgid "Lost Place Deletion"
+msgid "Delete lost place"
 msgstr "Lost Place löschen"
 
 #: templates/place/place_delete.html:15
-msgid "Are you sure you want to delete"
+#, python-format
-msgstr "Willst Du den Ort wirklich löschen: "
+msgid "Are you sure you want to delete %(place_name)s?"
+msgstr "Bist Du sicher, dass Du %(place_name)s löschen möchtest?"
 
 #: templates/place/place_delete.html:19
 msgid "Delete"
@@ -293,17 +311,13 @@ msgid "Images"
 msgstr "Bilder"
 
 #: templates/place/place_list.html:10
-msgid "Lost Places"
+msgid "All Places"
 msgstr "Alle Places"
 
 #: templates/place/place_list.html:16
-msgid "Listing our places"
+msgid "Our lost places"
 msgstr "Unsere Lost Places"
 
-#: templates/place/place_update.html:5 templates/place/place_update.html:10
-msgid "Update place"
-msgstr "Place bearbeiten"
-
 #: templates/place/place_update.html:42
 msgid "Update"
 msgstr "Aktualisieren"
@@ -313,13 +327,9 @@ msgid "Submit images to a place"
 msgstr "Bilder zu einem Place hinzufügen"
 
 #: templates/registration/login.html:29
-msgid "Have No Account Yet?"
+msgid "No account, yet?"
 msgstr "Noch kein Konto?"
 
-#: templates/signup.html:6
-msgid "Sign up"
-msgstr "Registrieren"
-
 #: views/base_views.py:25
 msgid "Please login to proceed"
 msgstr "Bitte log Dich ein um fortzufahren"
@@ -329,49 +339,49 @@ msgid "Image(s) submitted successfully"
 msgstr "Bild(er) erfolgreich hinzugefügt"
 
 #: views/place_image_views.py:41
-msgid "Image(s) deleted successfully"
+msgid "Image deleted successfully"
-msgstr "Bild(er) erfolgreich gelöscht"
+msgstr "Bild erfolgreich gelöscht"
 
 #: views/place_image_views.py:42
 msgid "You are not allowed to delete this image"
 msgstr "Du darfst dieses Bild nicht löschen"
 
 #: views/place_views.py:62
-#, fuzzy
-#| msgid "Successfully deleted place"
 msgid "Successfully updated place"
-msgstr "Place erfolgreich gelöscht"
+msgstr "Place erfolgreich aktualisiert"
 
 #: views/place_views.py:63
-msgid "You do no have permissions to alter this place"
+msgid "You are not allowed to edit this place"
-msgstr "Du hast nicht die Berechtigung, diesen Place zu bearbeiten"
+msgstr "Du darfst diesen Place nicht bearbeiten"
 
 #: views/place_views.py:97
-#, fuzzy
-#| msgid "Successfully deleted place"
 msgid "Successfully created place"
-msgstr "Place erfolgreich gelöscht"
+msgstr "Place erfolgreich erstellt"
+
+#: views/place_views.py:105
+msgid "Please fill in all required fields."
+msgstr "Bitte füll alle benötigten Felder aus."
 
 #: views/place_views.py:112
 msgid "Successfully deleted place"
 msgstr "Place erfolgreich gelöscht"
 
 #: views/place_views.py:114
-msgid "You do no have permission to delete this place"
+msgid "You are not allowed to delete this place"
-msgstr "Du hast nicht die Berechtigung, diesen Place zu löschen"
+msgstr "Du darfst diesen Place nicht löschen"
 
 #: views/views.py:29
 msgid "User created"
-msgstr "User erstellt"
+msgstr "Benutzer erstellt"
 
 #: views/views.py:54
-msgid "Photo Album submitted"
+msgid "Photo album link submitted"
-msgstr "Fotoalbum hinzugefügt"
+msgstr "Fotoalbum-Link hinzugefügt"
 
 #: views/views.py:59
-msgid "Photo Album deleted"
+msgid "Photo album link deleted"
-msgstr "Fotoalbum gelöscht"
+msgstr "Fotoalbum-Link gelöscht"
 
 #: views/views.py:60
-msgid "You do not have permissions to alter this photo album"
+msgid "You are not allowed to edit this photo album link"
-msgstr "Du hast nicht die Berechtigung, diesen Place zu bearbeiten"
+msgstr "Du darfst diesen Fotoalbum-Link nicht bearbeiten"

django_lostplaces/lostplaces/models/abstract_models.py

@@ -53,13 +53,18 @@ class Submittable(models.Model):
     class Meta:
         abstract = True
 
-    submitted_when = models.DateTimeField(auto_now_add=True, null=True)
+    submitted_when = models.DateTimeField(
+        auto_now_add=True,
+        null=True,
+        verbose_name=_('Submission date')
+    )
     submitted_by = models.ForeignKey(
         'Explorer',
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
-        related_name='%(class)ss'
+        related_name='%(class)ss',
+        verbose_name=_('Submitter')
     )
 
 class Expireable(models.Model):
@@ -69,8 +74,13 @@ class Expireable(models.Model):
     class Meta:
 	    abstract = True
         
-    created_when = models.DateTimeField(auto_now_add=True)
+    created_when = models.DateTimeField(
-    expires_when = models.DateTimeField()
+        auto_now_add=True,
+        verbose_name=_('Creation date')
+    )
+    expires_when = models.DateTimeField(
+        verbose_name=_('Expiration date')
+    )
     
     @property
     def is_expired(self):

django_lostplaces/lostplaces/models/place.py

@@ -138,4 +138,4 @@ def auto_delete_file_on_change(sender, instance, **kwargs):
     new_file = instance.filename
     if not old_file == new_file:
         if os.path.isfile(old_file.path):
-            os.remove(old_file.path)
+            os.remove(old_file.path)

django_lostplaces/lostplaces/templates/global.html

@@ -37,7 +37,7 @@
                     {% else %}
                     You are not logged in.
                     <a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">{% trans 'Login' %}</span></a> |
-                    <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign Up' %}</span></a>
+                    <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign up' %}</span></a>
                     {% endif %}
                 </span>
             </div>
@@ -53,8 +53,8 @@
                     {% block additional_menu_items %}
                     {% endblock additional_menu_items %}
 
-                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Create Place' %}</span></a></li>
+                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Create place' %}</span></a></li>
-                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'All Places' %}</span></a></li>
+                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'All places' %}</span></a></li>
                 </ul>
             </nav>
         </aside>

django_lostplaces/lostplaces/templates/place/place_create.html

@@ -2,12 +2,12 @@
 {% load static %}
 {% load i18n %}
 
-# {% block title %}{% trans 'Create Place' %}{% endblock %}
+# {% block title %}{% trans 'Create place' %}{% endblock %}
 
 {% block maincontent %}
 <form class="LP-Form" method="POST" enctype="multipart/form-data">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% trans 'Create Place' %}</legend>
+        <legend class="LP-Form__Legend">{% trans 'Create place' %}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition LP-Form__Composition--breakable">
             <div class="LP-Form__Field">

django_lostplaces/lostplaces/templates/place/place_delete.html

@@ -2,7 +2,7 @@
 {% load static %}
 {% load i18n %}
 
-{% block title %}{% trans 'Lost Place Deletion' %}{% endblock %}
+{% block title %}{% trans 'Delete lost place' %}{% endblock %}
 
 {% block maincontent %}
 
@@ -12,7 +12,7 @@
         {% csrf_token %}
         <div class="LP-Form__Composition">
             <div class="LP-Form__Field LP-Form__InfoText">
-                <p class="LP-Paragraph">{% trans 'Are you sure you want to delete' %} "{{place.name}}"?</p>
+                <p class="LP-Paragraph">{% blocktrans with place_name=place.name%}Are you sure you want to delete {{place_name}}?{% endblocktrans %}</p>
             </div>
         </div>
         

django_lostplaces/lostplaces/templates/place/place_list.html

@@ -7,13 +7,13 @@
 <script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}
 
-{% block title %}{% trans 'Lost Places' %}{% endblock %}
+{% block title %}{% trans 'All Places' %}{% endblock %}
 
 {% block maincontent %}
 
 {% include 'partials/osm_map.html' with config=mapping_config %}
 <div class="LP-PlaceList">
-    <h1 class="LP-Headline">{% trans 'Listing our places' %}</h1>
+    <h1 class="LP-Headline">{% trans 'Our lost places' %}</h1>
     <ul class="LP-PlaceList__List">
         {% for place in place_list %}
         <li class="LP-PlaceList__Item">

django_lostplaces/lostplaces/templates/place/place_update.html

@@ -2,12 +2,12 @@
 {% load static %}
 {% load i18n %}
 
-# {% block title %}{% trans 'Update place' %}{% endblock %}
+# {% block title %}{% trans 'Edit place' %}{% endblock %}
 
 {% block maincontent %}
 <form class="LP-Form" method="POST" enctype="multipart/form-data">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% trans 'Update place' %}</legend>
+        <legend class="LP-Form__Legend">{% trans 'Edit place' %}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition LP-Form__Composition--breakable">
             <div class="LP-Form__Field">

django_lostplaces/lostplaces/templates/registration/login.html

@@ -26,6 +26,6 @@
     </fieldset>
 </form>
 
-<p class="LP-Headline">{% trans 'Have No Account Yet?' %} <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign Up' %}</span></a></p>
+<p class="LP-Headline">{% trans 'No account, yet?' %} <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign up' %}</span></a></p>
 
 {% endblock maincontent %}

django_lostplaces/lostplaces/templates/signup.html

@@ -9,7 +9,7 @@
 
 <form class="LP-Form" method="POST">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% trans 'Sign Up' %}</legend>
+        <legend class="LP-Form__Legend">{% trans 'Sign up' %}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition LP-Form__Composition--breakable">
             <div class="LP-Form__Field">
@@ -38,7 +38,7 @@
 
         <div class="LP-Form__Composition LP-Form__Composition--buttons">
             <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <button class="LP-Button">{% trans 'Sign Up' %}</button>
+                <button class="LP-Button">{% trans 'Sign up' %}</button>
             </div>
         </div>
     </fieldset>

django_lostplaces/lostplaces/views/place_image_views.py

@@ -38,5 +38,5 @@ class PlaceImageCreateView(MultiplePlaceImageUploadMixin, PlaceAssetCreateView):
         
 class PlaceImageDeleteView(PlaceAssetDeleteView):
     model = PlaceImage
-    success_message = _('Image(s) deleted successfully')
+    success_message = _('Image deleted successfully')
     permission_denied_message = _('You are not allowed to delete this image')

django_lostplaces/lostplaces/views/place_views.py

@@ -60,7 +60,7 @@ class PlaceUpdateView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, SuccessMessag
     model = Place
     form_class = PlaceForm
     success_message = _('Successfully updated place')
-    place_submitter_error_message = _('You do no have permissions to alter this place')
+    place_submitter_error_message = _('You are not allowed to edit this place')
 
     def get_success_url(self):
         return reverse_lazy('place_detail', kwargs={'pk':self.get_object().pk})
@@ -102,7 +102,7 @@ class PlaceCreateView(MultiplePlaceImageUploadMixin, IsAuthenticatedMixin, View)
             # Usually the browser should have checked the form before sending.
             messages.error(
                 self.request,
-                'Please fill in all required fields.'
+                _('Please fill in all required fields.')
             )
             return render(request, 'place/place_create.html', context={'form': place_form})
 
@@ -111,7 +111,7 @@ class PlaceDeleteView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, DeleteView):
     model = Place
     success_message = _('Successfully deleted place')
     success_url = reverse_lazy('place_list')
-    place_submitter_error_message = _('You do no have permission to delete this place')
+    place_submitter_error_message = _('You are not allowed to delete this place')
 
     def delete(self, request, *args, **kwargs):
         messages.success(self.request, self.success_message)

django_lostplaces/lostplaces/views/views.py

@@ -51,13 +51,13 @@ class PhotoAlbumCreateView(PlaceAssetCreateView):
     model = PhotoAlbum
     fields = ['url', 'label']
     template_name = 'photo_album/photo_album_create.html'
-    success_message = _('Photo Album submitted')
+    success_message = _('Photo album link submitted')
 
 class PhotoAlbumDeleteView(PlaceAssetDeleteView):
     model = PhotoAlbum
     pk_url_kwarg = 'pk'
-    success_message = _('Photo Album deleted')
+    success_message = _('Photo album link deleted')
-    permission_denied_messsage = _('You do not have permissions to alter this photo album')
+    permission_denied_messsage = _('You are not allowed to edit this photo album link')
 
 class PlaceTagSubmitView(IsAuthenticatedMixin, View):
 	def post(self, request, tagged_id, *args, **kwargs):