Skip to content

Commit

Permalink
Merge pull request #847 from ZeitOnline/ZO-6198_liveblog_intersection…
Browse files Browse the repository at this point in the history
…_types

ZO-6198: Remove liveblog config intersection_type
  • Loading branch information
wosc committed Sep 9, 2024
2 parents e30425b + c7aebe2 commit f010740
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ZO-6198: Remove liveblog config intersection_type
7 changes: 0 additions & 7 deletions core/src/zeit/content/modules/interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
4 changes: 0 additions & 4 deletions core/src/zeit/content/modules/liveblog.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
)
6 changes: 1 addition & 5 deletions core/src/zeit/locales/de/LC_MESSAGES/zeit.cms.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 1 addition & 5 deletions core/src/zeit/locales/en/LC_MESSAGES/zeit.cms.po
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 1 addition & 5 deletions core/src/zeit/locales/zeit.cms.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: Zope 3 Developers <[email protected]>\n"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit f010740

Please sign in to comment.