Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't show page fallback text if there is no alternative translation #1417

Merged
merged 1 commit into from
May 11, 2022
Merged

Don't show page fallback text if there is no alternative translation #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ UNRELEASED

* [ [#1409](https://github.com/digitalfabrik/integreat-cms/issues/1409) ] Fix automatic filling of region coordinates
* [ [#1407](https://github.com/digitalfabrik/integreat-cms/issues/1407) ] Add location setting to region model
* [ [#1417](https://github.com/digitalfabrik/integreat-cms/issues/1417) ] Don't show fallback text for empty pages if there are no alternatives


2022.5.0
Expand Down
4 changes: 4 additions & 0 deletions integreat_cms/cms/models/pages/page_translation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ def display_content(self):
for translation in self.page.prefetched_public_translations_by_language_slug.values()
if translation.content and not translation.content.isspace()
]

if not fallback_translations:
return self.content

return render_to_string(
"pages/_page_content_alternatives.html",
{
Expand Down
10 changes: 5 additions & 5 deletions integreat_cms/locale/de/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-10 12:46+0000\n"
"POT-Creation-Date: 2022-05-11 14:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Integreat <info@integreat-app.de>\n"
"Language-Team: Integreat <info@integreat-app.de>\n"
Expand Down Expand Up @@ -2232,7 +2232,7 @@ msgstr "Angebotslisten-Feedback"

#: cms/models/feedback/page_feedback.py:19
#: cms/models/pages/abstract_base_page_translation.py:79
#: cms/models/pages/page_translation.py:323
#: cms/models/pages/page_translation.py:327
msgid "page translation"
msgstr "Seiten-Übersetzung"

Expand Down Expand Up @@ -2567,7 +2567,7 @@ msgid "with the title in"
msgstr "mit dem Titel auf"

#: cms/models/pages/abstract_base_page_translation.py:81
#: cms/models/pages/page_translation.py:325
#: cms/models/pages/page_translation.py:329
msgid "page translations"
msgstr "Seiten-Übersetzungen"

Expand Down Expand Up @@ -2690,11 +2690,11 @@ msgstr "Titel der Seite"
msgid "content of the page"
msgstr "Inhalt der Seite"

#: cms/models/pages/page_translation.py:226
#: cms/models/pages/page_translation.py:230
msgid "Live content"
msgstr "Live-Inhalt"

#: cms/models/pages/page_translation.py:229
#: cms/models/pages/page_translation.py:233
msgid "Empty"
msgstr "Leer"

Expand Down
6 changes: 6 additions & 0 deletions tests/api/api_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
"tests/api/expected-outputs/augsburg_de_pages.json",
200,
),
(
"/api/augsburg/ar/pages/",
"/augsburg/ar/wp-json/extensions/v3/pages/",
"tests/api/expected-outputs/augsburg_ar_pages.json",
200,
),
(
"/api/augsburg/de/locations/",
"/augsburg/de/wp-json/extensions/v3/locations/",
Expand Down
10 changes: 5 additions & 5 deletions tests/api/expected-outputs/api_augsburg_de_children_depth_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"title": "Beh\u00f6rden und Beratung",
"modified_gmt": "2022-01-16T16:36:26.985Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 0,
"url": null,
Expand Down Expand Up @@ -208,7 +208,7 @@
"title": "Beh\u00f6rden",
"modified_gmt": "2022-01-16T16:36:57.038Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 14,
"url": "http://localhost:8000/augsburg/de/beh\u00f6rden-und-beratung/",
Expand Down Expand Up @@ -242,7 +242,7 @@
"title": "Deutsche Sprache",
"modified_gmt": "2022-01-16T16:52:15.815Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 0,
"url": null,
Expand Down Expand Up @@ -310,7 +310,7 @@
"title": "Sprachkurse",
"modified_gmt": "2022-01-16T16:55:55.501Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 18,
"url": "http://localhost:8000/augsburg/de/deutsche-sprache/",
Expand Down Expand Up @@ -373,7 +373,7 @@
"title": "Dolmetschen und \u00dcbersetzen",
"modified_gmt": "2022-01-16T17:00:04.994Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 18,
"url": "http://localhost:8000/augsburg/de/deutsche-sprache/",
Expand Down
453 changes: 453 additions & 0 deletions tests/api/expected-outputs/augsburg_ar_pages.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/api/expected-outputs/augsburg_de_children.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"title": "Beh\u00f6rden und Beratung",
"modified_gmt": "2022-01-16T16:36:26.985Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 0,
"url": null,
Expand Down Expand Up @@ -74,7 +74,7 @@
"title": "Deutsche Sprache",
"modified_gmt": "2022-01-16T16:52:15.815Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 0,
"url": null,
Expand Down
2 changes: 1 addition & 1 deletion tests/api/expected-outputs/augsburg_de_children_archived_descendants.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"url": "http://localhost:8000/augsburg/fa/\u0627\u062f\u0627\u0631\u0627\u062a-\u0648-\u0645\u0634\u0627\u0648\u0631\u0647/\u0627\u062f\u0627\u0631\u0627\u062a/"
}
},
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"excerpt": "",
"hash": null,
"id": 35,
Expand Down
10 changes: 5 additions & 5 deletions tests/api/expected-outputs/augsburg_de_pages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"title": "Beh\u00f6rden und Beratung",
"modified_gmt": "2022-01-16T16:36:26.985Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 0,
"url": null,
Expand Down Expand Up @@ -208,7 +208,7 @@
"title": "Beh\u00f6rden",
"modified_gmt": "2022-01-16T16:36:57.038Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 14,
"url": "http://localhost:8000/augsburg/de/beh\u00f6rden-und-beratung/",
Expand Down Expand Up @@ -310,7 +310,7 @@
"title": "Deutsche Sprache",
"modified_gmt": "2022-01-16T16:52:15.815Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 0,
"url": null,
Expand Down Expand Up @@ -378,7 +378,7 @@
"title": "Sprachkurse",
"modified_gmt": "2022-01-16T16:55:55.501Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 18,
"url": "http://localhost:8000/augsburg/de/deutsche-sprache/",
Expand Down Expand Up @@ -441,7 +441,7 @@
"title": "Dolmetschen und \u00dcbersetzen",
"modified_gmt": "2022-01-16T17:00:04.994Z",
"excerpt": "",
"content": "\n\n\n<p>Die Seite existiert nicht in der ausgew\u00e4hlten Sprache. Sie ist aber in diesen Sprachen verf\u00fcgbar:</p>\n<ul>\n \n</ul>",
"content": "",
"parent": {
"id": 18,
"url": "http://localhost:8000/augsburg/de/deutsche-sprache/",
Expand Down