diff --git a/django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po b/django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po index b575421..e0bc7c9 100644 --- a/django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 -msgid "Sign Up" +#: templates/signup.html:6 templates/signup.html:12 templates/signup.html:41 +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" -msgstr "Willst Du den Ort wirklich löschen: " +#, python-format +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" -msgstr "Bild(er) erfolgreich gelöscht" +msgid "Image deleted successfully" +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" -msgstr "Du hast nicht die Berechtigung, diesen Place zu bearbeiten" +msgid "You are not allowed to edit this place" +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" -msgstr "Du hast nicht die Berechtigung, diesen Place zu löschen" +msgid "You are not allowed to delete this place" +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" -msgstr "Fotoalbum hinzugefügt" +msgid "Photo album link submitted" +msgstr "Fotoalbum-Link hinzugefügt" #: views/views.py:59 -msgid "Photo Album deleted" -msgstr "Fotoalbum gelöscht" +msgid "Photo album link deleted" +msgstr "Fotoalbum-Link gelöscht" #: views/views.py:60 -msgid "You do not have permissions to alter this photo album" -msgstr "Du hast nicht die Berechtigung, diesen Place zu bearbeiten" +msgid "You are not allowed to edit this photo album link" +msgstr "Du darfst diesen Fotoalbum-Link nicht bearbeiten" diff --git a/django_lostplaces/lostplaces/models/abstract_models.py b/django_lostplaces/lostplaces/models/abstract_models.py index ee7f5ce..28429ca 100644 --- a/django_lostplaces/lostplaces/models/abstract_models.py +++ b/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) - expires_when = models.DateTimeField() + created_when = models.DateTimeField( + auto_now_add=True, + verbose_name=_('Creation date') + ) + expires_when = models.DateTimeField( + verbose_name=_('Expiration date') + ) @property def is_expired(self): diff --git a/django_lostplaces/lostplaces/models/place.py b/django_lostplaces/lostplaces/models/place.py index db451a2..e90c375 100644 --- a/django_lostplaces/lostplaces/models/place.py +++ b/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) \ No newline at end of file + os.remove(old_file.path) diff --git a/django_lostplaces/lostplaces/templates/global.html b/django_lostplaces/lostplaces/templates/global.html index 32d751f..4ebf0ed 100644 --- a/django_lostplaces/lostplaces/templates/global.html +++ b/django_lostplaces/lostplaces/templates/global.html @@ -37,7 +37,7 @@ {% else %} You are not logged in. {% trans 'Login' %} | - {% trans 'Sign Up' %} + {% trans 'Sign up' %} {% endif %} @@ -53,8 +53,8 @@ {% block additional_menu_items %} {% endblock additional_menu_items %} -
  • {% trans 'Create Place' %}
    • -
  • {% trans 'All Places' %}
    • +
  • {% trans 'Create place' %}
    • +
  • {% trans 'All places' %}
    • diff --git a/django_lostplaces/lostplaces/templates/place/place_create.html b/django_lostplaces/lostplaces/templates/place/place_create.html index b4061ea..b9a9e18 100644 --- a/django_lostplaces/lostplaces/templates/place/place_create.html +++ b/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 %}
    - {% trans 'Create Place' %} + {% trans 'Create place' %} {% csrf_token %}
    diff --git a/django_lostplaces/lostplaces/templates/place/place_delete.html b/django_lostplaces/lostplaces/templates/place/place_delete.html index 7b79451..0517288 100644 --- a/django_lostplaces/lostplaces/templates/place/place_delete.html +++ b/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 %}
    -

    {% trans 'Are you sure you want to delete' %} "{{place.name}}"?

    +

    {% blocktrans with place_name=place.name%}Are you sure you want to delete {{place_name}}?{% endblocktrans %}

    diff --git a/django_lostplaces/lostplaces/templates/place/place_list.html b/django_lostplaces/lostplaces/templates/place/place_list.html index 6e4ae1e..b5ca2a2 100644 --- a/django_lostplaces/lostplaces/templates/place/place_list.html +++ b/django_lostplaces/lostplaces/templates/place/place_list.html @@ -7,13 +7,13 @@ {% 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 %}
    -

    {% trans 'Listing our places' %}

    +

    {% trans 'Our lost places' %}

      {% for place in place_list %}
    • diff --git a/django_lostplaces/lostplaces/templates/place/place_update.html b/django_lostplaces/lostplaces/templates/place/place_update.html index f061a0e..5a508a9 100644 --- a/django_lostplaces/lostplaces/templates/place/place_update.html +++ b/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 %}
      - {% trans 'Update place' %} + {% trans 'Edit place' %} {% csrf_token %}
      diff --git a/django_lostplaces/lostplaces/templates/registration/login.html b/django_lostplaces/lostplaces/templates/registration/login.html index 9ee497b..a9a0a66 100644 --- a/django_lostplaces/lostplaces/templates/registration/login.html +++ b/django_lostplaces/lostplaces/templates/registration/login.html @@ -26,6 +26,6 @@
      • -

      {% trans 'Have No Account Yet?' %} {% trans 'Sign Up' %}

      +

      {% trans 'No account, yet?' %} {% trans 'Sign up' %}

      {% endblock maincontent %} \ No newline at end of file diff --git a/django_lostplaces/lostplaces/templates/signup.html b/django_lostplaces/lostplaces/templates/signup.html index 62c84ac..c3a3949 100644 --- a/django_lostplaces/lostplaces/templates/signup.html +++ b/django_lostplaces/lostplaces/templates/signup.html @@ -9,7 +9,7 @@
      - {% trans 'Sign Up' %} + {% trans 'Sign up' %} {% csrf_token %}
      @@ -38,7 +38,7 @@
      - +
      diff --git a/django_lostplaces/lostplaces/views/place_image_views.py b/django_lostplaces/lostplaces/views/place_image_views.py index 79f6266..dc04c37 100644 --- a/django_lostplaces/lostplaces/views/place_image_views.py +++ b/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') diff --git a/django_lostplaces/lostplaces/views/place_views.py b/django_lostplaces/lostplaces/views/place_views.py index 7a5c129..137f706 100644 --- a/django_lostplaces/lostplaces/views/place_views.py +++ b/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) diff --git a/django_lostplaces/lostplaces/views/views.py b/django_lostplaces/lostplaces/views/views.py index 7a92abe..03982ad 100644 --- a/django_lostplaces/lostplaces/views/views.py +++ b/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') - permission_denied_messsage = _('You do not have permissions to alter this photo album') + success_message = _('Photo album link deleted') + 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):