Compare commits

..

No commits in common. "01f7dad37c3e1d9164c5518b3d59695d006afc39" and "15f6a30cd6eaaad23817a3d900c52384c0c8af65" have entirely different histories.

4 changed files with 10 additions and 36 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-11 21:53+0200\n" "POT-Creation-Date: 2020-10-11 21:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Commander1024 <commander@commander1024.de>\n" "Last-Translator: Commander1024 <commander@commander1024.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -50,22 +50,6 @@ msgstr "Längengrad"
msgid "Longitude in decimal format: e. g. 2.17403" msgid "Longitude in decimal format: e. g. 2.17403"
msgstr "Breitengrad in dezimaler Form: z. B. 7.4840155" 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 #: models/external_links.py:13
msgid "URL" msgid "URL"
msgstr "Adresse (URL)" msgstr "Adresse (URL)"
@ -287,8 +271,8 @@ msgstr "Lost Place löschen"
#: templates/place/place_delete.html:15 #: templates/place/place_delete.html:15
#, python-format #, python-format
msgid "Are you sure you want to delete %(place_name)s?" msgid "Are you sure you want to delete \"%(place.name)s\"?"
msgstr "Bist Du sicher, dass Du %(place_name)s löschen möchtest?" msgstr ""
#: templates/place/place_delete.html:19 #: templates/place/place_delete.html:19
msgid "Delete" msgid "Delete"
@ -360,7 +344,7 @@ msgstr "Place erfolgreich erstellt"
#: views/place_views.py:105 #: views/place_views.py:105
msgid "Please fill in all required fields." msgid "Please fill in all required fields."
msgstr "Bitte füll alle benötigten Felder aus." msgstr ""
#: views/place_views.py:112 #: views/place_views.py:112
msgid "Successfully deleted place" msgid "Successfully deleted place"

View File

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

View File

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

View File

@ -12,7 +12,7 @@
{% csrf_token %} {% csrf_token %}
<div class="LP-Form__Composition"> <div class="LP-Form__Composition">
<div class="LP-Form__Field LP-Form__InfoText"> <div class="LP-Form__Field LP-Form__InfoText">
<p class="LP-Paragraph">{% blocktrans with place_name=place.name%}Are you sure you want to delete {{place_name}}?{% endblocktrans %}</p> <p class="LP-Paragraph">{% blocktrans %}Are you sure you want to delete "{{place.name}}"?{% endblocktrans %}</p>
</div> </div>
</div> </div>