From fdd1b7b7350a485a49b4bdd19f3730c7b0d062d3 Mon Sep 17 00:00:00 2001 From: israel zusha rotenberg <100128949+zushar@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:25:43 +0300 Subject: [PATCH 1/7] refactor: Remove unused Alert component and update video title in TimeBasedMapPage --- src/locale/en.json | 398 ++++++++++++++-------------- src/locale/he.json | 427 +++++++++++++++---------------- src/pages/timeBasedMap/index.tsx | 11 +- 3 files changed, 411 insertions(+), 425 deletions(-) diff --git a/src/locale/en.json b/src/locale/en.json index 8daae722..9eab40ed 100644 --- a/src/locale/en.json +++ b/src/locale/en.json @@ -1,203 +1,201 @@ { - "homepage": { - "welcome": "Welcome to Databus", - "databus_definition": "The open platform for real data on the quality of public transportation lines in Israel", - "website_goal": "The purpose of the site is to improve the quality of public transportation in Israel by providing reliable information to journalists, citizens, transportation companies, and government officials in Israel.", - "show_button": "Show", - "copyright": "ยฉ The Public Knowledge Workshop" - }, - "homepage_title": "Home", - "dashboard_page_title": "Public transport operators according to planned trips", - "dashboard_page_description": "A graphic display of public transportation rides - ratio of successful actual rides / total rides scheduled. Grouped by bus operators (Egged, Dan, Metropolin etc)", - "timeline_page_title": "Trips History", - "timeline_page_description": "Displays actual vs scheduled stop times by user-given bus operator, route number & stop name", - "time_based_map_page_title": "Time based map", - "time_based_map_page_description": "Displays all buses locations on map based on user-given date, time & minutes range", - "gaps_page_title": "Trips that didn't take place", - "gaps_page_description": "Displays routes that did not take place according to schedule by user-given bus operator, route number. route & date", - "gaps_patterns_page_title": "patterns", - "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, route number, route, date & time", - "choose_datetime": "Date and time", - "choose_date": "Date", - "choose_time": "Time", - "choose_operator": "Operating Company", - "operator_placeholder": "For example: Dan", - "choose_line": "line number", - "line_placeholder": "For example: 17a", - "choose_route": "Choosing a travel route (XXX options)", - "choose_stop": "Select a station (XXX options)", - "direction_arrow": "โต", - "date_format": "YYYY-MM-DD", - "time_format": "HH:mm:ss", - "datetime_format": "HH:mm:ss ยท YYYY-MM-DD", - "loading_routes": "Charging routes", - "loading_stops": "Charging stop stations", - "loading_gaps": "Charging trip gaps", - "timestamp_list": "A list of all stop times in the chosen station", - "timestamp_target": "โ Search time", - "timestamp_gtfs": "๐ Planned stop time", - "timestamp_siri": "๐ Actual stop time", - "loading_hits": "Charging travel times", - "line_not_found": "The line is not found", - "hits_not_found": "No planned or actual trips found", - "planned_time": "Scheduled time", - "planned_status": "status", - "ride_as_planned": "โ๏ธ came out as planned", - "ride_missing": "โ missing ride", - "ride_extra": "๐ง An unplanned trip", - "ride_duped": "โ๏ธ Double ride", - "checkbox_only_gaps": "Only gaps", - "dashboard_tooltip_content": "A GPS is attached to every line in Israel that reports the location of the bus every few moments.\nSo what is a missed trip? This is a trip that was planned, but was not reported to have taken place in the GPS data. You can see it in the app for example, but when you wait at the station, it will never arrive", - "worst_lines_page_title": "Least Efficient Lines", - "rides_planned": "planned trips", - "rides_history": "Trips History", - "rides_actual": "Trips out", - "dashboard_page_graph_title": "Exit percentages of total trips by time", - "from_date": "dated", - "to_date": "Until", - "watch_locations_in_range": "View bus locations within a range of", - "minutes": "minutes", - "minutes_5": "5 minutes", - "show_x_bus_locations": "Bus locations", - "from_time_x_to_time_y": "From XXX to YYY", - "choose_start_time": "Select a start time", - "loading_times_tooltip_content": "Loading bus times. Current times available to use", - "group_by_hour_tooltip_content": "Group by hour", - "start": "start", - "end": "end", - "about_title": "About", - "donate_title": "For Donations", - "report_a_bug_title": "Report a bug", - "website_name": "Databus", - "what_is_website": "What is the \"Databus\" site?", - "what_is_website_paragraph": "The database website of the workshop for public knowledge presents data on the quality of public transportation lines in Israel (reliability, accuracy, route). Databus actually connects several government information sources:", - "planning_information": "The planning information - GTFS - which is published every day and contains the details of the lines, station locations, transit times, etc.", - "performance_information": "Performance information - SIRI - Every bus in Israel is attached to a GPS transmitter that reports the location of the bus every few seconds.", - "discovered_mistake": "We discovered an error or outdated information, what do we do?", - "discovered_mistake_paragraph": "Since all the information presented on the site is based on the official sources of information, it is recommended to contact the publisher for clarification or correction of the problem. The \"Databus\" team will be happy to help you understand who the government entity is that published the data or information that requires clarification or correction.", - "privacy": "privacy", - "license": "User license", - "questions": "Questions? Comments? ideas?", - "funding": "Funding", - "mr_meir": "Mr. Asher Meir", - "innovation_authority": "Innovation Authority", - "migdal_company": "\"A tower in the community\"", - "and_smaller_donors": "And other small contributions from my friends and fans of the workshop.", - "github_link": "Go to GitHub", - "dark_mode_tooltip": "Move to Dark mode", - "light_mode_tooltip": "Move to Light mode", - "Change Language": "ืขืืจืืช", - "bug_title": "Title/Summary", - "bug_title_message": "Please enter a title/summary!", - "bug_description": "Description", - "bug_description_message": "Please enter a description!", - "bug_environment": "Environment", - "bug_environment_message": "Please enter the environment!", - "bug_expected_behavior": "Expected Behavior", - "bug_expected_behavior_message": "Please describe the expected behavior!", - "bug_actual_behavior": "Actual Behavior", - "bug_actual_behavior_message": "Please describe the actual behavior!", - "bug_reproducibility": "How often does it happen?", - "bug_reproducibility_message": "Please describe how often does it happen!", - "bug_attachments": "Attachments/Screenshots", - "bug_attachments_upload_button": "Click to Upload", - "bug_submit": "Submit Bug Report", - "bug_contact_name": "Full Name", - "bug_contact_name_message": "Please enter your full name!", - "bug_contact_email": "Email", - "bug_contact_email_message": "Please enter your email!", - "bug_type": "Type of request", - "bug_type_message": "Please enter the type of request", - "bug_type_bug": "Bug", - "bug_type_feature": "Feature Request", - "bug_date_alert": "The end date can not be earlier than the start date", - "funding_paragraph": "The Databus project is developed by the Hasadna for public knowledge, by the contributions of volunteers, and based upon", - "all_rides_completed": "All/Almost the rides are completed", - "missing_rides": "Of the rides are missing", - "line": "Line", - "from": "from", - "destination": "destination", - "velocity": "velocity", - "kmh": "kmh", - "sample_time": "sample time", - "at_time": "at", - "vehicle_ref": "vehicle plate", - "drive_direction": "drive direction", - "bearing": "bearing", - "coords": "coords", - "hide_document": "Hide geeks data", - "show_document": "Show geeks data", - "lineProfile": { - "title": "Profile for Line", - "notFound": "We couldn't find the line you were looking for :(", - "id": "ID", - "date": "Date", - "lineReference": "Line Reference", - "operatorReference": "Operator Reference", - "agencyName": "Agency Name", - "route": { - "shortName": "Route Short Name", - "start": "Start", - "end": "End", - "mkt": "Route MKT", - "direction": "Route Direction", - "alternative": "Route Alternative", - "type": "Route Type" - } - }, - "aboutPage": { - "title": "About us", - "privacyText": "<0>Google Analytics0> service is embedded in the website to analyze the usage patterns and positioning of the website in search engines. This code reveals to the operators of the service information regarding the behavior of the users. <1>Learn more1> about the privacy policy of the service.", - "licenseInfo": { - "text": "All information displayed on the website is based on data published by government sources. Usage of the information is subject to the <0>CC BY-SA 4.0 license0> of <1>Creative Commons1>" + "homepage": { + "welcome": "Welcome to Databus", + "databus_definition": "The open platform for real data on the quality of public transportation lines in Israel", + "website_goal": "The purpose of the site is to improve the quality of public transportation in Israel by providing reliable information to journalists, citizens, transportation companies, and government officials in Israel.", + "show_button": "Show", + "copyright": "ยฉ The Public Knowledge Workshop" + }, + "homepage_title": "Home", + "dashboard_page_title": "Public transport operators according to planned trips", + "dashboard_page_description": "A graphic display of public transportation rides - ratio of successful actual rides / total rides scheduled. Grouped by bus operators (Egged, Dan, Metropolin etc)", + "timeline_page_title": "Trips History", + "timeline_page_description": "Displays actual vs scheduled stop times by user-given bus operator, route number & stop name", + "time_based_map_page_title": "Time based map", + "time_based_map_page_description": "Displays all buses locations on map based on user-given date, time & minutes range", + "gaps_page_title": "Trips that didn't take place", + "gaps_page_description": "Displays routes that did not take place according to schedule by user-given bus operator, route number. route & date", + "gaps_patterns_page_title": "patterns", + "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, route number, route, date & time", + "choose_datetime": "Date and time", + "choose_date": "Date", + "choose_time": "Time", + "choose_operator": "Operating Company", + "operator_placeholder": "For example: Dan", + "choose_line": "line number", + "line_placeholder": "For example: 17a", + "choose_route": "Choosing a travel route (XXX options)", + "choose_stop": "Select a station (XXX options)", + "direction_arrow": "โต", + "date_format": "YYYY-MM-DD", + "time_format": "HH:mm:ss", + "datetime_format": "HH:mm:ss ยท YYYY-MM-DD", + "loading_routes": "Charging routes", + "loading_stops": "Charging stop stations", + "loading_gaps": "Charging trip gaps", + "timestamp_list": "A list of all stop times in the chosen station", + "timestamp_target": "โ Search time", + "timestamp_gtfs": "๐ Planned stop time", + "timestamp_siri": "๐ Actual stop time", + "loading_hits": "Charging travel times", + "line_not_found": "The line is not found", + "hits_not_found": "No planned or actual trips found", + "planned_time": "Scheduled time", + "planned_status": "status", + "ride_as_planned": "โ๏ธ came out as planned", + "ride_missing": "โ missing ride", + "ride_extra": "๐ง An unplanned trip", + "ride_duped": "โ๏ธ Double ride", + "checkbox_only_gaps": "Only gaps", + "dashboard_tooltip_content": "A GPS is attached to every line in Israel that reports the location of the bus every few moments.\nSo what is a missed trip? This is a trip that was planned, but was not reported to have taken place in the GPS data. You can see it in the app for example, but when you wait at the station, it will never arrive", + "worst_lines_page_title": "Least Efficient Lines", + "rides_planned": "planned trips", + "rides_history": "Trips History", + "rides_actual": "Trips out", + "dashboard_page_graph_title": "Exit percentages of total trips by time", + "to_date": "Until", + "watch_locations_in_range": "View bus locations within a range of", + "minutes": "minutes", + "minutes_5": "5 minutes", + "show_x_bus_locations": "Bus locations", + "from_time_x_to_time_y": "From XXX to YYY", + "choose_start_time": "Select a start time", + "loading_times_tooltip_content": "Loading bus times. Current times available to use", + "group_by_hour_tooltip_content": "Group by hour", + "start": "start", + "end": "end", + "about_title": "About", + "donate_title": "For Donations", + "report_a_bug_title": "Report a bug", + "website_name": "Databus", + "what_is_website": "What is the \"Databus\" site?", + "what_is_website_paragraph": "The database website of the workshop for public knowledge presents data on the quality of public transportation lines in Israel (reliability, accuracy, route). Databus actually connects several government information sources:", + "planning_information": "The planning information - GTFS - which is published every day and contains the details of the lines, station locations, transit times, etc.", + "performance_information": "Performance information - SIRI - Every bus in Israel is attached to a GPS transmitter that reports the location of the bus every few seconds.", + "discovered_mistake": "We discovered an error or outdated information, what do we do?", + "discovered_mistake_paragraph": "Since all the information presented on the site is based on the official sources of information, it is recommended to contact the publisher for clarification or correction of the problem. The \"Databus\" team will be happy to help you understand who the government entity is that published the data or information that requires clarification or correction.", + "privacy": "privacy", + "license": "User license", + "questions": "Questions? Comments? ideas?", + "funding": "Funding", + "mr_meir": "Mr. Asher Meir", + "innovation_authority": "Innovation Authority", + "migdal_company": "\"A tower in the community\"", + "and_smaller_donors": "And other small contributions from my friends and fans of the workshop.", + "github_link": "Go to GitHub", + "dark_mode_tooltip": "Move to Dark mode", + "light_mode_tooltip": "Move to Light mode", + "Change Language": "ืขืืจืืช", + "bug_title": "Title/Summary", + "bug_title_message": "Please enter a title/summary!", + "bug_description": "Description", + "bug_description_message": "Please enter a description!", + "bug_environment": "Environment", + "bug_environment_message": "Please enter the environment!", + "bug_expected_behavior": "Expected Behavior", + "bug_expected_behavior_message": "Please describe the expected behavior!", + "bug_actual_behavior": "Actual Behavior", + "bug_actual_behavior_message": "Please describe the actual behavior!", + "bug_reproducibility": "How often does it happen?", + "bug_reproducibility_message": "Please describe how often does it happen!", + "bug_attachments": "Attachments/Screenshots", + "bug_attachments_upload_button": "Click to Upload", + "bug_submit": "Submit Bug Report", + "bug_contact_name": "Full Name", + "bug_contact_name_message": "Please enter your full name!", + "bug_contact_email": "Email", + "bug_contact_email_message": "Please enter your email!", + "bug_type": "Type of request", + "bug_type_message": "Please enter the type of request", + "bug_type_bug": "Bug", + "bug_type_feature": "Feature Request", + "bug_date_alert": "The end date can not be earlier than the start date", + "funding_paragraph": "The Databus project is developed by the Hasadna for public knowledge, by the contributions of volunteers, and based upon", + "all_rides_completed": "All/Almost the rides are completed", + "missing_rides": "Of the rides are missing", + "line": "Line", + "from": "from", + "destination": "destination", + "velocity": "velocity", + "kmh": "kmh", + "sample_time": "sample time", + "at_time": "at", + "vehicle_ref": "vehicle plate", + "drive_direction": "drive direction", + "bearing": "bearing", + "coords": "coords", + "hide_document": "Hide geeks data", + "show_document": "Show geeks data", + "lineProfile": { + "title": "Profile for Line", + "notFound": "We couldn't find the line you were looking for :(", + "id": "ID", + "date": "Date", + "lineReference": "Line Reference", + "operatorReference": "Operator Reference", + "agencyName": "Agency Name", + "route": { + "shortName": "Route Short Name", + "start": "Start", + "end": "End", + "mkt": "Route MKT", + "direction": "Route Direction", + "alternative": "Route Alternative", + "type": "Route Type" + } + }, + "aboutPage": { + "title": "About us", + "privacyText": "<0>Google Analytics0> service is embedded in the website to analyze the usage patterns and positioning of the website in search engines. This code reveals to the operators of the service information regarding the behavior of the users. <1>Learn more1> about the privacy policy of the service.", + "licenseInfo": { + "text": "All information displayed on the website is based on data published by government sources. Usage of the information is subject to the <0>CC BY-SA 4.0 license0> of <1>Creative Commons1>" + }, + "contactLinksText": { + "sadna": "Contact us", + "slack": "Chat with us on Slack", + "donations": "Servers cost money - help us continue to maintain and develop the project!" + }, + "contributors": "Contributors", + "contributions": "Contributions", + "contributorsText": "Databus is developed by the Public Knowledge Workshop, by the contributions of volunteers, and based upon", + "contributorsReadMore": "<0>Read more0> about how you can contribute to the project" }, - "contactLinksText": { - "sadna": "Contact us", - "slack": "Chat with us on Slack", - "donations": "Servers cost money - help us continue to maintain and develop the project!" + "dashboard_page_graph_title_hour": "Percentage of rides out, by hour", + "dashboard_page_graph_title_day": "Percentage of rides out, by day", + "group_by_day_tooltip_content": "Group by day", + "order_by_hour": "by hour", + "order_by_severity": "by severity", + "choose_dates": "Dates", + "single_line_map_title": "Locations of selected lines", + "operatorSelectorOptions": { + "all": "all" }, - "contributors": "Contributors", - "contributions": "Contributions", - "contributorsText": "Databus is developed by the Public Knowledge Workshop, by the contributions of volunteers, and based upon", - "contributorsReadMore": "<0>Read more0> about how you can contribute to the project" - }, - "dashboard_page_graph_title_hour": "Percentage of rides out, by hour", - "dashboard_page_graph_title_day": "Percentage of rides out, by day", - "group_by_day_tooltip_content": "Group by day", - "order_by_hour": "by hour", - "order_by_severity": "by severity", - "choose_dates": "Dates", - "single_line_map_title": "Locations of selected lines", - "operatorSelectorOptions": { - "all": "all" - }, - "reportBug": { - "description": "This form is designed so that we can receive feedback and improve the application. Please be aware that the submitted information will be available to the public.", - "error": "An error occurred while sending the report. Please try again later.", - "success": "The report was sent successfully. Thank you for your help!", - "viewIssue": "View issue" - }, - "plannedRoute": "Planned Route", - "actualRoute": "Actual Route", - "youtube_modal_info_title": "Video tutorial (Hebrew)", - "open_video_about_this_page": "Open video about this page", - "publicAppealPage": { - "title": "ืงืื ืงืืจื", - "tasks": [ - { - "title": "What affect does the traffic have on the overal execusion time of bus ride?", - "description": "calculating the standard deviation of bus ride durations can indicate problems with traffic." - }, - { - "title": "Calculate time estimation for when the bus left it's origin", - "description": "TO COMPLETE" - }, - { - "title": "How to classify bus-lines to meaningful geographical clusters?", - "description": "TO COMPLETE" - } - ] - } -} + "reportBug": { + "description": "This form is designed so that we can receive feedback and improve the application. Please be aware that the submitted information will be available to the public.", + "error": "An error occurred while sending the report. Please try again later.", + "success": "The report was sent successfully. Thank you for your help!", + "viewIssue": "View issue" + }, + "plannedRoute": "Planned Route", + "actualRoute": "Actual Route", + "youtube_modal_info_title": "Video tutorial (Hebrew)", + "open_video_about_this_page": "Open video about this page", + "publicAppealPage": { + "title": "ืงืื ืงืืจื", + "tasks": [{ + "title": "What affect does the traffic have on the overal execusion time of bus ride?", + "description": "calculating the standard deviation of bus ride durations can indicate problems with traffic." + }, + { + "title": "Calculate time estimation for when the bus left it's origin", + "description": "TO COMPLETE" + }, + { + "title": "How to classify bus-lines to meaningful geographical clusters?", + "description": "TO COMPLETE" + } + ] + } +} \ No newline at end of file diff --git a/src/locale/he.json b/src/locale/he.json index a752b01d..cab99350 100644 --- a/src/locale/he.json +++ b/src/locale/he.json @@ -1,219 +1,216 @@ { - "homepage": { - "welcome": "ืืจืืืื ืืืืื ืืืืืืืืก", - "databus_definition": "ืืคืืืคืืจืื ืืคืชืืื ืื ืชืื ื ืืืช ืขื ืืืืืช ืงืืื ืืชืืืืจื ืืฆืืืืจืืช ืืืฉืจืื", - "website_goal": "ืืืจืช ืืืชืจ ืืื ืืฉืคืจ ืืช ืืืืืช ืืชืืืืจื ืืฆืืืืจืืช ืืืจืฅ ืข\"ื ืืชื ืืืืข ืืืื ืืขืืชืื ืืื, ืืืจืืื, ืืืจืืช ืืชืืืืจื, ืืืืจืื ืืืฉื ืืืฉืจืื.", - "show_button": "ืืฆื", - "copyright": "ยฉ ืืกืื ื ืืืืข ืฆืืืืจื (ืข\"ืจ)" - }, - "homepage_title": "ืจืืฉื", - "dashboard_page_title": "ืงืืื ื ืกืืขืืช", - "dashboard_page_description": "ืชืฆืืื ืืจืคืืช ืฉื ืืืื ืื ืกืืขืืช ืฉืืฆืื ืืคืืขื ืืชืื ืกื ืื ืกืืขืืช ืืืชืืื ื ืืช, ืืคืืื ืืคื ืืืจืืช ืชืืืืจื ืฆืืืืจืืช (ืืื, ืื, ืืืจืืคืืืื ืืื')", - "timeline_page_title": "ืืืกืืืจืืืช ื ืกืืขืืช", - "timeline_page_description": "ืชืฆืืื ืฉื ืืื ื ืขืฆืืจื ืืชืื ืืช ืืคื ืืืจื ืืคืขืืื, ืืกืคืจ ืงื ืืชืื ื. ืืฉืืืื ืืื ืฉืขืช ืืขืฆืืจื ืืคืืขื ืืขืืืช ืฉืขืช ืืขืฆืืจื ืืืชืืื ื ืช", - "time_based_map_page_title": "ืืคื ืืคื ืืื", - "time_based_map_page_description": "ืชืฆืืื ืฉื ืืืงืื ืื ืืืืืืืืกืื ืืชืืจืื, ืฉืขื ืืืืื ืืืงืืช ืฉืืืื ืกื ืข\"ื ืืืฉืชืืฉ", - "gaps_page_title": "ื ืกืืขืืช ืฉืื ืืืฆืขื", - "gaps_page_description": "ืชืฆืืื ืฉื ืื ืื ืกืืขืืช ืฉืื ืืฆืื ืืืชืืื ื ืืคื ืืืจื ืืคืขืืื, ืงื, ืืกืืื ืืชืืจืื", - "gaps_patterns_page_title": "ืืคืืกื ื ืกืืขืืช ืฉืื ืืืฆืขื", - "gaps_patterns_page_description": "ืชืฆืืื ืืจืคืืช ืฉื ืืืื ืื ืกืืขืืช ืฉืืืฆืขื ืืืชืื ืืืื ืืืื ืื ืืืืืงื ืืฉืขืืช\\ืจืืช ืืืืจื, ืืคื ืืืจืช ืืืืืืืกืื, ืืกืคืจ ืงื, ืืกืืื ืืชืืจืื", - "singleline_map_page_title": "ืืคื ืืคื ืงื", - "singleline_map_page_description": "ืชืฆืืื ืฉื ืืกืืื ืงื ืขื ืืคื ืข\"ืค ื ืชืื ื ืืืจืช ืืืืืืืกืื, ืงื, ืืกืืื, ืชืืจืื ืืฉืขื", - "choose_datetime": "ืชืืจืื ืืฉืขื", - "choose_date": "ืชืืจืื", - "choose_time": "ืฉืขื", - "choose_operator": "ืืืจื ืืคืขืืื", - "operator_placeholder": "ืืืืืื: ืื", - "choose_line": "ืืกืคืจ ืงื", - "line_placeholder": "ืืืืืื: 17ื", - "choose_route": "ืืืืจืช ืืกืืื ื ืกืืขื (XXX ืืคืฉืจืืืืช)", - "choose_stop": "ืืืืจืช ืชืื ื (XXX ืืคืฉืจืืืืช)", - "direction_arrow": "โต", - "date_format": "YYYY-MM-DD", - "time_format": "HH:mm:ss", - "datetime_format": "HH:mm:ss ยท YYYY-MM-DD", - "loading_routes": "ืืกืืืื ื ืกืืขื ืืืขืื ื", - "loading_stops": "ืชืื ืืช ืขืฆืืจื ืืืขืื ื", - "loading_gaps": "ืคืขืจื ื ืกืืขืืช ืืืขืื ื", - "timestamp_list": "ืจืฉืืืช ืืื ื ืขืฆืืจื ืืชืื ื ืฉื ืืืจื", - "timestamp_target": "ืืื ืืืืคืืฉ โ", - "timestamp_gtfs": "ืืื ืขืฆืืจื ืืชืืื ื ๐", - "timestamp_siri": "ืืื ืขืฆืืจื ืืคืืขื ๐", - "loading_hits": "ืืื ื ื ืกืืขื ืืืขืื ื", - "line_not_found": "ืืงื ืื ื ืืฆื", - "hits_not_found": "ืื ื ืืฆืื ื ืกืืขืืช ืืชืืื ื ืืช ืื ืืคืืขื", - "planned_time": "ืฉืขื ืืชืืื ื ืช", - "planned_status": "ืกืืืืก", - "ride_as_planned": "ืืฆืื ืืืชืืื ื โ๏ธ", - "ride_missing": "ื ืกืืขื ืืกืจื โ", - "ride_extra": "ื ืกืืขื ืฉืื ืชืืื ื ื ๐ง", - "ride_duped": "ื ืกืืขื ืืคืืื โ๏ธ", - "checkbox_only_gaps": "ืจืง ืคืขืจืื", - "dashboard_tooltip_content": "ืขื ืื ืงื ืืืฉืจืื ืืืฆืื GPS ืฉืืืืื ืืช ืืืงืื ืืืืืืืืก ืื ืืื ืจืืขืื.\nืื ืื ืืื ื ืกืืขื ืฉืื ืืืฆืขื? ืืืช ื ืกืืขื ืฉืชืืื ื ื, ืืื ืื ืืืื ืฉืืฆืื ืื ืชืื ื ืGPS. ืชืืืื ืืจืืืช ืืืชื ืืืคืืืงืฆืื ืืืฉื, ืืื ืืฉืชืืื ืืชืื ื, ืืื ืืขืืื ืื ืชืืืข", - "worst_lines_page_title": "ืืงืืืื ืืืจืืขืื ืืืืชืจ", - "rides_planned": "ื ืกืืขืืช ืฉืชืืื ื ื", - "rides_actual": "ื ืกืืขืืช ืฉืืฆืื", - "rides_history": "ืืืกืืืจืืืช ื ืกืืขืืช", - "dashboard_page_graph_title": "ืืืืื ืืฆืืื ืืกื ืื ืกืืขืืช ืืคื ืืื", - - "from_date": "ืืชืืจืื", - "to_date": "ืขื ืชืืจืื", - "watch_locations_in_range": "ืฆืคื ืืืืงืืื ืืืืืืืกืื ืืืืื ืฉื", - "minutes": "ืืงืืช", - "minutes_5": "5 ืืงืืช", - "show_x_bus_locations": "ืืืงืืื ืืืืืืืกืื", - "from_time_x_to_time_y": "ืืฉืขื XXX ืขื ืฉืขื YYY", - "choose_start_time": "ืืืืจืช ืฉืขืช ืืชืืื", - "loading_times_tooltip_content": "ืฉืขืืช ื ืืกืคืืช ืืืขืื ื. ื ืืชื ืืืฉืชืืฉ ืืฉืขืืช ืืืืื ืืช ืืืจ ืขืืฉืื", - "group_by_hour_tooltip_content": "ืงืืืืฅ ืืคื ืฉืขื", - "start": "ืืชืืื", - "end": "ืกืืื", - "about_title": "ืืืืืช", - "public_appeal_title": "ืงืื ืงืืจื", - "donate_title": "ืืชืจืืืืช", - "report_a_bug_title": "ืืืืื ืขื ืืื", - "website_name": "ืืืืืืืก", - "what_is_website": "ืืื ืืชืจ โืืืืืืืกโ?", - "what_is_website_paragraph": "ืืชืจ ืืืืืืืก ืฉื ืืกืื ื ืืืืข ืฆืืืืจื ืืฆืื ื ืชืื ืื ืขื ืืืืืช ืงืืื ืืชืืืืจื ืืฆืืืืจืืช ืืืจืฅ (ืืืื ืืช, ืืืืง, ืืกืืื). ืืืืืืืก ืืืืจ ืืืขืฉื ืืื ืืกืคืจ ืืงืืจืืช ืืืืข ืืืฉืืชืืื:", - "planning_information": "ืืืืข ืืชืื ืื - GTFS - ืืืคืืจืกื ืื ืืื ืืืืื ืืช ืคืจืื ืืงืืืื, ืืืงืืื ืืชืื ืืช, ืฉืขืืช ืืืขืืจ ืืื ืืื'.", - "performance_information": "ืืืืข ืืืืฆืืข - SIRI - ืืื ืืืืืืืก ืืืฉืจืื ืืืฆืื ืืฉืืจ GPS ืฉืืืืื ืืช ืืืงืื ืืืืืืืืก ืื ืืื ืฉื ืืืช.", - "discovered_mistake": "ืืืืื ื ืืขืืช ืื ืืืืข ืื ืืขืืืื, ืื ืขืืฉืื?", - "discovered_mistake_paragraph": "ืืืืืื ืฉืื ืืืืืข ืืืืฆื ืืืชืจ ืืชืืกืก ืขื ืืงืืจืืช ืืืืืข ืืจืฉืืืื, ืืืืืฅ ืืคื ืืช ืืืืจื ืืืคืจืกื ืืฆืืจื ืืืจืืจ ืื ืชืืงืื ืืืขืื. ืฆืืืช โืืืืืืืกโ ืืฉืื ืืกืืืข ืืื ืืืืื ืืืื ืืืืจื ืืืืฉืืชื ืฉืคืจืกื ืืช ืื ืชืื ืื ืืืืืข ืฉืืืจืฉืื ืืืจืืจ ืื ืชืืงืื.", - "privacy": "ืคืจืืืืช", - "license": "ืจืฉืืื ืฉืืืืฉ", - "questions": "ืฉืืืืช? ืชืืืืืช? ืจืขืืื ืืช?", - "funding": "ืืืืื", - "mr_meir": "ืืจ ืืฉืจ ืืืืจ", - "innovation_authority": "ืจืฉืืช ืืืืฉื ืืช", - "migdal_company": "โืืืื ืืงืืืืโ", - "and_smaller_donors": "ืืชืจืืืืช ืงืื ืืช ื ืืกืคืืช ืฉื ืืืืื ืืืืืื ืืกืื ื.", + "homepage": { + "welcome": "ืืจืืืื ืืืืื ืืืืืืืืก", + "databus_definition": "ืืคืืืคืืจืื ืืคืชืืื ืื ืชืื ื ืืืช ืขื ืืืืืช ืงืืื ืืชืืืืจื ืืฆืืืืจืืช ืืืฉืจืื", + "website_goal": "ืืืจืช ืืืชืจ ืืื ืืฉืคืจ ืืช ืืืืืช ืืชืืืืจื ืืฆืืืืจืืช ืืืจืฅ ืข\"ื ืืชื ืืืืข ืืืื ืืขืืชืื ืืื, ืืืจืืื, ืืืจืืช ืืชืืืืจื, ืืืืจืื ืืืฉื ืืืฉืจืื.", + "show_button": "ืืฆื", + "copyright": "ยฉ ืืกืื ื ืืืืข ืฆืืืืจื (ืข\"ืจ)" + }, + "homepage_title": "ืจืืฉื", + "dashboard_page_title": "ืงืืื ื ืกืืขืืช", + "dashboard_page_description": "ืชืฆืืื ืืจืคืืช ืฉื ืืืื ืื ืกืืขืืช ืฉืืฆืื ืืคืืขื ืืชืื ืกื ืื ืกืืขืืช ืืืชืืื ื ืืช, ืืคืืื ืืคื ืืืจืืช ืชืืืืจื ืฆืืืืจืืช (ืืื, ืื, ืืืจืืคืืืื ืืื')", + "timeline_page_title": "ืืืกืืืจืืืช ื ืกืืขืืช", + "timeline_page_description": "ืชืฆืืื ืฉื ืืื ื ืขืฆืืจื ืืชืื ืืช ืืคื ืืืจื ืืคืขืืื, ืืกืคืจ ืงื ืืชืื ื. ืืฉืืืื ืืื ืฉืขืช ืืขืฆืืจื ืืคืืขื ืืขืืืช ืฉืขืช ืืขืฆืืจื ืืืชืืื ื ืช", + "time_based_map_page_title": "ืืคื ืืคื ืืื", + "time_based_map_page_description": "ืชืฆืืื ืฉื ืืืงืื ืื ืืืืืืืืกืื ืืชืืจืื, ืฉืขื ืืืืื ืืืงืืช ืฉืืืื ืกื ืข\"ื ืืืฉืชืืฉ", + "gaps_page_title": "ื ืกืืขืืช ืฉืื ืืืฆืขื", + "gaps_page_description": "ืชืฆืืื ืฉื ืื ืื ืกืืขืืช ืฉืื ืืฆืื ืืืชืืื ื ืืคื ืืืจื ืืคืขืืื, ืงื, ืืกืืื ืืชืืจืื", + "gaps_patterns_page_title": "ืืคืืกื ื ืกืืขืืช ืฉืื ืืืฆืขื", + "gaps_patterns_page_description": "ืชืฆืืื ืืจืคืืช ืฉื ืืืื ืื ืกืืขืืช ืฉืืืฆืขื ืืืชืื ืืืื ืืืื ืื ืืืืืงื ืืฉืขืืช\\ืจืืช ืืืืจื, ืืคื ืืืจืช ืืืืืืืกืื, ืืกืคืจ ืงื, ืืกืืื ืืชืืจืื", + "singleline_map_page_title": "ืืคื ืืคื ืงื", + "singleline_map_page_description": "ืชืฆืืื ืฉื ืืกืืื ืงื ืขื ืืคื ืข\"ืค ื ืชืื ื ืืืจืช ืืืืืืืกืื, ืงื, ืืกืืื, ืชืืจืื ืืฉืขื", + "choose_datetime": "ืชืืจืื ืืฉืขื", + "choose_date": "ืชืืจืื", + "choose_time": "ืฉืขื", + "choose_operator": "ืืืจื ืืคืขืืื", + "operator_placeholder": "ืืืืืื: ืื", + "choose_line": "ืืกืคืจ ืงื", + "line_placeholder": "ืืืืืื: 17ื", + "choose_route": "ืืืืจืช ืืกืืื ื ืกืืขื (XXX ืืคืฉืจืืืืช)", + "choose_stop": "ืืืืจืช ืชืื ื (XXX ืืคืฉืจืืืืช)", + "direction_arrow": "โต", + "date_format": "YYYY-MM-DD", + "time_format": "HH:mm:ss", + "datetime_format": "HH:mm:ss ยท YYYY-MM-DD", + "loading_routes": "ืืกืืืื ื ืกืืขื ืืืขืื ื", + "loading_stops": "ืชืื ืืช ืขืฆืืจื ืืืขืื ื", + "loading_gaps": "ืคืขืจื ื ืกืืขืืช ืืืขืื ื", + "timestamp_list": "ืจืฉืืืช ืืื ื ืขืฆืืจื ืืชืื ื ืฉื ืืืจื", + "timestamp_target": "ืืื ืืืืคืืฉ โ", + "timestamp_gtfs": "ืืื ืขืฆืืจื ืืชืืื ื ๐", + "timestamp_siri": "ืืื ืขืฆืืจื ืืคืืขื ๐", + "loading_hits": "ืืื ื ื ืกืืขื ืืืขืื ื", + "line_not_found": "ืืงื ืื ื ืืฆื", + "hits_not_found": "ืื ื ืืฆืื ื ืกืืขืืช ืืชืืื ื ืืช ืื ืืคืืขื", + "planned_time": "ืฉืขื ืืชืืื ื ืช", + "planned_status": "ืกืืืืก", + "ride_as_planned": "ืืฆืื ืืืชืืื ื โ๏ธ", + "ride_missing": "ื ืกืืขื ืืกืจื โ", + "ride_extra": "ื ืกืืขื ืฉืื ืชืืื ื ื ๐ง", + "ride_duped": "ื ืกืืขื ืืคืืื โ๏ธ", + "checkbox_only_gaps": "ืจืง ืคืขืจืื", + "dashboard_tooltip_content": "ืขื ืื ืงื ืืืฉืจืื ืืืฆืื GPS ืฉืืืืื ืืช ืืืงืื ืืืืืืืืก ืื ืืื ืจืืขืื.\nืื ืื ืืื ื ืกืืขื ืฉืื ืืืฆืขื? ืืืช ื ืกืืขื ืฉืชืืื ื ื, ืืื ืื ืืืื ืฉืืฆืื ืื ืชืื ื ืGPS. ืชืืืื ืืจืืืช ืืืชื ืืืคืืืงืฆืื ืืืฉื, ืืื ืืฉืชืืื ืืชืื ื, ืืื ืืขืืื ืื ืชืืืข", + "worst_lines_page_title": "ืืงืืืื ืืืจืืขืื ืืืืชืจ", + "rides_planned": "ื ืกืืขืืช ืฉืชืืื ื ื", + "rides_actual": "ื ืกืืขืืช ืฉืืฆืื", + "rides_history": "ืืืกืืืจืืืช ื ืกืืขืืช", + "dashboard_page_graph_title": "ืืืืื ืืฆืืื ืืกื ืื ืกืืขืืช ืืคื ืืื", + "to_date": "ืขื ืชืืจืื", + "watch_locations_in_range": "ืฆืคื ืืืืงืืื ืืืืืืืกืื ืืืืื ืฉื", + "minutes": "ืืงืืช", + "minutes_5": "5 ืืงืืช", + "show_x_bus_locations": "ืืืงืืื ืืืืืืืกืื", + "from_time_x_to_time_y": "ืืฉืขื XXX ืขื ืฉืขื YYY", + "choose_start_time": "ืืืืจืช ืฉืขืช ืืชืืื", + "loading_times_tooltip_content": "ืฉืขืืช ื ืืกืคืืช ืืืขืื ื. ื ืืชื ืืืฉืชืืฉ ืืฉืขืืช ืืืืื ืืช ืืืจ ืขืืฉืื", + "group_by_hour_tooltip_content": "ืงืืืืฅ ืืคื ืฉืขื", + "start": "ืืชืืื", + "end": "ืกืืื", + "about_title": "ืืืืืช", + "public_appeal_title": "ืงืื ืงืืจื", + "donate_title": "ืืชืจืืืืช", + "report_a_bug_title": "ืืืืื ืขื ืืื", + "website_name": "ืืืืืืืก", + "what_is_website": "ืืื ืืชืจ โืืืืืืืกโ?", + "what_is_website_paragraph": "ืืชืจ ืืืืืืืก ืฉื ืืกืื ื ืืืืข ืฆืืืืจื ืืฆืื ื ืชืื ืื ืขื ืืืืืช ืงืืื ืืชืืืืจื ืืฆืืืืจืืช ืืืจืฅ (ืืืื ืืช, ืืืืง, ืืกืืื). ืืืืืืืก ืืืืจ ืืืขืฉื ืืื ืืกืคืจ ืืงืืจืืช ืืืืข ืืืฉืืชืืื:", + "planning_information": "ืืืืข ืืชืื ืื - GTFS - ืืืคืืจืกื ืื ืืื ืืืืื ืืช ืคืจืื ืืงืืืื, ืืืงืืื ืืชืื ืืช, ืฉืขืืช ืืืขืืจ ืืื ืืื'.", + "performance_information": "ืืืืข ืืืืฆืืข - SIRI - ืืื ืืืืืืืก ืืืฉืจืื ืืืฆืื ืืฉืืจ GPS ืฉืืืืื ืืช ืืืงืื ืืืืืืืืก ืื ืืื ืฉื ืืืช.", + "discovered_mistake": "ืืืืื ื ืืขืืช ืื ืืืืข ืื ืืขืืืื, ืื ืขืืฉืื?", + "discovered_mistake_paragraph": "ืืืืืื ืฉืื ืืืืืข ืืืืฆื ืืืชืจ ืืชืืกืก ืขื ืืงืืจืืช ืืืืืข ืืจืฉืืืื, ืืืืืฅ ืืคื ืืช ืืืืจื ืืืคืจืกื ืืฆืืจื ืืืจืืจ ืื ืชืืงืื ืืืขืื. ืฆืืืช โืืืืืืืกโ ืืฉืื ืืกืืืข ืืื ืืืืื ืืืื ืืืืจื ืืืืฉืืชื ืฉืคืจืกื ืืช ืื ืชืื ืื ืืืืืข ืฉืืืจืฉืื ืืืจืืจ ืื ืชืืงืื.", + "privacy": "ืคืจืืืืช", + "license": "ืจืฉืืื ืฉืืืืฉ", + "questions": "ืฉืืืืช? ืชืืืืืช? ืจืขืืื ืืช?", + "funding": "ืืืืื", + "mr_meir": "ืืจ ืืฉืจ ืืืืจ", + "innovation_authority": "ืจืฉืืช ืืืืฉื ืืช", + "migdal_company": "โืืืื ืืงืืืืโ", + "and_smaller_donors": "ืืชืจืืืืช ืงืื ืืช ื ืืกืคืืช ืฉื ืืืืื ืืืืืื ืืกืื ื.", - "github_link": "ืืืขืืจ ืื GitHub", - "dark_mode_tooltip": "ืขืืืจ ืืืฆื ืืื", - "light_mode_tooltip": "ืขืืืจ ืืืฆื ืืืืจ", - "Change Language": "English", - "bug_title": "ืืืชืจืช/ืกืืืื", - "bug_title_message": "ืื ื ืืื ืืืชืจืช/ืกืืืื!", - "bug_description": "ืชืืืืจ", - "bug_description_message": "ืื ื ืืื ืชืืืืจ!", - "bug_environment": "ืกืืืื (ืืคืืคื, ืืขืจืืช)", - "bug_environment_message": "ืื ื ืืื ืืช ืืกืืืื!", - "bug_expected_behavior": "ืืชื ืืืืช ืฆืคืืื", - "bug_expected_behavior_message": "ืื ื ืชืืจ ืืช ืืชื ืืืืช ืืฆืคืืื!", - "bug_actual_behavior": "ืืชื ืืืืช ื ืืืืืช", - "bug_actual_behavior_message": "ืื ื ืชืืจ ืืช ืืชื ืืืืช ืื ืืืืืช!", - "bug_reproducibility": "ืืืืื ืชืืืจืืช ืื ืงืืจื?", - "bug_reproducibility_message": "ืื ื ืชืืจ ืืช ืืืืื ืชืืืจืืช ืื ืงืืจื!", - "bug_attachments": "ืงืืฆืื ืืฆืืจืคืื/ ืฆืืืืื ืืกื", - "bug_attachments_upload_button": "ืืืฅ ืืืขืืื", - "bug_submit": "ืฉืื ืืช ืืืื", - "bug_contact_name": "ืฉื ืืื", - "bug_contact_name_message": "ืื ื ืืื ืืช ืฉืื!", - "bug_contact_email": "ืื-ืืืื", - "bug_contact_email_message": "ืื ื ืืื ืืชืืืช ืื-ืืืื!", - "bug_type": "ืกืื ืืืงืฉื", - "bug_type_message": "ืื ื ืืื ืกืื ืืงืฉื!", - "bug_type_bug": "ืืื", - "bug_type_feature": "ืืงืฉื ืืคืืชืื", - "bug_date_alert": "ืชืืจืื ืืกืืื ืืื ื ืืืื ืืืืืช ืืืงืื ืืืชืจ ืืชืืจืื ืืืชืืื", - "bug_date_invalid_format": "ื ื ืืืืื ืชืืจืื ืืคืืจืื ืชืงืื", - "funding_paragraph": "ืืืืืืืก ืคืืชื ืืกืื ื ืืืืข ืฆืืืืจื, ืืขืืืืช ืืชื ืืืื, ืืืืืกืก ืขื", - "halufa_ride": "ื ืกืืขื ืืืืคืืช ืืก", - "all_rides_completed": "ืืืขื / ืื ืื ืกืืขืืช ืืืฆืขื", - "missing_rides": "ืืื ืกืืขืืช ืืกืจืืช", - "line": "ืงื", - "from": "ืืืฆื", - "destination": "ืืขื", - "velocity": "ืืืืจืืช", - "kmh": "ืงืืดืฉ", - "sample_time": "ืืื ืืืืื", - "at_time": "ืืฉืขื", - "vehicle_ref": "ืืืืืช ืจืืฉืื", - "drive_direction": "ืืืืื ื ืกืืขื", - "bearing": "ืืขืืืช", - "coords": "ื .ืฆ.", - "hide_document": "ืืกืชืจ ืืืืข ืืืืงืื", - "show_document": "ืืฆื ืืืืข ืืืืงืื", - "lineProfile": { - "title": "ืคืจืืคืื ืงื", - "notFound": "ืื ืืฆืืื ื ืืืฆืื ืืช ืืงื ืฉืืืคืฉืช :(", - "id": "ืืืื ืืื ื", - "date": "ืชืืจืื", - "lineReference": "ืืืื ืงื", - "operatorReference": "ืืืื ืืืจื ืืคืขืืื", - "agencyName": "ืฉื ืืืจื ืืคืขืืื", - "route": { - "shortName": "ืืก' ืงื", - "start": "ืืืฆื", - "end": "ืืขื", - "mkt": "ืืง\"ื ืงื", - "direction": "ืืืืื ืงื", - "alternative": "ืืืืคื ืืก'", - "type": "ืกืื ืงื" - } - }, - "errorPage": { - "title": "ืืืคืก, ืืฉืื ืืฉืชืืฉ", - "text": "ืื ื ื ืกื ืฉืื ืืืืืจ ืืืชืจ", - "text2": "ืื ืืืขืื ื ืืฉืืช, ืื ื ืคื ื ืืืื ื ืืืชืืืช:", - "button": "ืืืจื ืืืฃ ืืืืช" - }, - "aboutPage": { - "title": "ืงืฆืช ืขืืื ื", - "privacyText": "ืืืชืจ ืืืืืข ืฉืืจืืช <0>Google Analytics0> ืื ืืชืื ืืคืืกื ืืฉืืืืฉ ืืืืฆืื ืืืชืจ ืืื ืืขื ืืืคืืฉ. ืงืื ืื ืืืฉืฃ ืืคื ื ืืคืขืืื ืืฉืืจืืช ืืืืข ืื ืืืข ืืืชื ืืืืช ืืืฉืชืืฉืื. <1>ืงืจืื ืืื1> ืขื ืืืื ืืืช ืืคืจืืืืช ืฉื ืืฉืืจืืช.", - "licenseInfo": { - "text": "ืื ืืืืืข ืืืืฆื ืืืชืจ ืืืืกืก ืขื ื ืชืื ืื ืืืคืืจืกืืื ืืืงืืจืืช ืืืืืข ืืืืฉืืชืืื. ืืฉืืืืฉ ืืืืืข ืืคืืฃ ืืจืืฉืืื <0>{{licenseName}}0> ืฉื <1>Creative Commons1>.", - "licenseName": "ืจืืฉืืื CC BY-SA 4.0" + "github_link": "ืืืขืืจ ืื GitHub", + "dark_mode_tooltip": "ืขืืืจ ืืืฆื ืืื", + "light_mode_tooltip": "ืขืืืจ ืืืฆื ืืืืจ", + "Change Language": "English", + "bug_title": "ืืืชืจืช/ืกืืืื", + "bug_title_message": "ืื ื ืืื ืืืชืจืช/ืกืืืื!", + "bug_description": "ืชืืืืจ", + "bug_description_message": "ืื ื ืืื ืชืืืืจ!", + "bug_environment": "ืกืืืื (ืืคืืคื, ืืขืจืืช)", + "bug_environment_message": "ืื ื ืืื ืืช ืืกืืืื!", + "bug_expected_behavior": "ืืชื ืืืืช ืฆืคืืื", + "bug_expected_behavior_message": "ืื ื ืชืืจ ืืช ืืชื ืืืืช ืืฆืคืืื!", + "bug_actual_behavior": "ืืชื ืืืืช ื ืืืืืช", + "bug_actual_behavior_message": "ืื ื ืชืืจ ืืช ืืชื ืืืืช ืื ืืืืืช!", + "bug_reproducibility": "ืืืืื ืชืืืจืืช ืื ืงืืจื?", + "bug_reproducibility_message": "ืื ื ืชืืจ ืืช ืืืืื ืชืืืจืืช ืื ืงืืจื!", + "bug_attachments": "ืงืืฆืื ืืฆืืจืคืื/ ืฆืืืืื ืืกื", + "bug_attachments_upload_button": "ืืืฅ ืืืขืืื", + "bug_submit": "ืฉืื ืืช ืืืื", + "bug_contact_name": "ืฉื ืืื", + "bug_contact_name_message": "ืื ื ืืื ืืช ืฉืื!", + "bug_contact_email": "ืื-ืืืื", + "bug_contact_email_message": "ืื ื ืืื ืืชืืืช ืื-ืืืื!", + "bug_type": "ืกืื ืืืงืฉื", + "bug_type_message": "ืื ื ืืื ืกืื ืืงืฉื!", + "bug_type_bug": "ืืื", + "bug_type_feature": "ืืงืฉื ืืคืืชืื", + "bug_date_alert": "ืชืืจืื ืืกืืื ืืื ื ืืืื ืืืืืช ืืืงืื ืืืชืจ ืืชืืจืื ืืืชืืื", + "bug_date_invalid_format": "ื ื ืืืืื ืชืืจืื ืืคืืจืื ืชืงืื", + "funding_paragraph": "ืืืืืืืก ืคืืชื ืืกืื ื ืืืืข ืฆืืืืจื, ืืขืืืืช ืืชื ืืืื, ืืืืืกืก ืขื", + "halufa_ride": "ื ืกืืขื ืืืืคืืช ืืก", + "all_rides_completed": "ืืืขื / ืื ืื ืกืืขืืช ืืืฆืขื", + "missing_rides": "ืืื ืกืืขืืช ืืกืจืืช", + "line": "ืงื", + "from": "ืืืฆื", + "destination": "ืืขื", + "velocity": "ืืืืจืืช", + "kmh": "ืงืืดืฉ", + "sample_time": "ืืื ืืืืื", + "at_time": "ืืฉืขื", + "vehicle_ref": "ืืืืืช ืจืืฉืื", + "drive_direction": "ืืืืื ื ืกืืขื", + "bearing": "ืืขืืืช", + "coords": "ื .ืฆ.", + "hide_document": "ืืกืชืจ ืืืืข ืืืืงืื", + "show_document": "ืืฆื ืืืืข ืืืืงืื", + "lineProfile": { + "title": "ืคืจืืคืื ืงื", + "notFound": "ืื ืืฆืืื ื ืืืฆืื ืืช ืืงื ืฉืืืคืฉืช :(", + "id": "ืืืื ืืื ื", + "date": "ืชืืจืื", + "lineReference": "ืืืื ืงื", + "operatorReference": "ืืืื ืืืจื ืืคืขืืื", + "agencyName": "ืฉื ืืืจื ืืคืขืืื", + "route": { + "shortName": "ืืก' ืงื", + "start": "ืืืฆื", + "end": "ืืขื", + "mkt": "ืืง\"ื ืงื", + "direction": "ืืืืื ืงื", + "alternative": "ืืืืคื ืืก'", + "type": "ืกืื ืงื" + } + }, + "errorPage": { + "title": "ืืืคืก, ืืฉืื ืืฉืชืืฉ", + "text": "ืื ื ื ืกื ืฉืื ืืืืืจ ืืืชืจ", + "text2": "ืื ืืืขืื ื ืืฉืืช, ืื ื ืคื ื ืืืื ื ืืืชืืืช:", + "button": "ืืืจื ืืืฃ ืืืืช" }, - "contactLinksText": { - "sadna": "ืฆืจื ืืืชื ื ืงืฉืจ", - "slack": " ืืืจื ืืืชื ื ืขื ืื ืืกืืืง", - "donations": "ืฉืจืชืื ืขืืืื ืืกืฃ - ืขืืจื ืื ื ืืืืฉืื ืืชืืืง ืืืคืชื ืืช ืืคืจืืืงื!" + "aboutPage": { + "title": "ืงืฆืช ืขืืื ื", + "privacyText": "ืืืชืจ ืืืืืข ืฉืืจืืช <0>Google Analytics0> ืื ืืชืื ืืคืืกื ืืฉืืืืฉ ืืืืฆืื ืืืชืจ ืืื ืืขื ืืืคืืฉ. ืงืื ืื ืืืฉืฃ ืืคื ื ืืคืขืืื ืืฉืืจืืช ืืืืข ืื ืืืข ืืืชื ืืืืช ืืืฉืชืืฉืื. <1>ืงืจืื ืืื1> ืขื ืืืื ืืืช ืืคืจืืืืช ืฉื ืืฉืืจืืช.", + "licenseInfo": { + "text": "ืื ืืืืืข ืืืืฆื ืืืชืจ ืืืืกืก ืขื ื ืชืื ืื ืืืคืืจืกืืื ืืืงืืจืืช ืืืืืข ืืืืฉืืชืืื. ืืฉืืืืฉ ืืืืืข ืืคืืฃ ืืจืืฉืืื <0>{{licenseName}}0> ืฉื <1>Creative Commons1>.", + "licenseName": "ืจืืฉืืื CC BY-SA 4.0" + }, + "contactLinksText": { + "sadna": "ืฆืจื ืืืชื ื ืงืฉืจ", + "slack": " ืืืจื ืืืชื ื ืขื ืื ืืกืืืง", + "donations": "ืฉืจืชืื ืขืืืื ืืกืฃ - ืขืืจื ืื ื ืืืืฉืื ืืชืืืง ืืืคืชื ืืช ืืคืจืืืงื!" + }, + "contributors": "ืชืืจืื ืงืื", + "contributions": "ืชืจืืืืช", + "contributorsText": "ืืืืืืืก ืืชืืคืฉืจืช ืืื ืืืชืจ ืืืืืช ืืจืื ืื ืฉืื ืืจืืฆืื ืฉืชืืจืืื ืงืื ืืืคืชืืื ืืื ืืืชื ื. ื ืฉืื ืืจืืืชื ืืฆืืจืฃ ืืฆืืืช!", + "contributorsReadMore": "<0>ืงืจื ืืื0> ืขื ืืืฆื ื ืืชื ืืชืจืื ืืืืฉืชืชืฃ ืืคืืชืื" }, - "contributors": "ืชืืจืื ืงืื", - "contributions": "ืชืจืืืืช", - "contributorsText": "ืืืืืืืก ืืชืืคืฉืจืช ืืื ืืืชืจ ืืืืืช ืืจืื ืื ืฉืื ืืจืืฆืื ืฉืชืืจืืื ืงืื ืืืคืชืืื ืืื ืืืชื ื. ื ืฉืื ืืจืืืชื ืืฆืืจืฃ ืืฆืืืช!", - "contributorsReadMore": "<0>ืงืจื ืืื0> ืขื ืืืฆื ื ืืชื ืืชืจืื ืืืืฉืชืชืฃ ืืคืืชืื" - }, - "operatorSelectorOptions": { - "all": "ืืื" - }, - "dashboard_page_graph_title_hour": "ืืืืื ืืฆืืื ืืกื ืื ืกืืขืืช ืืคื ืฉืขื", - "dashboard_page_graph_title_day": "ืืืืื ืืฆืืื ืืกื ืื ืกืืขืืช ืืคื ืืื", - "group_by_day_tooltip_content": "ืงืืืืฅ ืืคื ืืื", - "order_by_hour": "ืืคื ืฉืขื", - "order_by_severity": "ืืคื ืืืืจื", - "choose_dates": "ืชืืจืืืื", - "single_line_map_title": "ืืืงืืืื ืฉื ืงื ืฉื ืืืจ", - "reportBug": { - "description": "ืืืคืก ืื ื ืืขื ืขื ืื ืช ืฉื ืืื ืืงืื ืคืืืืง ืืืฉืคืจ ืืช ืืืคืืืงืฆืื. ืืชืฉืืืช ืืื - ืืืืคืก ื ืฉืื ืGitHub, ืืืืืืข ืฉืืฆืืืื ืื ืืืื ืฆืืืืจื.", - "error": "ืืืจืขื ืฉืืืื ืืขืช ืฉืืืืช ืืืืืื. ืื ื ื ืกื ืฉืื ืืืืืจ ืืืชืจ.", - "success": "ืชืืื ืขื ืืืืืื!", - "viewIssue": "ืืฆืคืืื ืืืืืื" - }, - "plannedRoute": "ืืกืืื ืืชืืื ื", - "actualRoute": "ืืกืืื ืืคืืขื", - "youtube_modal_info_title": "ืกืจืืื ืืกืืจ", - "open_video_about_this_page": "ืืคืชืื ืกืจืืื ืขื ืืขืืื ืืื", - "publicAppealPage": { - "title": "ืงืื ืงืืจื", - "tasks": [ - { - "title": "ืืืคื ื ืืจืฉืื ื ืชืืื ืชืขืืืฃ ืืชืืืืจื ืฆืืืืจืืช (ื ืช\"ืฆืื)?", - "description": "ืAPI ืฉื ืืืืืืืก ื ืืชื ืืืฆืื ืืช ืืืืงืืืื ืืืืืืืงืื ืฉื ืื ืืืืืืืืกืื ืืืจืฅ ืืฉื ืื ืืืืจืื ืืช. ืืืืื ืืืืฉืื ืืฉ ืขืืืกื ืชื ืืขื? ืืืืื ืืืืฉืื ืืฉ ืคืขืจ ืืฉืืขืืชื ืืื ืืฉืขืืช ืืขืืืกืืช ืืืื ืืืื ืืฉืขืืช ืืืืืืืช ืฉื ืืชืืืืจื? ืขื ืืื ืื ืืืื ืฉื ืื ืชืื ืื, ืื ื ืืืืื ืื ืฉื ืืชื ืืืื ืืืฆืืืข ืขื ืืืืฉืื ืกืคืฆืืคืืื ืฉืืื ืืชืจืืืื ืืขืืืกืื. ื ืฉืื ืืขืืจืชื!" - }, - { - "title": "ืืืฉืื ืฉืขืช ืืืฆืืื ืืชืื ืช ืืืืฆื, ืืฉืขืช ืืืืขื ืืชืื ืืช ืืฉืื ืืช ืืืกืืื", - "description": "ืืื ื ืืข ืื ืืืืืืืืก ืืฆื ืืืื, ืืงืืื ืื ืืืืจ? ืืืจื ืืื, ืืืืฉืืจืื ืขื ืืื ืืืืืืืืก ืืืคืขืืื ืืกืคืจ ืืงืืช ืืจื ืชืืืืช ืื ืกืืขื, ืืืคืืื ืืฉ ืื ื ืืืืืืช ืืืงืื ืจืืืช ืขื ืืืืืืืกืื ืืจื ืืืฆืืื ืฉืืื ืืืจื. ืืื ืืฉ ืืืืืืืกืื ืฉืืืฆืืื ืืชืื ืช ืืืืฆื ืืคื ื ืืืื ืฉืืืืืจ ืืื? ืื ืื, ืื ืื ืืกืืจ - ืื ืฉืื ืืขืืจืชื ืืืืืื ืื ืืืืจ ืืชืืคืขื ืืื." - }, - { - "title": "ืืื ืืฉืืื ืงืืื ืืืืืืืก ืืืืืจืื ืืืืืืจืคืืื?", - "description": "ื ืฉืื ืืืื ืืืฆืื ืกืืืืกืืืงื ืืืชืจ ืืคื ืืืืจ ืืืืืจืคื. ืืื ืงืืืื ืืืืืจ ืืจืืฉืืืื ืืชืคืงืืื ืืื ืืืชืจ ืืงืืืื ืืืืืจ ืืืจ ืฉืืข? ืืฉืืื ืื, ืืืื ืฆืจืื ืืืืื ืืืืืืื ืืื ืืืชืืืืก ืืงื ืืจืืฉืืืื-ืืืจ ืฉืืข. ืืื ืืื ืฉืืื ืืฉื ื ืืืืืจืื? ืืืื ืขืืืฃ ืืืืจืื ืงืืืื ืืืื ืืืืชืืืื? ืื ืื ื ืคืชืืืื ืืจืขืืื ืืช ืฉืืื, ืืืืื ืื ืืืฆืืข ืืืจืืฆืืืช ืฉืื ืืช ืืืกืืืข ืืฉืื ืืืชื ืืืขืจืืช." - }, - { - "title": "ืืชืงืืฆืืช ืืืืืืืกืื", - "description": "ืืืงืืคืืื - ืืชืืืืจื ืฆืืืืจืืช, ืืชืงืืฆืืช ืืืืืืืกืื (ืืื ืืืืช: Bus Bunching) ืืื ืืฆื ืฉืื ืฉื ื ืืืืืืืกืื ืื ืืืชืจ ืฉืืื ืืืืจืื ืืืืืข ืืชืื ื ืืืื ืื ืฉืื ืื, ืืืืขืื ืืืื ืืื. ืืฆื ืื ืืชืจืืฉ ืืฉืืชืจืืฉืช ืืจืืื ืืืื ืืืื ืื ืืืืืืืืืก ืฉืืื ืืืืจ ืืืืืข ืฉื ื ืืฉืชืืื ืืจืืฉืื." - } - ] - } -} + "operatorSelectorOptions": { + "all": "ืืื" + }, + "dashboard_page_graph_title_hour": "ืืืืื ืืฆืืื ืืกื ืื ืกืืขืืช ืืคื ืฉืขื", + "dashboard_page_graph_title_day": "ืืืืื ืืฆืืื ืืกื ืื ืกืืขืืช ืืคื ืืื", + "group_by_day_tooltip_content": "ืงืืืืฅ ืืคื ืืื", + "order_by_hour": "ืืคื ืฉืขื", + "order_by_severity": "ืืคื ืืืืจื", + "choose_dates": "ืชืืจืืืื", + "single_line_map_title": "ืืืงืืืื ืฉื ืงื ืฉื ืืืจ", + "reportBug": { + "description": "ืืืคืก ืื ื ืืขื ืขื ืื ืช ืฉื ืืื ืืงืื ืคืืืืง ืืืฉืคืจ ืืช ืืืคืืืงืฆืื. ืืชืฉืืืช ืืื - ืืืืคืก ื ืฉืื ืGitHub, ืืืืืืข ืฉืืฆืืืื ืื ืืืื ืฆืืืืจื.", + "error": "ืืืจืขื ืฉืืืื ืืขืช ืฉืืืืช ืืืืืื. ืื ื ื ืกื ืฉืื ืืืืืจ ืืืชืจ.", + "success": "ืชืืื ืขื ืืืืืื!", + "viewIssue": "ืืฆืคืืื ืืืืืื" + }, + "plannedRoute": "ืืกืืื ืืชืืื ื", + "actualRoute": "ืืกืืื ืืคืืขื", + "youtube_modal_info_title": "ืกืจืืื ืืกืืจ", + "open_video_about_this_page": "ืืคืชืื ืกืจืืื ืขื ืืขืืื ืืื", + "publicAppealPage": { + "title": "ืงืื ืงืืจื", + "tasks": [{ + "title": "ืืืคื ื ืืจืฉืื ื ืชืืื ืชืขืืืฃ ืืชืืืืจื ืฆืืืืจืืช (ื ืช\"ืฆืื)?", + "description": "ืAPI ืฉื ืืืืืืืก ื ืืชื ืืืฆืื ืืช ืืืืงืืืื ืืืืืืืงืื ืฉื ืื ืืืืืืืืกืื ืืืจืฅ ืืฉื ืื ืืืืจืื ืืช. ืืืืื ืืืืฉืื ืืฉ ืขืืืกื ืชื ืืขื? ืืืืื ืืืืฉืื ืืฉ ืคืขืจ ืืฉืืขืืชื ืืื ืืฉืขืืช ืืขืืืกืืช ืืืื ืืืื ืืฉืขืืช ืืืืืืืช ืฉื ืืชืืืืจื? ืขื ืืื ืื ืืืื ืฉื ืื ืชืื ืื, ืื ื ืืืืื ืื ืฉื ืืชื ืืืื ืืืฆืืืข ืขื ืืืืฉืื ืกืคืฆืืคืืื ืฉืืื ืืชืจืืืื ืืขืืืกืื. ื ืฉืื ืืขืืจืชื!" + }, + { + "title": "ืืืฉืื ืฉืขืช ืืืฆืืื ืืชืื ืช ืืืืฆื, ืืฉืขืช ืืืืขื ืืชืื ืืช ืืฉืื ืืช ืืืกืืื", + "description": "ืืื ื ืืข ืื ืืืืืืืืก ืืฆื ืืืื, ืืงืืื ืื ืืืืจ? ืืืจื ืืื, ืืืืฉืืจืื ืขื ืืื ืืืืืืืืก ืืืคืขืืื ืืกืคืจ ืืงืืช ืืจื ืชืืืืช ืื ืกืืขื, ืืืคืืื ืืฉ ืื ื ืืืืืืช ืืืงืื ืจืืืช ืขื ืืืืืืืกืื ืืจื ืืืฆืืื ืฉืืื ืืืจื. ืืื ืืฉ ืืืืืืืกืื ืฉืืืฆืืื ืืชืื ืช ืืืืฆื ืืคื ื ืืืื ืฉืืืืืจ ืืื? ืื ืื, ืื ืื ืืกืืจ - ืื ืฉืื ืืขืืจืชื ืืืืืื ืื ืืืืจ ืืชืืคืขื ืืื." + }, + { + "title": "ืืื ืืฉืืื ืงืืื ืืืืืืืก ืืืืืจืื ืืืืืืจืคืืื?", + "description": "ื ืฉืื ืืืื ืืืฆืื ืกืืืืกืืืงื ืืืชืจ ืืคื ืืืืจ ืืืืืจืคื. ืืื ืงืืืื ืืืืืจ ืืจืืฉืืืื ืืชืคืงืืื ืืื ืืืชืจ ืืงืืืื ืืืืืจ ืืืจ ืฉืืข? ืืฉืืื ืื, ืืืื ืฆืจืื ืืืืื ืืืืืืื ืืื ืืืชืืืืก ืืงื ืืจืืฉืืืื-ืืืจ ืฉืืข. ืืื ืืื ืฉืืื ืืฉื ื ืืืืืจืื? ืืืื ืขืืืฃ ืืืืจืื ืงืืืื ืืืื ืืืืชืืืื? ืื ืื ื ืคืชืืืื ืืจืขืืื ืืช ืฉืืื, ืืืืื ืื ืืืฆืืข ืืืจืืฆืืืช ืฉืื ืืช ืืืกืืืข ืืฉืื ืืืชื ืืืขืจืืช." + }, + { + "title": "ืืชืงืืฆืืช ืืืืืืืกืื", + "description": "ืืืงืืคืืื - ืืชืืืืจื ืฆืืืืจืืช, ืืชืงืืฆืืช ืืืืืืืกืื (ืืื ืืืืช: Bus Bunching) ืืื ืืฆื ืฉืื ืฉื ื ืืืืืืืกืื ืื ืืืชืจ ืฉืืื ืืืืจืื ืืืืืข ืืชืื ื ืืืื ืื ืฉืื ืื, ืืืืขืื ืืืื ืืื. ืืฆื ืื ืืชืจืืฉ ืืฉืืชืจืืฉืช ืืจืืื ืืืื ืืืื ืื ืืืืืืืืืก ืฉืืื ืืืืจ ืืืืืข ืฉื ื ืืฉืชืืื ืืจืืฉืื." + } + ] + } +} \ No newline at end of file diff --git a/src/pages/timeBasedMap/index.tsx b/src/pages/timeBasedMap/index.tsx index 3b952583..ff501b5a 100644 --- a/src/pages/timeBasedMap/index.tsx +++ b/src/pages/timeBasedMap/index.tsx @@ -2,7 +2,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react' import { MapContainer, Marker, Polyline, Popup, TileLayer, useMap } from 'react-leaflet' import MarkerClusterGroup from 'react-leaflet-cluster' import { useTranslation } from 'react-i18next' -import Alert from '@mui/material/Alert' import Typography from '@mui/material/Typography' import CircularProgress from '@mui/material/CircularProgress' import IconButton from '@mui/material/IconButton' @@ -102,20 +101,12 @@ export default function TimeBasedMapPage() { {t('time_based_map_page_title')} - - - {t('time_based_map_page_description')} - - {/* from date */} - - - Date: Tue, 11 Jun 2024 10:40:57 +0300 Subject: [PATCH 2/7] refactor: Add InfoYoutubeModal component and update page title in historicTimeline --- src/pages/historicTimeline/index.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pages/historicTimeline/index.tsx b/src/pages/historicTimeline/index.tsx index 9fcf86d7..a6d27fb2 100644 --- a/src/pages/historicTimeline/index.tsx +++ b/src/pages/historicTimeline/index.tsx @@ -16,7 +16,6 @@ import { Label } from 'src/pages/components/Label' import { useTranslation } from 'react-i18next' import StopSelector from 'src/pages/components/StopSelector' import Typography from '@mui/material/Typography' -import Alert from '@mui/material/Alert' import CircularProgress from '@mui/material/CircularProgress' import { getSiriStopHitTimesAsync } from 'src/api/siriService' import { TimelineBoard } from 'src/pages/components/timeline/TimelineBoard' @@ -26,6 +25,7 @@ import { NotFound } from '../components/NotFound' import moment from 'moment' import { DateSelector } from '../components/DateSelector' import Grid from '@mui/material/Unstable_Grid2' // Grid version 2 +import InfoYoutubeModal from '../components/YoutubeModal' const StyledTimelineBoard = styled(TimelineBoard)` margin-top: ${MARGIN_MEDIUM * 3}px; @@ -140,14 +140,15 @@ const TimelinePage = () => { return ( - + {t('timeline_page_title')} + - - {t('timeline_page_description')} - - {/* choose date */} From 8f2e07538da0f8b999f5fa9de0397745ab394533 Mon Sep 17 00:00:00 2001 From: israel zusha rotenberg <100128949+zushar@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:44:23 +0300 Subject: [PATCH 3/7] refactor: Update DashboardPage with InfoYoutubeModal and remove unused Alert component --- src/pages/dashboard/DashboardPage.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pages/dashboard/DashboardPage.tsx b/src/pages/dashboard/DashboardPage.tsx index 8586637b..ca9142bb 100644 --- a/src/pages/dashboard/DashboardPage.tsx +++ b/src/pages/dashboard/DashboardPage.tsx @@ -36,13 +36,10 @@ const DashboardPage = () => { {t('dashboard_page_title')} - - {t('dashboard_page_description')} - {startDate > endDate ? ( {t('bug_date_alert')} From 688c40eaad92143b86d9e9a2040ad9502ec0b76d Mon Sep 17 00:00:00 2001 From: israel zusha rotenberg <100128949+zushar@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:59:23 +0300 Subject: [PATCH 4/7] refactor: Update GapsPage with InfoYoutubeModal and remove unused Alert component --- src/pages/gaps/index.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/gaps/index.tsx b/src/pages/gaps/index.tsx index 76217f97..0fb12ed6 100644 --- a/src/pages/gaps/index.tsx +++ b/src/pages/gaps/index.tsx @@ -22,7 +22,7 @@ import { INPUT_SIZE } from 'src/resources/sizes' import DisplayGapsPercentage from '../components/DisplayGapsPercentage' import axios from 'axios' import Typography from '@mui/material/Typography' -import Alert from '@mui/material/Alert' +import InfoYoutubeModal from '../components/YoutubeModal' const Cell = styled.div` width: 120px; @@ -116,12 +116,14 @@ const GapsPage = () => { return ( - + {t('gaps_page_title')} + - - {t('gaps_page_description')} - {/* choose date */} From 8118f3c14d1d6f80b4ee8b8c758c08f6d48a94d0 Mon Sep 17 00:00:00 2001 From: israel zusha rotenberg <100128949+zushar@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:03:12 +0300 Subject: [PATCH 5/7] refactor: Remove unused Alert component and update video title in GapsPatternsPage --- src/pages/gapsPatterns/GapsPatternsPage.tsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/pages/gapsPatterns/GapsPatternsPage.tsx b/src/pages/gapsPatterns/GapsPatternsPage.tsx index 8016bf74..59ebab05 100644 --- a/src/pages/gapsPatterns/GapsPatternsPage.tsx +++ b/src/pages/gapsPatterns/GapsPatternsPage.tsx @@ -1,7 +1,7 @@ import { useContext, useEffect, useState } from 'react' import './GapsPatternsPage.scss' import { Moment } from 'moment' -import { Skeleton, Radio, RadioChangeEvent, Space } from 'antd' +import { Skeleton, Radio, RadioChangeEvent } from 'antd' import CircularProgress from '@mui/material/CircularProgress' import moment from 'moment/moment' import { useDate } from '../components/DateTimePicker' @@ -180,15 +180,10 @@ const GapsPatternsPage = () => { {t('gaps_patterns_page_title')} - - - {t('gaps_patterns_page_description')} - - {startDate > endDate ? ( {t('bug_date_alert')} From 505abed9e81964fa471df19858760a3a36933ff9 Mon Sep 17 00:00:00 2001 From: israel zusha rotenberg <100128949+zushar@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:39:41 +0300 Subject: [PATCH 6/7] refactor: Add conditional rendering for YouTube video in InfoYoutubeModal component --- src/pages/components/YoutubeModal.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/pages/components/YoutubeModal.tsx b/src/pages/components/YoutubeModal.tsx index 147c424a..e94ec1d1 100644 --- a/src/pages/components/YoutubeModal.tsx +++ b/src/pages/components/YoutubeModal.tsx @@ -29,12 +29,15 @@ const InfoYoutubeModal = ({ videoUrl, label, title }: InfoYoutubeModalProps) => onCancel={() => { setVisible(false) }}> - - - + {videoUrl.includes('youtube') ? ( + + + + ) : ( + <>> + )} > ) } - export default InfoYoutubeModal From 2bb41f8201e93f28479ab48c6fd08fa826f5a77d Mon Sep 17 00:00:00 2001 From: israel zusha rotenberg <100128949+zushar@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:46:35 +0300 Subject: [PATCH 7/7] refactor: Update homepage layout and styling --- src/pages/homepage/HomePage.scss | 112 +++++++++++++++---------------- src/pages/homepage/HomePage.tsx | 25 ++++++- 2 files changed, 77 insertions(+), 60 deletions(-) diff --git a/src/pages/homepage/HomePage.scss b/src/pages/homepage/HomePage.scss index dac67f17..47934108 100644 --- a/src/pages/homepage/HomePage.scss +++ b/src/pages/homepage/HomePage.scss @@ -1,69 +1,67 @@ .ant-layout { - position: relative; + position: relative; } .container { - width: 100%; - display: flex; - flex-direction: column; - align-items: center; - text-align: center; - overflow: hidden; - - img { - height: 15rem; - } - - h1 { - margin: 0; - } - - p { - margin-bottom: 3rem; - font-size: large; - } - - footer { - background-color: #b0d0a4; width: 100%; - font-weight: 500; - position: absolute; - bottom: 0; - padding: 0.5rem 0; - } + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + overflow: hidden; + img { + height: 15rem; + } + h1 { + margin: 0; + } + p { + margin-bottom: 2rem; + font-size: large; + } + footer { + background-color: #b0d0a4; + width: 100%; + font-weight: 500; + position: absolute; + bottom: 0; + padding: 0.5rem 0; + } } .links { - display: grid; - grid-template-columns: repeat(4, 1fr); - gap: 1rem; - - @media (width <= 600px) { - margin-bottom: 3rem; - } + display: grid; + grid-template-columns: repeat(4, 1fr); + gap: 1rem; + @media (width <=600px) { + margin-bottom: 3rem; + } } .page-link { - display: flex; - flex-direction: column; - align-items: center; - font-size: medium; - font-weight: 600; - justify-content: space-between; - - span { - margin-bottom: 0.5rem; - } - - a { - background-color: #b74c42; - color: white; - padding: 0 1.5rem; - border-radius: 0.5rem; - transition: 0.2s ease-in-out 0s; - - &:hover { - transform: scale(1.25); + display: flex; + flex-direction: column; + align-items: center; + font-size: medium; + font-weight: 600; + svg { + margin-bottom: 0.3rem; } - } -} + span { + margin-bottom: 0.3rem; + } + p { + font-size: small; + font-weight: 500; + } + a { + background-color: #b74c42; + color: white; + padding: 0 1.5rem; + border-radius: 0.5rem; + transition: 0.2s ease-in-out 0s; + &:hover { + transform: scale(1.25); + } + } +} \ No newline at end of file diff --git a/src/pages/homepage/HomePage.tsx b/src/pages/homepage/HomePage.tsx index 241cd3d1..67996f63 100644 --- a/src/pages/homepage/HomePage.tsx +++ b/src/pages/homepage/HomePage.tsx @@ -20,14 +20,30 @@ export const HomePage = () => { {t('homepage.databus_definition')} {t('homepage.website_goal')} - } label={t('timeline_page_title')} to="/timeline" /> - } label={t('gaps_page_title')} to="/gaps" /> + } + label={t('timeline_page_title')} + description={t('timeline_page_description')} + to="/timeline" + /> + } + label={t('gaps_page_title')} + description={t('gaps_page_description')} + to="/gaps" + /> } label={t('gaps_patterns_page_title')} + description={t('gaps_patterns_page_description')} to="/gaps_patterns" /> - } label={t('time_based_map_page_title')} to="/map" /> + } + label={t('time_based_map_page_title')} + description={t('time_based_map_page_description')} + to="/map" + /> @@ -37,10 +53,12 @@ export const HomePage = () => { const PageLink = ({ icon, label, + description, to, }: { icon: React.ReactElement label: string + description: string to: To }) => { const { t } = useTranslation() @@ -50,6 +68,7 @@ const PageLink = ({ {icon} {label} {t('homepage.show_button')} + {description} ) }
{t('homepage.website_goal')}
{description}