From 706489095058c59b30bd9d50501233c3c3764ea8 Mon Sep 17 00:00:00 2001
From: ziv <ziv_harpaz@yahoo.com>
Date: Sun, 7 Aug 2022 20:37:48 +0300
Subject: [PATCH] Revert "Merge pull request #2217 from Shai2022/dev" because
 FE is not ready for it yet.

This reverts commit cc94cb32a945018c8c281646b791b820014fd8c0, reversing
changes made to 5d5a2600723392f1a55116a3b5d5b1f28a3ed029.
---
 anyway/backend_constants.py                   |   1 -
 .../accident_count_by_accident_year_widget.py |   8 +++---
 .../injured_count_by_accident_year_widget.py  |   7 ++---
 ...ured_count_per_age_group_stacked_widget.py |   8 ++----
 ...jured_accidents_with_pedestrians_widget.py |   7 ++---
 anyway/widgets/widget_utils.py                |  12 +-------
 messages.pot                                  |  26 ++++++------------
 translations/en/LC_MESSAGES/messages.mo       | Bin 9003 -> 8911 bytes
 translations/en/LC_MESSAGES/messages.po       |  26 ++++++------------
 translations/he/LC_MESSAGES/messages.mo       | Bin 10169 -> 10057 bytes
 translations/he/LC_MESSAGES/messages.po       |  26 ++++++------------
 11 files changed, 38 insertions(+), 83 deletions(-)

diff --git a/anyway/backend_constants.py b/anyway/backend_constants.py
index 2670cbec9..a007ab01b 100644
--- a/anyway/backend_constants.py
+++ b/anyway/backend_constants.py
@@ -104,7 +104,6 @@ def _missing_(cls, value):
 
     LKEY = "label_key"
     VAL = "value"
-    TOTAL = "total"
     SERIES = "series"
 
 
diff --git a/anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py b/anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py
index 88dec7ed5..cfd298ac1 100644
--- a/anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py
+++ b/anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py
@@ -2,7 +2,7 @@
 
 from flask_babel import _
 
-from anyway.backend_constants import AccidentSeverity, BE_CONST
+from anyway.backend_constants import AccidentSeverity
 from anyway.infographics_dictionaries import segment_dictionary
 from anyway.models import AccidentMarkerView
 from anyway.request_params import RequestParams
@@ -29,6 +29,7 @@ def __init__(self, request_params: RequestParams):
         self.information = "Fatal, severe and light accidents count in the specified years, split by accident severity"
 
     def generate_items(self) -> None:
+
         res1 = get_accidents_stats(
             table_obj=AccidentMarkerView,
             filters=self.request_params.location_info,
@@ -46,7 +47,7 @@ def generate_items(self) -> None:
                 AccidentSeverity.LIGHT.value: 0,
             },
         )
-        self.items = format_2_level_items(res2, None, AccidentSeverity, total=True)
+        self.items = format_2_level_items(res2, None, AccidentSeverity)
 
     @staticmethod
     def localize_items(request_params: RequestParams, items: Dict) -> Dict:
@@ -54,8 +55,7 @@ def localize_items(request_params: RequestParams, items: Dict) -> Dict:
             "title": _("Accidents in segment")
             + " "
             + segment_dictionary[request_params.location_info["road_segment_name"]],
-            "labels_map": {**gen_entity_labels(AccidentSeverity),
-             **{BE_CONST.TOTAL : _("total_accidents")}}
+            "labels_map": gen_entity_labels(AccidentSeverity),
         }
         return items
 
diff --git a/anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py b/anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py
index 7d08a743f..7905c5532 100644
--- a/anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py
+++ b/anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py
@@ -2,7 +2,7 @@
 
 from flask_babel import _
 
-from anyway.backend_constants import InjurySeverity, BE_CONST
+from anyway.backend_constants import InjurySeverity
 from anyway.infographics_dictionaries import segment_dictionary
 from anyway.models import InvolvedMarkerView
 from anyway.request_params import RequestParams
@@ -46,15 +46,14 @@ def generate_items(self) -> None:
                 InjurySeverity.LIGHT_INJURED.value: 0,
             },
         )
-        self.items = format_2_level_items(res2, None, InjurySeverity, total=True)
+        self.items = format_2_level_items(res2, None, InjurySeverity)
 
     @staticmethod
     def localize_items(request_params: RequestParams, items: Dict) -> Dict:
         items["data"]["text"] = {
             "title": _("Number of injured in accidents, per year, split by severity")
             + f" - {segment_dictionary[request_params.location_info['road_segment_name']]}",
-            "labels_map": {**gen_entity_labels(InjurySeverity),
-            **{BE_CONST.TOTAL : _("total_injured")}}
+            "labels_map": gen_entity_labels(InjurySeverity),
         }
         return items
 
diff --git a/anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py b/anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py
index 6f7f11a74..27806e6d0 100644
--- a/anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py
+++ b/anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py
@@ -40,9 +40,8 @@ def generate_items(self) -> None:
                 {BE.LKEY: inj.get_label(), BE.VAL: severity_dict.get(inj.value, 0)}
                 for inj in INJURY_ORDER
             ]
-            structured_data_list.append({BE.LKEY: age_group,
-            BE.TOTAL: sum([item[BE.VAL] for item in ordered_list]),
-            BE.SERIES: ordered_list})
+            structured_data_list.append({BE.LKEY: age_group, BE.SERIES: ordered_list})
+
         self.items = structured_data_list
 
     @staticmethod
@@ -50,8 +49,7 @@ def localize_items(request_params: RequestParams, items: Dict) -> Dict:
         items["data"]["text"] = {
             "title": _("Killed and injury stacked per age group"),
             "subtitle": _("In") + " " + request_params.location_info["road_segment_name"],
-            "labels_map": {**gen_entity_labels(InjurySeverity),
-            **{BE.TOTAL : _("total_injured")}}
+            "labels_map": gen_entity_labels(InjurySeverity),
         }
         return items
 
diff --git a/anyway/widgets/urban_widgets/injured_accidents_with_pedestrians_widget.py b/anyway/widgets/urban_widgets/injured_accidents_with_pedestrians_widget.py
index 96b65a448..664f75bdd 100644
--- a/anyway/widgets/urban_widgets/injured_accidents_with_pedestrians_widget.py
+++ b/anyway/widgets/urban_widgets/injured_accidents_with_pedestrians_widget.py
@@ -7,7 +7,7 @@
 from flask_babel import _
 from anyway.request_params import RequestParams
 from anyway.app_and_db import db
-from anyway.backend_constants import InjurySeverity, InjuredType, BE_CONST
+from anyway.backend_constants import InjurySeverity, InjuredType
 from anyway.widgets.widget_utils import (
     add_empty_keys_to_gen_two_level_dict,
     gen_entity_labels,
@@ -102,7 +102,7 @@ def generate_items(self) -> None:
                 ],
                 InjurySeverity.codes(),
             )
-            self.items = format_2_level_items(res, None, InjurySeverity, total=True)
+            self.items = format_2_level_items(res, None, InjurySeverity)
 
         except Exception as e:
             logging.error(f"InjuredAccidentsWithPedestriansWidget.generate_items(): {e}")
@@ -113,7 +113,6 @@ def localize_items(request_params: RequestParams, items: Dict) -> Dict:
         items["data"]["text"] = {
             "title": _("Pedestrian accidents by severity and year")
             + f" - {request_params.location_text}",
-            "labels": {**gen_entity_labels(InjurySeverity),
-            **{BE_CONST.TOTAL : _("total_injured")}}
+            "labels": gen_entity_labels(InjurySeverity),
         }
         return items
diff --git a/anyway/widgets/widget_utils.py b/anyway/widgets/widget_utils.py
index ee7ca5a46..0704470af 100644
--- a/anyway/widgets/widget_utils.py
+++ b/anyway/widgets/widget_utils.py
@@ -123,7 +123,6 @@ def format_2_level_items(
     items: Dict[typing.Union[int, str], dict],
     level1_vals: Optional[Type[LabeledCode]],
     level2_vals: Optional[Type[LabeledCode]],
-    total: bool = False,
 ):
     res: List[Dict[str, Any]] = []
     for l1_code, year_res in items.items():
@@ -132,16 +131,7 @@ def format_2_level_items(
         for l2_code, num in year_res.items():
             l2 = level2_vals.labels()[level2_vals(l2_code)] if level2_vals else l2_code
             series_data.append({BE_CONST.LKEY: l2, BE_CONST.VAL: num})
-        if total:
-            res.append(
-                {
-                    BE_CONST.LKEY: l1,
-                    BE_CONST.TOTAL: sum([item[BE_CONST.VAL] for item in series_data]),
-                    BE_CONST.SERIES: series_data,
-                }
-            )
-        else:
-            res.append({BE_CONST.LKEY: l1, BE_CONST.SERIES: series_data})
+        res.append({BE_CONST.LKEY: l1, BE_CONST.SERIES: series_data})
     return res
 
 
diff --git a/messages.pot b/messages.pot
index f47f237c6..899df3592 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-06-27 01:14+0300\n"
+"POT-Creation-Date: 2022-05-27 14:02+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: anyway/backend_constants.py:146
+#: anyway/backend_constants.py:145
 msgid "killed"
 msgstr ""
 
-#: anyway/backend_constants.py:147
+#: anyway/backend_constants.py:146
 msgid "severe injured"
 msgstr ""
 
-#: anyway/backend_constants.py:148
+#: anyway/backend_constants.py:147
 msgid "light injured"
 msgstr ""
 
@@ -257,14 +257,10 @@ msgid ""
 "period. Three most common accident types are displayed"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:54
+#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:55
 msgid "Accidents in segment"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:58
-msgid "total_accidents"
-msgstr ""
-
 #: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:63
 msgid ""
 "Fatal, severe and light accidents count in the specified years, split by "
@@ -350,13 +346,7 @@ msgstr ""
 msgid "Number of injured in accidents, per year, split by severity"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:57
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:54
-#: anyway/widgets/urban_widgets/injured_accidents_with_pedestrians_widget.py:117
-msgid "total_injured"
-msgstr ""
-
-#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:62
+#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:61
 msgid ""
 "Fatal, severe and light injured count in the specified years, split by "
 "injury severity"
@@ -366,11 +356,11 @@ msgstr ""
 msgid "Number of Injuries in accidents by severity"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:51
+#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:50
 msgid "Killed and injury stacked per age group"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:52
+#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:51
 #: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_widget.py:40
 msgid "In"
 msgstr ""
diff --git a/translations/en/LC_MESSAGES/messages.mo b/translations/en/LC_MESSAGES/messages.mo
index c7c64931ae093069af83115f3e91f95b0e7b4cf1..caff781b680c212d1b25d1bd91bcea51b4b4c9f0 100644
GIT binary patch
delta 1754
zcmYMzTS(MF6vy#Xu4a~Qt>!Jwbrr<RhKeDiVOc2^QB+EZ4^oLp7kdfRpfxa9D2q~i
z=*d>-s$DQ5GK+e1g_eqnpdt#AqN0T8!5;el+&{GJ@|l_a&z$o=GjqKzvN7=9;~F$R
z?fkO%?Tb<G|7RpFIzEa842Lm@Gq@CwE-*{MK3s?)T!AB)iBnGhGiK9|jW^4~Jj^i*
zSUrtm2HG$k`_YFZScehxV=AjJ!wuMhP1uEDjA%T;tPxWdMFZ?d%{zlyf5Pz#*3w_L
zm^FxRyJ=|R7`iYa(JTYqI3EkqgC$PC29;nf>djlR0J||3Lzs+LP!)QB6w97s1HQy&
zEKVW;;#-i07eApgb-B&*u@n`k0hePZ=HdWSI=hQi_zD%+vm}~mIu_C|MkUaIUTniM
z45GIBJ_fWGuW4wnX0ZZOnN^KjP!$QHD$s{TID~s}3i;Yf{$v+yt>b3&(%*$j{0M5D
zvq<&rJkC|hL;X1yc7*|*yIZJ|-a)qACQ+q(jtcMwsh)j8E$|D|@Q*X@rtW$^8?|me
zaxAO_HNO%ye;u;hwk?_ZYeF*v%4{#P3)X?Dcnta4pyO54n@perJVDJ5qvkzx`X5k%
zr%}((VBb6vMV0;pCs}7E6rd5L5k{4ACsF4P6)NLy)OG4bZPBpPe~7wH?@(Jfi#iiI
zltX8z26dbEqs~w-*5PIJ;}0aH1+sXmgGM>(I)yNTSzLie{Dum!p6Hs`h6*s~_!w*H
zf5#>)Wy3Y^B<jsSqHfbP&c}JYKD%Wuq#v*}8p<#e_2z3(rP+bn<8GvC)`P0h0IKAd
zumMN08Dl7i5@<m$j-wKNi}@H&85PHm<YL<~SNHz_4VCURR^bg);IF7me_|oV@Q@Pl
zqZezi3|o*K>>R36H<4o43)F4;fz_DjjaH-uwQegG1!#2A*n`8U0CBm|y-#=aA%9s3
zD)X(V(zc@x?IE126zWj+pl(wTRnb$Z+jJ3CxofDibsGb^4&yYmz$9`mEP@)JMosvQ
zTKF&ORJ*977I34U%RpVH0@U*rsKlyJx1t_7pVo-l%7c!_eO5X5CW8zpzy;I-A=JdH
sPX8V%@FUclhkaw=xJ`-uWht!*tNi7a-m;3-rR8HoDeXzFuEVYN50s>+SpWb4

delta 1845
zcmaLWeN4?!9LMo5rScHEg~-G0Rw$B4C}xtjR?I(@wX6p<tE?KgO=x#!#%7*Io3Zte
znM5;-<}WOpm1UXC%sj*x3N0Jf#(00azs-N{?%nI0bARW2&+q#^r+4F(EZ-|vV3YBw
z<~N(4H$c6ApPnH9_(NR4@Bkh`SFl+ap2rAm!|~XObFl|!;h@tG3Nf2QKMrGX1I{z^
z*$x_u7&wfP*p43T!7LoYL`-G%X;_Z6xEC960DCn)!7LwBCi(*$Ma{d0TK}cv_(^6N
z^jBaZ@of(cP3*%!Ob9ibiAgvXv(bgQPQMtn!7|jFAHoHA4##09hGQ2hLobk|*;mZN
z?^uL6li2|At%Zgg1E%<Q8jG>?x1a*mV-%jnXuN@>&YogA{y+s@Hr2n;RTxh{2epBE
zbmL)6#uikmpQBH;_(?;xisI=MOvN==jmk(1Dg$kpfOoMB2a&IB=1;0%C5~0-rtd{<
zya~0=b)*W`fuosnk$=vIbuplG_Xw5JCrH`t6DoDzPyt4e>{$T$)dFES181PdlTgpE
zMXj5O91F`u%`ZSbSBg~IYQxFDChTWGJ3EL}!%pCIY(~Cz)3F=%CNEI|-lFCYpymxb
zeZ7SO2P4%n7b>s^HGe4{8^a;=(NHb!akO=a`tb;c5M8M~g*;*xP;YPxb-g-KC41xa
zf1$2d6zNb&SEJ6zHq_~FMBT2-s58}xS?GIDBay~p{?+v=#9FLFU9W!Z)i_ro9}|eG
z00&U>E}{bTIsU;6`im%hA=aSgb)(+g&D-jB#o<`p|8+Ddt7Z5HEDyEAt*AHOhsw-J
zRLyT8S+?7#3_V7b;2r9E4Pp_lCmq^AGrDmEwb5CmFBY@Vqx)Y?L#OmOMq?`~bv>Al
zpHYDqGN_F%!FXJc+CVkBu@RH88QFt9LS^a;k`xPb`)}7`TtmMU1AR1_X=vdKsO!~%
zW%vdaAd_9G_W6z_$X`~4+W1jaYA>M<@l_nn6zY)P#sIvJ%IE{s?Rt$qrS2mQ1sFn|
z(h<}G!PJ4{VWFt;IMnmYQ46P`PI(4u{wCCO1*q#)fqH%yYGVzkTXG0FuXe^`1*5gR
z!hmXe2lXa>r~uDU3-qHVesKCfP=SA=u2%?oR^Uj~{P{8MtwGtLvunMjJBv%VZ?7z`
vsPXPL?`XfWrmB8dMfvIB@EsFU6PK-YFHKHMPH8WTsGRKi-vskE)K%DDP9VtP

diff --git a/translations/en/LC_MESSAGES/messages.po b/translations/en/LC_MESSAGES/messages.po
index d65c7bc05..00df02cda 100644
--- a/translations/en/LC_MESSAGES/messages.po
+++ b/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-06-27 01:14+0300\n"
+"POT-Creation-Date: 2022-05-27 14:02+0300\n"
 "PO-Revision-Date: 2020-11-26 16:45+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: anyway/backend_constants.py:146
+#: anyway/backend_constants.py:145
 msgid "killed"
 msgstr "killed"
 
-#: anyway/backend_constants.py:147
+#: anyway/backend_constants.py:146
 msgid "severe injured"
 msgstr "severe injured"
 
-#: anyway/backend_constants.py:148
+#: anyway/backend_constants.py:147
 msgid "light injured"
 msgstr "light injured"
 
@@ -258,14 +258,10 @@ msgid ""
 "period. Three most common accident types are displayed"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:54
+#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:55
 msgid "Accidents in segment"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:58
-msgid "total_accidents"
-msgstr ""
-
 #: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:63
 msgid ""
 "Fatal, severe and light accidents count in the specified years, split by "
@@ -351,13 +347,7 @@ msgstr ""
 msgid "Number of injured in accidents, per year, split by severity"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:57
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:54
-#: anyway/widgets/urban_widgets/injured_accidents_with_pedestrians_widget.py:117
-msgid "total_injured"
-msgstr ""
-
-#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:62
+#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:61
 msgid ""
 "Fatal, severe and light injured count in the specified years, split by "
 "injury severity"
@@ -367,11 +357,11 @@ msgstr ""
 msgid "Number of Injuries in accidents by severity"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:51
+#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:50
 msgid "Killed and injury stacked per age group"
 msgstr ""
 
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:52
+#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:51
 #: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_widget.py:40
 msgid "In"
 msgstr ""
diff --git a/translations/he/LC_MESSAGES/messages.mo b/translations/he/LC_MESSAGES/messages.mo
index b568c16e97644cc7c038831f6b1cc95ab0890f3b..436a2d07d8c50498cdbb24c0631443da8ab0fd97 100644
GIT binary patch
delta 1753
zcmYM#duYvJ9LMpm*@fB7*@a;oGh4PZIh<K-ayhwVnnjLVvp<FwYo?@J;$))p&mnA5
zO6(t(rp!Ssl*>Pxaw{9rq7^CsOi2-We|Da7I_vd3&+qr#zR&kLyI0q{Iy~q}>@Yq%
z_?yDtw$ZBn|8ynC+pl8@&3zcb?>HV0rkLem6vtvGPQ@;qgwI_4GZs)!8e=vCXW%rm
zu&tm_Mne-$#4}ikUAP=yU^(V7dM+--R@{vHu@7IUJ=JVI=8TI^(2VML5;gt<=T{6;
z&rM?t=C_R$)G>yMn3`^ukC~W&v(SS+S6_r$U=X$Q?O1{bFbO*`8?T@ubRP+pJ;xBf
z!FnvqU;)f;5ei-$Laj70)2s;Rpe738WZZ|-u^kDW-N9<?M@{U>iZ65`&Z1t1T0jWB
z*o1zJppLo+!#axr3OcLb7{EMwEx=W%h(u5kh+-*T#72CEd~G%lIR#tntU)jJb*P2!
zMU8U`iN2l1kw|%nKY3wSXi(nWK!x-ca_rWN3f*he1n-dO*$`@gVVr<JU3(^R*ZT#i
zaf^_&FdwRaC93}t<g~3WoA|3kJq=pfR^$|{74z^g^0f}<Rn$%%peA^X>feXz_sZ2j
zq9*==djC5{N3l>;k{=_JXX1r0g$RYGsOwS7tlCjCYQUqY95{_S``f6F1FrrDb#&9{
zq@%3D3T$xocIRDep#1}CoN89VlosAX;T(lM*o|qVemN_Bh;7urF}iZ0m4lpzU8v;x
zh)Xe*OxlTccoTcD16$aQA~2dC18pD!6VQ*GmIaXK+<ywQX;_Qe*%4R29Dl+3k*L`x
zRI>d*g*=5Tup2Y*1ctFwb#MIkbfd0iKPobR(T9a>U-ddH(f!{uQZPG@^Lg+DHNh{`
z5sYH_i!lq?oUK7EbQi9~cGLz2u@ci6y$F}#2Hc7J@G&YP)jU)LmSceVZ4(8(Z~}EE
zDU7b{EI{qN6qOqb(Tnw{+i?h$&Bsyix1$z(2@~)JYQZto#4k}v{vLH3zM%5YhAE7M
zwAh^$@>5`bRL3AH+iOu1g<N|hY5^^nj0atN8*1VxlAm_X`3SY4x6W_H1YA4OLCLY0
vj2={o@?E<RHF1S|9*p%S*QB5E=WI`{D4$#D^#`iv%#B^l8RDPWz-jvjJD;la

delta 1864
zcmYM!du)tZ7{~EPYsac}n-+^M!?qQrs?-p-#j0B;)qhqK_f`cZX2UdTMKa<NlBNhI
zXswj^qb|*+$|lW5)a4JNLQ1?LE(wuP2`O<)Bz%A7BqlTYyyv{<yw5q$dEU8R&^$l-
z*xxy3eAe<y<rhg*>&K_n7w^A`!{~0uUFh#()*EXv1skv{UdBP#iUaVKYx{mS`;B%w
z{*Hg*V6&*L;$j3HJMmX+!lBrTv+xaOVUVZy!BPz4CalDEyrupmvjv#jEgql>HSb^4
z^B+08{$e(R_BdQfe5>F>6YpSW%<OK~AG0w5=b|4&uDuMkz!KEXci=Fr!JqIlCgU|!
zh8`kGv)A|+zQ@Iw--87Z-|D#tU}DesO4Bfnb|ETIIS#}_I0Vljsk3`H2|u6$kLeX(
z=mZ>2J0G=xatz>3%)xrpQ9r<_&f+5%I;(+<&cz^3#<i%7)T1)cfSK5WCHM;YS^+mX
z1zYYc!vO6FYT+@|a~hFTu>bITru^ie`mk$ssP1l~QhFCTc6*6R-CI<E&q($xk^Jfb
zy|EwmL-l8)#!o>#cP3I67DCN0LX9g%PTRuC<X;mu)1j4ZLr%l?U|&3neC@pRI%+46
zPywEz=C`Bfb-1>6p}<{`(=k6P@KDtJ(OBJyB8+mOs=q>Mr{hE1g$YF0>r#c<;Yn10
zOQ@Q-jjDxrsCj)Dr1m7#Q7%CpZ3T|QBd*=%{D4d8j}9QZCRQS`tribqBR1kZUWF`H
z`USVr&g4K<8x1%X+fl_fh>DttbFd7n@hpDA7@lS~%E)y79JGNDCg}YSbHTCN2GoEZ
zI12Zoc6QOVpS$}hls;Lu!KmUJi#mcl{2N2K8!zB-wFB|D=?&^NO<}jn%w!y?_kX$T
zs74KFbl%4x?M^IL0Vbf1;18UJ1<2-X4{D)ja4xo?Hjqk`@tBWkxDAW29xG6tNyN8G
zE|h`on2QHd16ol>lE>3kt&31QUyZ7b%^1KM)Z6kus>rUQ#<!ss`~(y5HEO{fs7&|B
zApffR{#@wwNJj<CMjz%Oo3Rk`7hz%4#4V`muR;ad@A~Ud3pkBFY<B%EsK7UndbJnM
zuNnODYDay^yUaxGWU6yE`e+xTGF0UH%TR$gB6Vt8oQF~4&o-U(&Fh{Tjufw3R=i@x
zn$nf)BO5L9y}f3AS^0*QrTaUQS0x3r#*7b)&Y75#+f<VB%pa@?c(vY<fOo(<<?Z!i
dULC(v<{k5X+^F+Tc>BEL-eK<_-H3Vn>>HZ7-**52

diff --git a/translations/he/LC_MESSAGES/messages.po b/translations/he/LC_MESSAGES/messages.po
index 7b2f2a9f9..a516b5e65 100644
--- a/translations/he/LC_MESSAGES/messages.po
+++ b/translations/he/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-06-27 01:14+0300\n"
+"POT-Creation-Date: 2022-05-27 14:02+0300\n"
 "PO-Revision-Date: 2020-10-16 15:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: he\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: anyway/backend_constants.py:146
+#: anyway/backend_constants.py:145
 msgid "killed"
 msgstr "הרוג/ה"
 
-#: anyway/backend_constants.py:147
+#: anyway/backend_constants.py:146
 msgid "severe injured"
 msgstr "פצוע/ה קשה"
 
-#: anyway/backend_constants.py:148
+#: anyway/backend_constants.py:147
 msgid "light injured"
 msgstr "פצוע/ה קל"
 
@@ -264,14 +264,10 @@ msgstr ""
 "התפלגות תאונות לפי סוג התאונה במקטע, בפרק הזמן הנבחר. מוצגים 3 סוגי "
 "התאונות הנפוצים ביותר במקום זה"
 
-#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:54
+#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:55
 msgid "Accidents in segment"
 msgstr "תאונות במקטע"
 
-#: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:58
-msgid "total_accidents"
-msgstr "סך כל התאונות"
-
 #: anyway/widgets/suburban_widgets/accident_count_by_accident_year_widget.py:63
 msgid ""
 "Fatal, severe and light accidents count in the specified years, split by "
@@ -364,13 +360,7 @@ msgstr "התפלגות התאונות הקטלניות לפי סוג, תאונו
 msgid "Number of injured in accidents, per year, split by severity"
 msgstr "מספר נפגעים לפי שנה, לפי חומרה"
 
-#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:57
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:54
-#: anyway/widgets/urban_widgets/injured_accidents_with_pedestrians_widget.py:117
-msgid "total_injured"
-msgstr "סך כל הנפגעים"
-
-#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:62
+#: anyway/widgets/suburban_widgets/injured_count_by_accident_year_widget.py:61
 msgid ""
 "Fatal, severe and light injured count in the specified years, split by "
 "injury severity"
@@ -382,11 +372,11 @@ msgstr ""
 msgid "Number of Injuries in accidents by severity"
 msgstr "מספר תאונות לפי חומרה"
 
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:51
+#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:50
 msgid "Killed and injury stacked per age group"
 msgstr "חומרת פגיעה לפי קבוצת גיל"
 
-#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:52
+#: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_stacked_widget.py:51
 #: anyway/widgets/suburban_widgets/killed_and_injured_count_per_age_group_widget.py:40
 msgid "In"
 msgstr "במקטע"