From 00507f3a8583f26bb78414c84b3d2d142d8eaa16 Mon Sep 17 00:00:00 2001 From: Adrian Heine Date: Thu, 5 Sep 2024 10:11:27 +0200 Subject: [PATCH 1/2] ZO-6198: Remove liveblog config intersection_type --- .../changelog/ZO-6198_liveblog_intersection_types.change | 1 + core/src/zeit/content/modules/interfaces.py | 7 ------- core/src/zeit/content/modules/liveblog.py | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) create mode 100644 core/docs/changelog/ZO-6198_liveblog_intersection_types.change diff --git a/core/docs/changelog/ZO-6198_liveblog_intersection_types.change b/core/docs/changelog/ZO-6198_liveblog_intersection_types.change new file mode 100644 index 0000000000..5c25493f9c --- /dev/null +++ b/core/docs/changelog/ZO-6198_liveblog_intersection_types.change @@ -0,0 +1 @@ +ZO-6198: Remove liveblog config intersection_type diff --git a/core/src/zeit/content/modules/interfaces.py b/core/src/zeit/content/modules/interfaces.py index b66febdd2b..5e3e5782f5 100644 --- a/core/src/zeit/content/modules/interfaces.py +++ b/core/src/zeit/content/modules/interfaces.py @@ -280,10 +280,3 @@ class ITickarooLiveblog(zeit.edit.interfaces.IBlock): default='default', required=True, ) - - intersection_type = zope.schema.Choice( - title=_('Intersections'), - source=LiveblogSource('*//intersection_type'), - default='chapter', - required=True, - ) diff --git a/core/src/zeit/content/modules/liveblog.py b/core/src/zeit/content/modules/liveblog.py index 188e9e7e1c..17a7aadb96 100644 --- a/core/src/zeit/content/modules/liveblog.py +++ b/core/src/zeit/content/modules/liveblog.py @@ -20,7 +20,3 @@ class TickarooLiveblog(zeit.edit.block.Element): status = ObjectPathAttributeProperty('.', 'status', ITickarooLiveblog['status']) theme = ObjectPathAttributeProperty('.', 'theme', ITickarooLiveblog['theme']) - - intersection_type = ObjectPathAttributeProperty( - '.', 'intersection_type', ITickarooLiveblog['intersection_type'] - ) From c7aebe21aec927ad5646287c259d7eeca63f1b1c Mon Sep 17 00:00:00 2001 From: Adrian Heine Date: Mon, 9 Sep 2024 10:50:47 +0200 Subject: [PATCH 2/2] ZO-6198: Remove translations --- core/src/zeit/locales/de/LC_MESSAGES/zeit.cms.po | 6 +----- core/src/zeit/locales/en/LC_MESSAGES/zeit.cms.po | 6 +----- core/src/zeit/locales/zeit.cms.pot | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/core/src/zeit/locales/de/LC_MESSAGES/zeit.cms.po b/core/src/zeit/locales/de/LC_MESSAGES/zeit.cms.po index eb1a8ecc9c..df64b12aa0 100644 --- a/core/src/zeit/locales/de/LC_MESSAGES/zeit.cms.po +++ b/core/src/zeit/locales/de/LC_MESSAGES/zeit.cms.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Unknown\n" -"POT-Creation-Date: Thu Sep 5 18:02:36 2024\n" +"POT-Creation-Date: Mon Sep 9 10:27:07 2024\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -3872,10 +3872,6 @@ msgstr "Liveblog-Status" msgid "Liveblog theme" msgstr "Liveblog-Theme" -#: zeit/content/modules/interfaces.py:285 -msgid "Intersections" -msgstr "Zwischenüberschriften" - #: zeit/content/portraitbox/browser/form.py:20 #: zeit/magazin/browser/portraitbox.py:26 msgid "Portrait" diff --git a/core/src/zeit/locales/en/LC_MESSAGES/zeit.cms.po b/core/src/zeit/locales/en/LC_MESSAGES/zeit.cms.po index 478abe46e5..79c3224b15 100644 --- a/core/src/zeit/locales/en/LC_MESSAGES/zeit.cms.po +++ b/core/src/zeit/locales/en/LC_MESSAGES/zeit.cms.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: zeit.cms\n" -"POT-Creation-Date: Thu Sep 5 18:02:36 2024\n" +"POT-Creation-Date: Mon Sep 9 10:27:07 2024\n" "PO-Revision-Date: \n" "Last-Translator: Wolfgang Schnerring \n" "Language-Team: \n" @@ -3849,10 +3849,6 @@ msgstr "" msgid "Liveblog theme" msgstr "" -#: zeit/content/modules/interfaces.py:285 -msgid "Intersections" -msgstr "" - #: zeit/content/portraitbox/browser/form.py:20 #: zeit/magazin/browser/portraitbox.py:26 msgid "Portrait" diff --git a/core/src/zeit/locales/zeit.cms.pot b/core/src/zeit/locales/zeit.cms.pot index 8639b286af..ea8db9109a 100644 --- a/core/src/zeit/locales/zeit.cms.pot +++ b/core/src/zeit/locales/zeit.cms.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Unknown\n" -"POT-Creation-Date: Thu Sep 5 18:02:36 2024\n" +"POT-Creation-Date: Mon Sep 9 10:27:07 2024\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" @@ -3928,10 +3928,6 @@ msgstr "" msgid "Liveblog theme" msgstr "" -#: zeit/content/modules/interfaces.py:285 -msgid "Intersections" -msgstr "" - #: zeit/content/portraitbox/browser/form.py:20 #: zeit/magazin/browser/portraitbox.py:26 msgid "Portrait"