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

ZO-6198: Remove liveblog config intersection_type #847

Merged
merged 3 commits into from
Sep 9, 2024
Merged

ZO-6198: Remove liveblog config intersection_type #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00507f3
ZO-6198: Remove liveblog config intersection_type
adrian-zon Sep 5, 2024
6e6d36f
Merge branch 'main' into A/ZO-6198_liveblog_intersection_types
adrian-zon Sep 9, 2024
c7aebe2
ZO-6198: Remove translations
adrian-zon Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/docs/changelog/ZO-6198_liveblog_intersection_types.change
View file
Open in desktop
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
View file
Open in desktop
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'),
adrian-zon marked this conversation as resolved.
Show resolved Hide resolved
source=LiveblogSource('*//intersection_type'),
default='chapter',
required=True,
)
4 changes: 0 additions & 4 deletions core/src/zeit/content/modules/liveblog.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading