diff --git a/server/belga/planning_exports/common.py b/server/belga/planning_exports/common.py index b61e1ebe..17fb9e95 100644 --- a/server/belga/planning_exports/common.py +++ b/server/belga/planning_exports/common.py @@ -132,7 +132,7 @@ def get_subjects(event: Dict[str, Any], language: str): def format_datetime(event: Dict[str, Any], locale: str, format: str): tz = event.get("dates", {}).get("tz") or app.config.get("DEFAULT_TIMEZONE") start_time = event.get("dates", {}).get("start") - return format_date(utc_to_local(tz, start_time), format, locale=locale).capitalize() + return format_date(utc_to_local(tz, start_time), format, locale=locale) def set_metadata(formatted_event: Dict[str, Any], event: Dict[str, Any], locale: str): diff --git a/server/data/planning_export_templates.json b/server/data/planning_export_templates.json index 9ad68296..27016a02 100644 --- a/server/data/planning_export_templates.json +++ b/server/data/planning_export_templates.json @@ -23,20 +23,22 @@ }, { "_id": "dutch_news_events_list", - "init_version": 1, + "init_version": 2, "name": "dutch_news_events_list", "type": "event", "data": { - "body_html_template": "dutch_news_events_list_export.html" + "body_html_template": "dutch_news_events_list_export_body.html", + "headline_template": "dutch_news_events_list_export_headline.html" }, "label": "Internationale sportkalender" },{ "_id": "french_news_events_list", - "init_version": 1, + "init_version": 2, "name": "french_news_events_list", "type": "event", "data": { - "body_html_template": "french_news_events_list_export.html" + "body_html_template": "french_news_events_list_export_body.html", + "headline_template": "french_news_events_list_export_headline.html" }, "label": "Calendrier sportif international" }, diff --git a/server/templates/dutch_news_events_list_export.html b/server/templates/dutch_news_events_list_export_body.html similarity index 88% rename from server/templates/dutch_news_events_list_export.html rename to server/templates/dutch_news_events_list_export_body.html index 1f72e0ba..7c9e8f51 100644 --- a/server/templates/dutch_news_events_list_export.html +++ b/server/templates/dutch_news_events_list_export_body.html @@ -1,6 +1,5 @@ {% set formatted_data = format_event_for_week(items, "nl") %}
-

Internationale sportkalender van {{ formatted_data.start_date }} tot {{ formatted_data.end_date }} {{ formatted_data.month }}

De belangrijkste sportevenementen op de Belgische en internationale sportkalender van {{ formatted_data.start_date }} tot {{ formatted_data.end_date }} {{ formatted_data.month }}:

{% for day_events in formatted_data.events_list %} diff --git a/server/templates/dutch_news_events_list_export_headline.html b/server/templates/dutch_news_events_list_export_headline.html new file mode 100644 index 00000000..36ada7bb --- /dev/null +++ b/server/templates/dutch_news_events_list_export_headline.html @@ -0,0 +1,2 @@ +{% set formatted_data = format_event_for_week(items, "nl") %} +

Internationale sportkalender van {{ formatted_data.start_date }} tot {{ formatted_data.end_date }} {{ formatted_data.month }}

diff --git a/server/templates/french_news_events_list_export.html b/server/templates/french_news_events_list_export_body.html similarity index 87% rename from server/templates/french_news_events_list_export.html rename to server/templates/french_news_events_list_export_body.html index 61d5fbeb..a291511a 100644 --- a/server/templates/french_news_events_list_export.html +++ b/server/templates/french_news_events_list_export_body.html @@ -1,6 +1,5 @@ {% set formatted_data = format_event_for_week(items, "fr") %}
-

Calendrier sportif international du {{ formatted_data.start_date }} au {{ formatted_data.end_date }} {{ formatted_data.month }}

Principaux événements inscrits au calendrier sportif international du {{ formatted_data.start_date }} au {{ formatted_data.end_date }} {{ formatted_data.month }} :

{% for day_events in formatted_data.events_list %} diff --git a/server/templates/french_news_events_list_export_headline.html b/server/templates/french_news_events_list_export_headline.html new file mode 100644 index 00000000..89026eaa --- /dev/null +++ b/server/templates/french_news_events_list_export_headline.html @@ -0,0 +1,2 @@ +{% set formatted_data = format_event_for_week(items, "fr") %} +

Calendrier sportif international du {{ formatted_data.start_date }} au {{ formatted_data.end_date }} {{ formatted_data.month }}

diff --git a/server/tests/planning_export/planning_export_tests.py b/server/tests/planning_export/planning_export_tests.py index a59e58aa..2834bf57 100644 --- a/server/tests/planning_export/planning_export_tests.py +++ b/server/tests/planning_export/planning_export_tests.py @@ -516,20 +516,17 @@ def test_export_week(self): with self.app.app_context(): events = self.events_for_week dutch_template_data = render_template( - "dutch_news_events_list_export.html", items=events, app=self.app - ) - self.assertIn( - "

Internationale sportkalender van Zondag 21 tot Maandag 22 April

", - dutch_template_data, + "dutch_news_events_list_export_body.html", items=events, app=self.app ) + self.assertIn( ( "

De belangrijkste sportevenementen op de Belgische en " - "internationale sportkalender van Zondag 21 tot Maandag 22 April:

" + "internationale sportkalender van zondag 21 tot maandag 22 april:

" ), dutch_template_data, ) - self.assertIn("

Zondag 21 april

", dutch_template_data) + self.assertIn("

zondag 21 april

", dutch_template_data) self.assertIn("

REDWOLVES

", dutch_template_data) self.assertIn( "

New York, United States

", @@ -543,7 +540,7 @@ def test_export_week(self): '

www.google.xom/new

', dutch_template_data, ) - self.assertIn("

Maandag 22 april

", dutch_template_data) + self.assertIn("

maandag 22 april

", dutch_template_data) self.assertIn("

SPORTS

", dutch_template_data) self.assertIn( "

16u00, NExxxxt Monday 22.04.2024

", dutch_template_data @@ -555,20 +552,16 @@ def test_export_week(self): ) french_template_data = render_template( - "french_news_events_list_export.html", items=events, app=self.app - ) - self.assertIn( - "

Calendrier sportif international du Dimanche 21 au Lundi 22 Avril

", - french_template_data, + "french_news_events_list_export_body.html", items=events, app=self.app ) self.assertIn( ( "

Principaux événements inscrits au calendrier sportif " - "international du Dimanche 21 au Lundi 22 Avril :

" + "international du dimanche 21 au lundi 22 avril :

" ), french_template_data, ) - self.assertIn("

Dimanche 21 avril

", french_template_data) + self.assertIn("

dimanche 21 avril

", french_template_data) self.assertIn("

REDWOLVES

", french_template_data) self.assertIn( "

New York, United States

", @@ -582,7 +575,7 @@ def test_export_week(self): '

www.google.xom/new

', french_template_data, ) - self.assertIn("

Lundi 22 avril

", french_template_data) + self.assertIn("

lundi 22 avril

", french_template_data) self.assertIn("

SPORTS

", french_template_data) self.assertIn( @@ -643,19 +636,43 @@ def test_export_week(self): }, ] template_data = render_template( - "dutch_news_events_list_export.html", items=new_events, app=self.app + "dutch_news_events_list_export_body.html", + items=new_events, + app=self.app, ) - self.assertIn("

Donderdag 25 april

", template_data) + self.assertIn("

donderdag 25 april

", template_data) self.assertIn("

00u00, one event

", template_data) self.assertIn("

00u59, Two event

", template_data) template_data = render_template( - "french_news_events_list_export.html", items=new_events, app=self.app + "french_news_events_list_export_body.html", + items=new_events, + app=self.app, ) - self.assertIn("

Jeudi 25 avril

", template_data) + self.assertIn("

jeudi 25 avril

", template_data) self.assertIn("

00u00, one event

", template_data) self.assertIn("

00u59, Two event

", template_data) + french_template_headline_data = render_template( + "french_news_events_list_export_headline.html", + items=events, + app=self.app, + ) + self.assertIn( + "

Calendrier sportif international du dimanche 21 au lundi 22 avril

", + french_template_headline_data, + ) + + dutch_template_headline_data = render_template( + "dutch_news_events_list_export_headline.html", + items=events, + app=self.app, + ) + self.assertIn( + "

Internationale sportkalender van zondag 21 tot maandag 22 april

", + dutch_template_headline_data, + ) + def test_export_tommorow(self): with self.app.app_context(): events = self.events_for_tommorow