diff --git a/CHANGELOG.md b/CHANGELOG.md index a33a6cd939..8e32afec6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,16 @@ UNRELEASED ---------- +* [ [#1561](https://github.com/digitalfabrik/integreat-cms/issues/1561) ] Rename location contact labels +* [ [#1567](https://github.com/digitalfabrik/integreat-cms/issues/1567) ] Hide organization field in user form +* [ [#1563](https://github.com/digitalfabrik/integreat-cms/issues/1563) ] Fix permission checks in side-by-side view + 2022.6.2 -------- * [ [#1445](https://github.com/digitalfabrik/integreat-cms/issues/1445) ] Allow only users with publish permission to unpublish page -* [ [#1497](https://github.com/digitalfabrik/integreat-cms/issues/1516) ] Set older versions to draft when saved as draft +* [ [#1497](https://github.com/digitalfabrik/integreat-cms/issues/1497) ] Set older versions to draft when saved as draft * [ [#1550](https://github.com/digitalfabrik/integreat-cms/issues/1550) ] Fix status change when restoring revisions * [ [#1509](https://github.com/digitalfabrik/integreat-cms/issues/1509) ] Support legacy sitemap URL patterns * [ [#742](https://github.com/digitalfabrik/integreat-cms/issues/742) ] Make bounding box configurable per region diff --git a/integreat_cms/cms/templates/imprint/imprint_revisions.html b/integreat_cms/cms/templates/imprint/imprint_revisions.html index 13cc8529ac..b4de073713 100644 --- a/integreat_cms/cms/templates/imprint/imprint_revisions.html +++ b/integreat_cms/cms/templates/imprint/imprint_revisions.html @@ -8,7 +8,7 @@

{% trans 'Imprint versions' %}

- {% trans 'Go back to imprint editor' %} + {% trans 'Back to the imprint form' %}
@@ -74,9 +74,11 @@

{{ imprint_translation.title }}

-
+ {% if perms.cms.change_imprintpage %} +
-
+
+ {% endif %} {% endblock %} diff --git a/integreat_cms/cms/templates/imprint/imprint_sbs.html b/integreat_cms/cms/templates/imprint/imprint_sbs.html index 89d4298a78..2612ef8aff 100644 --- a/integreat_cms/cms/templates/imprint/imprint_sbs.html +++ b/integreat_cms/cms/templates/imprint/imprint_sbs.html @@ -7,20 +7,18 @@ {% block content %}
-
-
-

- {% with source_language=source_imprint_translation.language.translated_name target_language_name=target_language.translated_name %} - {% blocktrans %}Translate the imprint from {{ source_language }} to {{ target_language_name }}{% endblocktrans %} - {% endwith %} -

-
-
- - {% trans 'Go back to imprint editor' %} - - {% if perms.cms.change_imprintpage %} +

+ {% with source_language=source_imprint_translation.language.translated_name target_language_name=target_language.translated_name %} + {% blocktrans %}Translate the imprint from {{ source_language }} to {{ target_language_name }}{% endblocktrans %} + {% endwith %} +

+
+ + {% trans 'Back to the imprint form' %} + + {% if perms.cms.change_imprintpage %} +
- {% endif %} -
+
+ {% endif %}
diff --git a/integreat_cms/cms/templates/pages/page_form.html b/integreat_cms/cms/templates/pages/page_form.html index 1c8e9ed999..1037241c43 100644 --- a/integreat_cms/cms/templates/pages/page_form.html +++ b/integreat_cms/cms/templates/pages/page_form.html @@ -26,8 +26,8 @@ id="content_form" data-unsaved-warning> {% csrf_token %} -
-

+
+

{% if page %} {% if page_translation_form.instance.id %} {% with page_translation_form.instance.title as page_title %} @@ -46,7 +46,7 @@

{% endif %}

{% if not page_form.instance.id or not page_form.instance.archived %} -
+
- {% else %} + {% elif can_edit_page %} {% endif %}
diff --git a/integreat_cms/cms/templates/pages/page_revisions.html b/integreat_cms/cms/templates/pages/page_revisions.html index effd61343d..359ddd0e8d 100644 --- a/integreat_cms/cms/templates/pages/page_revisions.html +++ b/integreat_cms/cms/templates/pages/page_revisions.html @@ -12,7 +12,7 @@

{% endwith %}

- {% trans 'Go Back to Page Editor' %} + {% trans 'Back to the page form' %}
@@ -83,11 +83,12 @@

{{ page_translation.title }}

{% if not page.archived %} + {% has_perm 'cms.change_page_object' request.user page as can_edit_page %} {% has_perm 'cms.publish_page_object' request.user page as can_publish_page %} {% if can_publish_page %} - {% else %} + {% elif can_edit_page %} {% endif %} {% endif %} diff --git a/integreat_cms/cms/templates/pages/page_sbs.html b/integreat_cms/cms/templates/pages/page_sbs.html index 97da7dbe1f..97f3db2383 100644 --- a/integreat_cms/cms/templates/pages/page_sbs.html +++ b/integreat_cms/cms/templates/pages/page_sbs.html @@ -7,19 +7,18 @@ {% block content %}
-
-
-

- {% with page_title=source_page_translation.title source_language=source_page_translation.language.translated_name target_language_name=target_language.translated_name %} - {% blocktrans %}Translate "{{ page_title }}" from {{ source_language }} to {{ target_language_name }}{% endblocktrans %} - {% endwith %} -

-
-
- - {% trans 'Go Back to Page Editor' %} - +

+ {% with page_title=source_page_translation.title source_language=source_page_translation.language.translated_name target_language_name=target_language.translated_name %} + {% blocktrans %}Translate "{{ page_title }}" from {{ source_language }} to {{ target_language_name }}{% endblocktrans %} + {% endwith %} +

+
+ + {% trans 'Back to the page form' %} + +
+ {% has_perm 'cms.change_page_object' request.user source_page_translation.page as can_edit_page %} {% if not source_page_translation.page.archived %} {% has_perm 'cms.publish_page_object' request.user source_page_translation.page as can_publish_page %} {% if can_publish_page %} @@ -30,8 +29,8 @@

{% else %} {% trans 'Publish' %} {% endif %} - - {% else %} + + {% elif can_edit_page %} {% endif %} {% endif %} @@ -146,7 +145,7 @@

- {% if not can_change_page_object or page_translation_form.instance.id and page_translation_form.instance.page.archived %} + {% if not can_edit_page or page_translation_form.instance.id and page_translation_form.instance.page.archived %} {% include '../_tinymce_config.html' with readonly=1 language=target_language %} {% else %} {% include '../_tinymce_config.html' with language=target_language %} diff --git a/integreat_cms/cms/templates/pois/poi_form.html b/integreat_cms/cms/templates/pois/poi_form.html index 1adbca39db..e0bd904655 100644 --- a/integreat_cms/cms/templates/pois/poi_form.html +++ b/integreat_cms/cms/templates/pois/poi_form.html @@ -169,8 +169,9 @@

- {% trans 'Contact' %} + {% trans 'Contact details' %}

+ ({% trans 'currently not publicly visible' %})
diff --git a/integreat_cms/cms/templates/users/region_user_form.html b/integreat_cms/cms/templates/users/region_user_form.html index d5e905d6ab..0c5ef542c3 100644 --- a/integreat_cms/cms/templates/users/region_user_form.html +++ b/integreat_cms/cms/templates/users/region_user_form.html @@ -91,11 +91,13 @@

{% render_field user_form.role|add_error_class:"border-red-500" required="required" %}
{{ user_form.role.help_text }}

-
- - {% render_field user_form.organization|add_error_class:"border-red-500" %} -
{{ user_form.organization.help_text }}
-
+ {% if user_form.organization.field.queryset.exists %} +
+ + {% render_field user_form.organization|add_error_class:"border-red-500" %} +
{{ user_form.organization.help_text }}
+
+ {% endif %}

diff --git a/integreat_cms/cms/views/imprint/imprint_revision_view.py b/integreat_cms/cms/views/imprint/imprint_revision_view.py index 97ba4bf64f..e67e3e453a 100644 --- a/integreat_cms/cms/views/imprint/imprint_revision_view.py +++ b/integreat_cms/cms/views/imprint/imprint_revision_view.py @@ -78,6 +78,13 @@ def get(self, request, *args, **kwargs): } ) + # Show warning if user has no permission to manage the imprint + if not request.user.has_perm("cms.change_imprintpage"): + messages.warning( + request, + _("You don't have the permission restore revisions of the imprint."), + ) + return render( request, self.template_name, diff --git a/integreat_cms/cms/views/pages/page_form_view.py b/integreat_cms/cms/views/pages/page_form_view.py index 1b2ac4b5c5..83ad415602 100644 --- a/integreat_cms/cms/views/pages/page_form_view.py +++ b/integreat_cms/cms/views/pages/page_form_view.py @@ -117,7 +117,7 @@ def get(self, request, *args, **kwargs): _("You don't have the permission to edit this page."), ) # Show warning if user has no permission to publish the page - if not request.user.has_perm("cms.publish_page_object", page): + elif not request.user.has_perm("cms.publish_page_object", page): messages.warning( request, _( diff --git a/integreat_cms/cms/views/pages/page_sbs_view.py b/integreat_cms/cms/views/pages/page_sbs_view.py index 369fb00098..e0c9cdeec1 100644 --- a/integreat_cms/cms/views/pages/page_sbs_view.py +++ b/integreat_cms/cms/views/pages/page_sbs_view.py @@ -87,8 +87,18 @@ def get(self, request, *args, **kwargs): }, ) + disabled = False + # Make form disabled if user has no permission to edit the page + if not request.user.has_perm("cms.change_page_object", page): + disabled = True + messages.warning( + request, + _("You don't have the permission to edit this page."), + ) + page_translation_form = PageTranslationForm( instance=target_page_translation, + disabled=disabled, ) return render( diff --git a/integreat_cms/locale/de/LC_MESSAGES/django.po b/integreat_cms/locale/de/LC_MESSAGES/django.po index 8894cd669c..11808fd228 100644 --- a/integreat_cms/locale/de/LC_MESSAGES/django.po +++ b/integreat_cms/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-18 12:16+0000\n" +"POT-Creation-Date: 2022-06-20 16:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Integreat \n" "Language-Team: Integreat \n" @@ -1443,9 +1443,9 @@ msgstr "Rechts nach Links" #: cms/templates/_form_language_tabs.html:81 #: cms/templates/events/event_list_archived_row.html:47 #: cms/templates/events/event_list_row.html:47 -#: cms/templates/imprint/imprint_sbs.html:47 -#: cms/templates/imprint/imprint_sbs.html:104 -#: cms/templates/pages/page_sbs.html:52 cms/templates/pages/page_sbs.html:101 +#: cms/templates/imprint/imprint_sbs.html:45 +#: cms/templates/imprint/imprint_sbs.html:102 +#: cms/templates/pages/page_sbs.html:51 cms/templates/pages/page_sbs.html:100 #: cms/templates/pages/page_tree_archived_node.html:63 #: cms/templates/pages/page_tree_node.html:79 #: cms/templates/pois/poi_list_row.html:44 @@ -1458,9 +1458,9 @@ msgstr "Übersetzung ist aktuell" #: cms/templates/events/event_list_archived_row.html:39 #: cms/templates/events/event_list_row.html:39 #: cms/templates/events/event_list_row.html:61 -#: cms/templates/imprint/imprint_sbs.html:43 -#: cms/templates/imprint/imprint_sbs.html:100 -#: cms/templates/pages/page_sbs.html:48 cms/templates/pages/page_sbs.html:97 +#: cms/templates/imprint/imprint_sbs.html:41 +#: cms/templates/imprint/imprint_sbs.html:98 +#: cms/templates/pages/page_sbs.html:47 cms/templates/pages/page_sbs.html:96 #: cms/templates/pages/page_tree_archived_node.html:55 #: cms/templates/pages/page_tree_node.html:71 #: cms/templates/pages/page_tree_node.html:89 @@ -1475,9 +1475,9 @@ msgstr "Wird derzeit übersetzt" #: cms/templates/_form_language_tabs.html:77 #: cms/templates/events/event_list_archived_row.html:43 #: cms/templates/events/event_list_row.html:43 -#: cms/templates/imprint/imprint_sbs.html:39 -#: cms/templates/imprint/imprint_sbs.html:96 -#: cms/templates/pages/page_sbs.html:44 cms/templates/pages/page_sbs.html:93 +#: cms/templates/imprint/imprint_sbs.html:37 +#: cms/templates/imprint/imprint_sbs.html:94 +#: cms/templates/pages/page_sbs.html:43 cms/templates/pages/page_sbs.html:92 #: cms/templates/pages/page_tree_archived_node.html:59 #: cms/templates/pages/page_tree_node.html:75 #: cms/templates/pois/poi_list_row.html:40 @@ -1675,14 +1675,14 @@ msgstr "Kategorie" #: cms/templates/events/event_list_archived.html:52 #: cms/templates/imprint/imprint_form.html:49 #: cms/templates/imprint/imprint_revisions.html:46 -#: cms/templates/imprint/imprint_sbs.html:57 -#: cms/templates/imprint/imprint_sbs.html:121 -#: cms/templates/imprint/imprint_sbs.html:140 +#: cms/templates/imprint/imprint_sbs.html:55 +#: cms/templates/imprint/imprint_sbs.html:119 +#: cms/templates/imprint/imprint_sbs.html:138 #: cms/templates/linkcheck/links_by_filter.html:59 #: cms/templates/pages/page_form.html:106 #: cms/templates/pages/page_revisions.html:50 -#: cms/templates/pages/page_sbs.html:62 cms/templates/pages/page_sbs.html:118 -#: cms/templates/pages/page_sbs.html:124 cms/templates/pages/page_tree.html:88 +#: cms/templates/pages/page_sbs.html:61 cms/templates/pages/page_sbs.html:117 +#: cms/templates/pages/page_sbs.html:123 cms/templates/pages/page_tree.html:88 #: cms/templates/pages/page_tree_archived.html:67 #: cms/templates/pois/poi_form.html:63 cms/templates/pois/poi_list.html:67 #: cms/templates/pois/poi_list_archived.html:33 @@ -2845,11 +2845,11 @@ msgstr "Ob der Ort schreibgeschützt und in der API verborgen ist oder nicht." #: cms/models/pois/poi.py:53 msgid "website" -msgstr "Website" +msgstr "Webseite" #: cms/models/pois/poi.py:56 msgid "email address" -msgstr "E-Mail Adresse" +msgstr "E-Mail-Adresse" #: cms/models/pois/poi.py:59 msgid "phone number" @@ -3412,13 +3412,13 @@ msgstr "Angebots-Vorlagen" #: cms/templates/_base.html:280 cms/templates/events/event_form.html:68 #: cms/templates/imprint/imprint_form.html:43 #: cms/templates/imprint/imprint_revisions.html:20 -#: cms/templates/imprint/imprint_sbs.html:54 -#: cms/templates/imprint/imprint_sbs.html:118 -#: cms/templates/imprint/imprint_sbs.html:137 +#: cms/templates/imprint/imprint_sbs.html:52 +#: cms/templates/imprint/imprint_sbs.html:116 +#: cms/templates/imprint/imprint_sbs.html:135 #: cms/templates/pages/page_form.html:100 #: cms/templates/pages/page_revisions.html:24 -#: cms/templates/pages/page_sbs.html:59 cms/templates/pages/page_sbs.html:115 -#: cms/templates/pages/page_sbs.html:121 cms/templates/pois/poi_form.html:58 +#: cms/templates/pages/page_sbs.html:58 cms/templates/pages/page_sbs.html:114 +#: cms/templates/pages/page_sbs.html:120 cms/templates/pois/poi_form.html:58 msgid "Version" msgstr "Version" @@ -3496,8 +3496,8 @@ msgstr "Tipp" #: cms/templates/_tinymce_config.html:37 #: cms/templates/events/event_form.html:44 -#: cms/templates/imprint/imprint_sbs.html:27 -#: cms/templates/pages/page_form.html:64 cms/templates/pages/page_sbs.html:29 +#: cms/templates/imprint/imprint_sbs.html:25 +#: cms/templates/pages/page_form.html:64 cms/templates/pages/page_sbs.html:28 #: cms/templates/pois/poi_form.html:38 msgid "Update" msgstr "Aktualisieren" @@ -3962,22 +3962,22 @@ msgstr "Veranstaltung erstellen" #: cms/templates/events/event_form.html:41 #: cms/templates/imprint/imprint_form.html:26 -#: cms/templates/imprint/imprint_sbs.html:24 -#: cms/templates/pages/page_form.html:61 cms/templates/pages/page_sbs.html:26 +#: cms/templates/imprint/imprint_sbs.html:22 +#: cms/templates/pages/page_form.html:61 cms/templates/pages/page_sbs.html:25 #: cms/templates/pois/poi_form.html:35 msgid "Save as draft" msgstr "Als Entwurf speichern" #: cms/templates/events/event_form.html:46 #: cms/templates/imprint/imprint_form.html:27 -#: cms/templates/imprint/imprint_sbs.html:29 -#: cms/templates/pages/page_form.html:66 cms/templates/pages/page_sbs.html:31 +#: cms/templates/imprint/imprint_sbs.html:27 +#: cms/templates/pages/page_form.html:66 cms/templates/pages/page_sbs.html:30 #: cms/templates/pois/poi_form.html:40 msgid "Publish" msgstr "Veröffentlichen" #: cms/templates/events/event_form.html:50 -#: cms/templates/pages/page_form.html:70 cms/templates/pages/page_sbs.html:35 +#: cms/templates/pages/page_form.html:70 cms/templates/pages/page_sbs.html:34 msgid "Submit for review" msgstr "Zur Überprüfung vorlegen" @@ -3989,8 +3989,8 @@ msgstr "Bearbeiten" #: cms/templates/events/event_form.html:96 #: cms/templates/imprint/imprint_form.html:65 #: cms/templates/imprint/imprint_form.html:80 -#: cms/templates/imprint/imprint_sbs.html:67 -#: cms/templates/imprint/imprint_sbs.html:131 +#: cms/templates/imprint/imprint_sbs.html:65 +#: cms/templates/imprint/imprint_sbs.html:129 #: cms/templates/pages/page_form.html:130 #: cms/templates/pages/page_form.html:149 #: cms/templates/pages/page_form.html:236 cms/templates/pois/poi_form.html:84 @@ -4007,8 +4007,8 @@ msgstr "Geringfügige Änderung" #: cms/templates/events/event_form.html:126 #: cms/templates/imprint/imprint_form.html:100 -#: cms/templates/imprint/imprint_sbs.html:151 -#: cms/templates/pages/page_form.html:179 cms/templates/pages/page_sbs.html:137 +#: cms/templates/imprint/imprint_sbs.html:149 +#: cms/templates/pages/page_form.html:179 cms/templates/pages/page_sbs.html:136 #: cms/templates/pois/poi_form.html:118 msgid "Implications on other translations" msgstr "Auswirkungen auf andere Übersetzungen" @@ -4047,7 +4047,7 @@ msgstr "Auf Google Maps öffnen" #: cms/templates/events/event_form.html:328 #: cms/templates/imprint/imprint_form.html:114 -#: cms/templates/pages/page_form.html:285 cms/templates/pois/poi_form.html:213 +#: cms/templates/pages/page_form.html:285 cms/templates/pois/poi_form.html:214 #: cms/templates/regions/region_list.html:25 #: cms/templates/settings/user_settings.html:93 msgid "Actions" @@ -4410,9 +4410,9 @@ msgid "Short URL" msgstr "Kurz-URL" #: cms/templates/imprint/imprint_form.html:73 -#: cms/templates/imprint/imprint_sbs.html:60 -#: cms/templates/imprint/imprint_sbs.html:124 -#: cms/templates/imprint/imprint_sbs.html:143 +#: cms/templates/imprint/imprint_sbs.html:58 +#: cms/templates/imprint/imprint_sbs.html:122 +#: cms/templates/imprint/imprint_sbs.html:141 msgid "Link to the imprint" msgstr "Link zum Impressum" @@ -4451,9 +4451,9 @@ msgid "Imprint versions" msgstr "Versionen des Impressums" #: cms/templates/imprint/imprint_revisions.html:11 -#: cms/templates/imprint/imprint_sbs.html:21 -msgid "Go back to imprint editor" -msgstr "Zurück zum Impressums-Editor" +#: cms/templates/imprint/imprint_sbs.html:18 +msgid "Back to the imprint form" +msgstr "Zurück zum Impressums-Formular" #: cms/templates/imprint/imprint_revisions.html:43 #: cms/templates/pages/_page_xliff_import_diff.html:34 @@ -4495,48 +4495,48 @@ msgstr "Titel" msgid "Content" msgstr "Inhalt" -#: cms/templates/imprint/imprint_revisions.html:78 -#: cms/templates/pages/page_revisions.html:88 +#: cms/templates/imprint/imprint_revisions.html:79 +#: cms/templates/pages/page_revisions.html:89 msgid "Restore this version as draft" msgstr "Diese Version als Entwurf wiederherstellen" -#: cms/templates/imprint/imprint_revisions.html:79 -#: cms/templates/pages/page_revisions.html:89 +#: cms/templates/imprint/imprint_revisions.html:80 +#: cms/templates/pages/page_revisions.html:90 msgid "Restore and publish this version" msgstr "Diese Version wiederherstellen und veröffentlichen" -#: cms/templates/imprint/imprint_sbs.html:14 +#: cms/templates/imprint/imprint_sbs.html:12 #, python-format msgid "" "Translate the imprint from %(source_language)s to %(target_language_name)s" msgstr "" "Übersetze das Impressum von %(source_language)s nach %(target_language_name)s" +#: cms/templates/imprint/imprint_sbs.html:79 #: cms/templates/imprint/imprint_sbs.html:81 -#: cms/templates/imprint/imprint_sbs.html:83 -#: cms/templates/pages/page_sbs.html:78 cms/templates/pages/page_sbs.html:80 +#: cms/templates/pages/page_sbs.html:77 cms/templates/pages/page_sbs.html:79 msgid "Copy content" msgstr "Inhalt kopieren" -#: cms/templates/imprint/imprint_sbs.html:86 -#: cms/templates/pages/page_sbs.html:83 +#: cms/templates/imprint/imprint_sbs.html:84 +#: cms/templates/pages/page_sbs.html:82 #, python-format msgid "Copy content of %(source_language)s to %(target_language_name)s" msgstr "Inhalt von %(source_language)s nach %(target_language_name)s kopieren" -#: cms/templates/imprint/imprint_sbs.html:109 -#: cms/templates/pages/page_sbs.html:106 +#: cms/templates/imprint/imprint_sbs.html:107 +#: cms/templates/pages/page_sbs.html:105 msgid "Create Translation" msgstr "Übersetzung erstellen" -#: cms/templates/imprint/imprint_sbs.html:138 -#: cms/templates/pages/page_sbs.html:122 +#: cms/templates/imprint/imprint_sbs.html:136 +#: cms/templates/pages/page_sbs.html:121 msgid "New" msgstr "Neu" -#: cms/templates/imprint/imprint_sbs.html:141 -#: cms/templates/imprint/imprint_sbs.html:144 -#: cms/templates/pages/page_sbs.html:125 +#: cms/templates/imprint/imprint_sbs.html:139 +#: cms/templates/imprint/imprint_sbs.html:142 +#: cms/templates/pages/page_sbs.html:124 msgid "Not saved yet" msgstr "Noch nicht gespeichert" @@ -5089,15 +5089,15 @@ msgid "Page versions of \"%(page_title)s\"" msgstr "Versionen der Seite \"%(page_title)s\"" #: cms/templates/pages/page_revisions.html:15 -#: cms/templates/pages/page_sbs.html:21 -msgid "Go Back to Page Editor" -msgstr "Zurück zum Seiten-Editor" +#: cms/templates/pages/page_sbs.html:18 +msgid "Back to the page form" +msgstr "Zurück zum Seiten-Formular" -#: cms/templates/pages/page_revisions.html:91 +#: cms/templates/pages/page_revisions.html:92 msgid "Restore this version and submit for review" msgstr "Diese Revision wiederherstellen und zum Review vorlegen" -#: cms/templates/pages/page_sbs.html:14 +#: cms/templates/pages/page_sbs.html:12 #, python-format msgid "" "Translate \"%(page_title)s\" from %(source_language)s to " @@ -5106,7 +5106,7 @@ msgstr "" "Übersetze \"%(page_title)s\" von %(source_language)s nach " "%(target_language_name)s" -#: cms/templates/pages/page_sbs.html:130 +#: cms/templates/pages/page_sbs.html:129 msgid " Leave blank to generate unique permalink from title" msgstr "" " Dieses Feld freilassen, um eine eindeutigen Permalink aus dem Titel zu " @@ -5344,45 +5344,49 @@ msgstr "" "abgeleitet." #: cms/templates/pois/poi_form.html:172 -msgid "Contact" -msgstr "Kontakt" +msgid "Contact details" +msgstr "Kontaktdaten" + +#: cms/templates/pois/poi_form.html:174 +msgid "currently not publicly visible" +msgstr "aktuell nicht öffentlich sichtbar" -#: cms/templates/pois/poi_form.html:220 cms/templates/pois/poi_form.html:222 +#: cms/templates/pois/poi_form.html:221 cms/templates/pois/poi_form.html:223 #: cms/templates/pois/poi_list_archived_row.html:55 msgid "Restore location" msgstr "Ort wiederherstellen" -#: cms/templates/pois/poi_form.html:228 +#: cms/templates/pois/poi_form.html:229 msgid "Restore this location" msgstr "Diesen Ort wiederherstellen" -#: cms/templates/pois/poi_form.html:232 cms/templates/pois/poi_form.html:234 +#: cms/templates/pois/poi_form.html:233 cms/templates/pois/poi_form.html:235 #: cms/templates/pois/poi_list_row.html:102 msgid "Archive location" msgstr "Ort archivieren" -#: cms/templates/pois/poi_form.html:240 +#: cms/templates/pois/poi_form.html:241 msgid "Archive this location" msgstr "Diesen Ort archivieren" -#: cms/templates/pois/poi_form.html:247 cms/templates/pois/poi_form.html:269 +#: cms/templates/pois/poi_form.html:248 cms/templates/pois/poi_form.html:270 #: cms/templates/pois/poi_list_archived_row.html:68 #: cms/templates/pois/poi_list_row.html:115 msgid "Delete location" msgstr "Ort löschen" -#: cms/templates/pois/poi_form.html:253 +#: cms/templates/pois/poi_form.html:254 msgid "You cannot delete a location which is referenced by an event." msgstr "" "Der Ort kann nicht gelöscht werden, da er von einem Event verwendet wird." -#: cms/templates/pois/poi_form.html:255 +#: cms/templates/pois/poi_form.html:256 msgid "To delete this location, you have to delete this event first:" msgid_plural "To delete this location, you have to delete these events first:" msgstr[0] "Löschen Sie zuerst diese Veranstaltung, um den Ort zu löschen:" msgstr[1] "Löschen Sie zuerst diese Veranstaltungen, um den Ort zu löschen:" -#: cms/templates/pois/poi_form.html:275 +#: cms/templates/pois/poi_form.html:276 msgid "Delete this location" msgstr "Diesen Ort löschen" @@ -5709,11 +5713,11 @@ msgstr "Sprache ändern" #: cms/templates/settings/user_settings.html:40 msgid "My E-mail-address" -msgstr "Meine E-Mail Adresse" +msgstr "Meine E-Mail-Adresse" #: cms/templates/settings/user_settings.html:48 msgid "Change e-mail-address" -msgstr "E-Mail Adresse ändern" +msgstr "E-Mail-Adresse ändern" #: cms/templates/settings/user_settings.html:56 msgid "My Password" @@ -5854,32 +5858,32 @@ msgstr "Benutzer \"%(user_name)s\" bearbeiten" msgid "Create new user" msgstr "Neuen Benutzer erstellen" -#: cms/templates/users/region_user_form.html:105 +#: cms/templates/users/region_user_form.html:107 #: cms/templates/users/user_form.html:135 msgid "Delete this user" msgstr "Diesen Benutzer löschen" -#: cms/templates/users/region_user_form.html:106 +#: cms/templates/users/region_user_form.html:108 #: cms/templates/users/user_form.html:130 msgid "Please confirm that you really want to delete this user" msgstr "Bitte bestätigen Sie, dass dieser Benutzer gelöscht werden soll" -#: cms/templates/users/region_user_form.html:107 +#: cms/templates/users/region_user_form.html:109 #: cms/templates/users/user_form.html:131 cms/views/mixins.py:70 msgid "This cannot be reversed." msgstr "Dies kann nicht rückgängig gemacht werden." -#: cms/templates/users/region_user_form.html:111 +#: cms/templates/users/region_user_form.html:113 #: cms/templates/users/user_form.html:129 msgid "Delete user" msgstr "Benutzer löschen" -#: cms/templates/users/region_user_form.html:116 +#: cms/templates/users/region_user_form.html:118 #, python-format msgid "Remove this user from region %(request.region)s" msgstr "Diesen Benutzer von Region %(request.region)s entfernen" -#: cms/templates/users/region_user_form.html:117 +#: cms/templates/users/region_user_form.html:119 #, python-format msgid "" "Please confirm that you really want to remove this user from region " @@ -5888,11 +5892,11 @@ msgstr "" "Bitte bestätigen Sie, dass dieser Benutzer von der Region %(request.region)s " "entfernt werden soll." -#: cms/templates/users/region_user_form.html:118 +#: cms/templates/users/region_user_form.html:120 msgid "The user will keep access to the following regions:" msgstr "Der Benutzer wird den Zugang zu folgenden Regionen behalten:" -#: cms/templates/users/region_user_form.html:122 +#: cms/templates/users/region_user_form.html:124 msgid "Remove user from region" msgstr "Benutzer von Region entfernen" @@ -5924,7 +5928,7 @@ msgstr "Nachname" #: cms/templates/users/region_user_list.html:24 #: cms/templates/users/user_list.html:32 msgid "E-mail-address" -msgstr "E-Mail Adresse" +msgstr "E-Mail-Adresse" #: cms/templates/users/region_user_list.html:25 #: cms/templates/users/user_list.html:33 @@ -6103,7 +6107,7 @@ msgid "" "exists with the email you entered." msgstr "" "Eine Nachricht mit Anweisungen zum Zurücksetzen Ihres Passworts wurde an die " -"angegebene E-Mail Adresse geschickt." +"angegebene E-Mail-Adresse geschickt." #: cms/views/authentication/password_reset_view.py:71 msgid "You should receive them shortly." @@ -6284,7 +6288,7 @@ msgstr "Feedback wurde erfolgreich gelöscht" #: cms/views/form_views.py:97 cms/views/imprint/imprint_sbs_view.py:209 #: cms/views/language_tree/language_tree_node_form_view.py:105 -#: cms/views/pages/page_sbs_view.py:192 cms/views/roles/role_form_view.py:93 +#: cms/views/pages/page_sbs_view.py:202 cms/views/roles/role_form_view.py:93 #: cms/views/settings/user_settings_view.py:91 #: cms/views/settings/user_settings_view.py:108 #: cms/views/users/region_user_form_view.py:95 @@ -6339,26 +6343,32 @@ msgid "{source_language} to {target_language}" msgstr "{source_language} nach {target_language}" #: cms/views/imprint/imprint_revision_view.py:72 -#: cms/views/imprint/imprint_revision_view.py:129 +#: cms/views/imprint/imprint_revision_view.py:136 #: cms/views/pages/page_revision_view.py:77 #: cms/views/pages/page_revision_view.py:136 msgid "This revision does not exist." msgstr "Diese Revision existiert nicht." -#: cms/views/imprint/imprint_revision_view.py:147 +#: cms/views/imprint/imprint_revision_view.py:85 +msgid "You don't have the permission restore revisions of the imprint." +msgstr "" +"Sie haben nicht die nötige Berechtigung, um Revisionen des Impressums " +"wiederherzustellen." + +#: cms/views/imprint/imprint_revision_view.py:154 #: cms/views/pages/page_revision_view.py:161 msgid "This revision is identical to the current version of this translation." msgstr "" "Diese Revision ist identisch mit der aktuellen Version dieser Übersetzung." -#: cms/views/imprint/imprint_revision_view.py:170 +#: cms/views/imprint/imprint_revision_view.py:177 #: cms/views/pages/page_revision_view.py:193 msgid "The revision was successfully restored" msgstr "Die Revision wurde erfolgreich wiederhergestellt" #: cms/views/imprint/imprint_sbs_view.py:81 #: cms/views/imprint/imprint_sbs_view.py:166 -#: cms/views/pages/page_sbs_view.py:59 cms/views/pages/page_sbs_view.py:147 +#: cms/views/pages/page_sbs_view.py:59 cms/views/pages/page_sbs_view.py:157 #, python-brace-format msgid "" "You cannot use the side-by-side-view for the region's default language (in " @@ -6369,7 +6379,7 @@ msgstr "" #: cms/views/imprint/imprint_sbs_view.py:99 #: cms/views/imprint/imprint_sbs_view.py:183 -#: cms/views/pages/page_sbs_view.py:78 cms/views/pages/page_sbs_view.py:165 +#: cms/views/pages/page_sbs_view.py:78 cms/views/pages/page_sbs_view.py:175 #, python-brace-format msgid "" "You cannot use the side-by-side-view if the source translation (in this case " @@ -6773,7 +6783,7 @@ msgstr "" "Version Version %(revision)s dieser Seite in der App angezeigt." -#: cms/views/pages/page_form_view.py:117 +#: cms/views/pages/page_form_view.py:117 cms/views/pages/page_sbs_view.py:96 msgid "You don't have the permission to edit this page." msgstr "Sie haben nicht die nötige Berechtigung, um diese Seite zu bearbeiten." @@ -7110,6 +7120,9 @@ msgstr "" "Diese Seite konnte nicht importiert werden, da sie zu einer anderen Region " "gehört ({})." +#~ msgid "Go back to imprint editor" +#~ msgstr "Zurück zum Impressums-Editor" + #~ msgid "Successfully refreshed dates for all translations." #~ msgstr "Erfolgreich die Daten für alle Übersetzungen aktualisiert." @@ -7830,7 +7843,7 @@ msgstr "" #~ msgstr "Push-Benachrichtigung wurde erfolgreich gesendet" #~ msgid "This e-mail address may not be available in the system." -#~ msgstr "Womöglich ist diese E-Mail Adresse nicht im System vorhanden." +#~ msgstr "Womöglich ist diese E-Mail-Adresse nicht im System vorhanden." #~ msgid "Superuser" #~ msgstr "Administrator" @@ -7875,7 +7888,7 @@ msgstr "" #~ "the e-mail address provided." #~ msgstr "" #~ "Eine Nachricht mit Anweisungen zum Zurücksetzen Ihres Passworts wurde an " -#~ "die angegebene E-Mail Adresse geschickt." +#~ "die angegebene E-Mail-Adresse geschickt." #~ msgid "" #~ "Either pending account activation or account is deactivated on purpose" @@ -8016,7 +8029,7 @@ msgstr "" #~ msgstr "Was möchten Sie tun?" #~ msgid "Your E-mail-address" -#~ msgstr "Ihre E-Mail Adresse" +#~ msgstr "Ihre E-Mail-Adresse" #~ msgid "Confirm your new password here" #~ msgstr "Ihr neues Passwort erneut eingeben" @@ -8389,11 +8402,6 @@ msgstr "" #~ msgid "Yes, restore this page now." #~ msgstr "Ja, die Seite wiederherstellen." -#~ msgid "You don't have the permission to restore revisions of the imprint." -#~ msgstr "" -#~ "Sie haben nicht die nötige Berechtigung, um Revisionen des Impressums " -#~ "wiederherzustellen." - #~ msgid "" #~ "You don't have the permission to manage the imprint, but you can propose " #~ "changes and submit them for review instead." @@ -8597,8 +8605,8 @@ msgstr "" #~ msgid "No POI found" #~ msgstr "Kein POI gefunden" -#~ msgid "Save e-mail-address" -#~ msgstr "E-Mail Adresse speichern" +#~ msgid "Save e-mail address" +#~ msgstr "E-Mail-Adresse speichern" #~ msgid "Save password" #~ msgstr "Passwort ändern"