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 02:14+0200\n"
+"POT-Creation-Date: 2020-10-11 01:36+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"
@@ -30,55 +30,23 @@ msgstr "Ungültiger Voucher"
 msgid "Expired voucher"
 msgstr "Abgelaufener Voucher"
 
-#: models/abstract_models.py:28
+#: models/abstract_models.py:32
-msgid "Name"
-msgstr "Name"
-
-#: models/abstract_models.py:35
-msgid "Latitude"
-msgstr "Breitengrad"
-
-#: models/abstract_models.py:36
 msgid "Latitude in decimal format: e. g. 41.40338"
 msgstr "Breitengrad in dezimaler Form: z. B. 51.95021"
 
-#: models/abstract_models.py:43
+#: models/abstract_models.py:39
-msgid "Longitude"
-msgstr "Längengrad"
-
-#: models/abstract_models.py:44
 msgid "Longitude in decimal format: e. g. 2.17403"
 msgstr "Breitengrad in dezimaler Form: z. B. 7.4840155"
 
-#: models/external_links.py:13
+#: models/place.py:19
-msgid "URL"
-msgstr "Adresse (URL)"
-
-#: models/external_links.py:17
-msgid "link text"
-msgstr "Linktext"
-
-#: models/place.py:21
 msgid "Location"
 msgstr "Ort"
 
-#: models/place.py:24
+#: models/place.py:20
-msgid ""
-"Description of the place: e.g. how to get there, where to be careful, the "
-"place's history..."
-msgstr ""
-"Beschreibung des Places: z. B. wie man hin kommt, wo man vorsichtig sein "
-"sollte, seine Geschichte..."
-
-#: models/place.py:25 models/place.py:84
 msgid "Description"
 msgstr "Beschreibung"
 
-#: models/place.py:90
+#: models/place.py:81
-msgid "Filename(s)"
-msgstr "Dateiname(n)"
-
-#: models/place.py:91
 msgid "Optional: One or more images to upload"
 msgstr "Optional: Ein oder mehrere Bilder zum Hochladen"
 
@@ -258,7 +226,7 @@ msgstr "Place löschen"
 
 #: templates/photo_album/photo_album_create.html:16
 msgid "Submit a photo album for"
-msgstr "Fotoalbum hinzufügen zu"
+msgstr "Fotoalbum hinzufügen für"
 
 #: templates/place/place_create.html:42
 msgid "Create"
@@ -273,8 +241,10 @@ msgid "Are you sure you want to delete"
 msgstr "Willst Du den Ort wirklich löschen: "
 
 #: templates/place/place_delete.html:19
+#, fuzzy
+#| msgid "Delete place"
 msgid "Delete"
-msgstr "Löschen"
+msgstr "Place löschen"
 
 #: templates/place/place_detail.html:46
 msgid "Map links"

django_lostplaces/lostplaces/models/abstract_models.py

@@ -23,16 +23,12 @@ class Mapable(models.Model):
     class Meta:
         abstract = True
         
-    name = models.CharField(
+    name = models.CharField(max_length=50)
-        max_length=50,
-        verbose_name=_('Name'),
-    )
     latitude = models.FloatField(
         validators=[
             MinValueValidator(-90),
             MaxValueValidator(90)
         ],
-        verbose_name=_('Latitude'),
         help_text=_('Latitude in decimal format: e. g. 41.40338')
     )
     longitude = models.FloatField(
@@ -40,7 +36,6 @@ class Mapable(models.Model):
             MinValueValidator(-180),
             MaxValueValidator(180)
         ],
-        verbose_name=_('Longitude'),
         help_text=_('Longitude in decimal format: e. g. 2.17403')
     )
 

django_lostplaces/lostplaces/models/external_links.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.models.place import PlaceAsset
 
@@ -8,14 +7,8 @@ class ExternalLink(PlaceAsset):
     class Meta:
         abstract = True
 
-    url = models.URLField(
+    url = models.URLField(max_length=200)
-        max_length=200,
+    label = models.CharField(max_length=100)
-        verbose_name=_('URL')
-    )
-    label = models.CharField(
-        max_length=100,
-        verbose_name=_('link text')
-    )
 
 class PhotoAlbum(ExternalLink):
     pass

django_lostplaces/lostplaces/models/place.py

@@ -16,14 +16,8 @@ class Place(Submittable, Taggable, Mapable):
     Place defines a lost place (location, name, description etc.).
     """
 
-    location = models.CharField(
+    location = models.CharField(max_length=50, help_text=_('Location'))
-        max_length=50,
+    description = models.TextField(help_text=_('Description'))
-        verbose_name=_('Location'),
-    )
-    description = models.TextField(
-        help_text=_('Description of the place: e.g. how to get there, where to be careful, the place\'s history...'),
-        verbose_name=_('Description'),
-    )
 
     def get_absolute_url(self):
         return reverse('place_detail', kwargs={'pk': self.pk})
@@ -79,15 +73,11 @@ class PlaceImage (Submittable):
     PlaceImage references a Place to which it belongs.
     """
 
-    description = models.TextField(
+    description = models.TextField(blank=True)
-        blank=True,
-        verbose_name=_('Description'),
-    )
     filename = ThumbnailerImageField(
         upload_to=generate_image_upload_path, 
         resize_source=dict(size=(2560, 2560), 
         sharpen=True),
-        verbose_name=_('Filename(s)'),
         help_text=_('Optional: One or more images to upload')
     )
     place = models.ForeignKey(

django_lostplaces/lostplaces/templates/photo_album/photo_album_create.html

@@ -1,5 +1,5 @@
-{% extends 'global.html'%}
 {% load i18n %}
+{% extends 'global.html'%}
 
 {% block title %}{% trans 'Submit a photo album' %}{% endblock %}
 
@@ -13,7 +13,7 @@
 {% block maincontent %}
 <form class="LP-Form" method="POST">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% trans 'Submit a photo album for' %} {{place.name}}</legend>
+        <legend class="LP-Form__Legend">{% trans 'Submit a photo album for' %}% {{place.name}}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition">
             <div class="LP-Form__Field">