Merge pull request #2726 from data-for-change/dev

merge dev into master
data-for-change · Oct 30, 2024 · 70c48f0 · 70c48f0
2 parents fe0148d + fde7199
commit 70c48f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/anyway/widgets/all_locations_widgets/accident_count_by_severity_widget.py b/anyway/widgets/all_locations_widgets/accident_count_by_severity_widget.py
@@ -110,8 +110,9 @@ def get_transcription(request_params: RequestParams, items: Dict):
             incident_keyword=_("accidents"),
             out_of_them_keywoard=_("out of them (feminine)"),
         )
+        non_empty_texts = [text for text in [severity_fatal_count_text, severity_severe_count_text, severity_light_count_text] if text]
         text += join_strings(
-            [severity_fatal_count_text, severity_severe_count_text, severity_light_count_text],
+            non_empty_texts,
             sep_a=" ,",
             sep_b=_(" and "),
         )

diff --git a/anyway/widgets/all_locations_widgets/injured_count_by_severity_widget.py b/anyway/widgets/all_locations_widgets/injured_count_by_severity_widget.py
@@ -129,8 +129,10 @@ def get_transcription(request_params: RequestParams, items: Dict):
             people_phrase=_("people from car accidents"),
             out_of_them_keywoard=_("out of them (masculine plural)"),
         )
+
+        non_empty_texts = [text for text in [killed_count_text, severity_severe_count_text, severity_light_count_text] if text]
         text += join_strings(
-            [killed_count_text, severity_severe_count_text, severity_light_count_text],
+            non_empty_texts,
             sep_a=" ,",
             sep_b=_(" and "),
         )