Merge branch 'main' into visual-tests-for-dark-mode

Author: AvivAbachi

.all-contributorsrc

@@ -298,14 +298,24 @@
         "code"
       ]
     },
+    {
+      "login": "Hatzilu",
+      "name": "Hatzilu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74069208?v=4",
+      "profile": "https://github.com/Hatzilu",
+      "contributions": [
+        "code"
+      ]
+    },
     {
       "login": "AvivAbachi",
       "name": "Aviv",
       "avatar_url": "https://avatars.githubusercontent.com/u/15000215?v=4",
       "profile": "https://github.com/AvivAbachi",
       "contributions": [
         "code",
-        "test"
+        "test",
+        "mentoring"
       ]
     },
     {

README.md

@@ -102,7 +102,8 @@ https://github.com/hasadna/open-bus-map-search/blob/main/src/model/busStop.ts#L4
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ofirc77"><img src="https://avatars.githubusercontent.com/u/170853216?v=4?s=100" width="100px;" alt="ofirc77"/><br /><sub><b>ofirc77</b></sub></a><br /><a href="#code-ofirc77" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/GuyKe5"><img src="https://avatars.githubusercontent.com/u/101594251?v=4?s=100" width="100px;" alt="Guy Keren"/><br /><sub><b>Guy Keren</b></sub></a><br /><a href="#code-GuyKe5" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AvivAbachi"><img src="https://avatars.githubusercontent.com/u/15000215?v=4?s=100" width="100px;" alt="Aviv"/><br /><sub><b>Aviv</b></sub></a><br /><a href="#code-AvivAbachi" title="Code">💻</a> <a href="#test-AvivAbachi" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Hatzilu"><img src="https://avatars.githubusercontent.com/u/74069208?v=4?s=100" width="100px;" alt="Hatzilu"/><br /><sub><b>Hatzilu</b></sub></a><br /><a href="#code-Hatzilu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AvivAbachi"><img src="https://avatars.githubusercontent.com/u/15000215?v=4?s=100" width="100px;" alt="Aviv"/><br /><sub><b>Aviv</b></sub></a><br /><a href="#code-AvivAbachi" title="Code">💻</a> <a href="#test-AvivAbachi" title="Tests">⚠️</a> <a href="#mentoring-AvivAbachi" title="Mentoring">🧑‍🏫</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/RGvirer"><img src="https://avatars.githubusercontent.com/u/150089166?v=4?s=100" width="100px;" alt="Rivka Gvirer"/><br /><sub><b>Rivka Gvirer</b></sub></a><br /><a href="#code-RGvirer" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/krasnoff"><img src="https://avatars.githubusercontent.com/u/3822883?v=4?s=100" width="100px;" alt="krasnoff"/><br /><sub><b>krasnoff</b></sub></a><br /><a href="#code-krasnoff" title="Code">💻</a></td>
     </tr>

src/locale/en.json

@@ -21,6 +21,8 @@
   "gaps_patterns_page_description": "A graphic display of routes performed according to schedule, grouped by time of day\\severity, by user-given bus operator, route number, route & date",
   "singleline_map_page_title": "Map by line",
   "singleline_map_page_description": "Display of bus route on map by user-given bus operator, vehicle number, route number, route, date & time",
+  "singleline_map_page_route": "By Route",
+  "singleline_map_page_vehicle_id": "By Vehicle ID",
   "open_menu_description": "Displays different options and parameters which are accessible in the application",
   "choose_datetime": "Date and time",
   "choose_date": "Date",

src/locale/he.json

@@ -21,6 +21,8 @@
   "gaps_patterns_page_description": "תצוגה גרפית של אחוז הנסיעות שבוצעו בהתאם ללוח הזמנים בחלוקה לשעות\\רמת חומרה, לפי חברת אוטובוסים, מספר קו, מסלול ותאריך",
   "singleline_map_page_title": "מפה לפי קו",
   "singleline_map_page_description": "תצוגה של מסלול קו על מפה ע\"פ נתוני חברת אוטובוסים, מספר רכב, קו, מסלול, תאריך ושעה",
+  "singleline_map_page_route": "לפי מסלול",
+  "singleline_map_page_vehicle_id": "לפי מספר רכב",
   "open_menu_description": "תצוגה של שלל אפשרויות ופרמטרים שונים הניתנים לביצוע באפליקצייה",
   "choose_datetime": "תאריך ושעה",
   "choose_date": "תאריך",

src/pages/singleLineMap/index.tsx

@@ -101,14 +101,13 @@ const SingleLineMapPage = () => {
             <ToggleButtonGroup
               value={type}
               color="primary"
+              dir="rtl"
               onChange={handleTypeChange}
               sx={{ height: 56 }}
               exclusive
               fullWidth>
-              <ToggleButton value="routes" defaultChecked>
-                לפי מסלול
-              </ToggleButton>
-              <ToggleButton value="vehicle">לפי מספר רכב</ToggleButton>
+              <ToggleButton value="routes">{t('singleline_map_page_route')}</ToggleButton>
+              <ToggleButton value="vehicle">{t('singleline_map_page_vehicle_id')}</ToggleButton>
             </ToggleButtonGroup>
           </Grid>
         </Grid>