Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Implement miles/kilometer selector #252

Merged
merged 11 commits into from
Oct 6, 2019
Merged

feat: Implement miles/kilometer selector #252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1fef766
feat: extend i18n data with distance
matepapp Oct 5, 2019
cb4f84e
feat: implement initial switch logic and styling
matepapp Oct 5, 2019
b181ffc
chore: add prettier config file
matepapp Oct 5, 2019
9ffc59a
feat: extend translations with distance
matepapp Oct 5, 2019
e9f80e0
feat: create DistanceUnit Store
matepapp Oct 5, 2019
97853e6
refactor: use new DistanceUnit Store
matepapp Oct 5, 2019
b457cc9
fix: add missing whitespaces
matepapp Oct 5, 2019
48c5420
chore: remove prettierrc
matepapp Oct 5, 2019
699dfbf
Update App/stores/distanceUnit.tsx
matepapp Oct 6, 2019
f67dcdd
fix: resolve review's comments
matepapp Oct 6, 2019
a9bedb4
fix: resolve lint errors
matepapp Oct 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: extend translations with distance
  • Loading branch information
@matepapp
matepapp committed Oct 5, 2019
commit 9ffc59a5d35844ebd7d93848db06563eef2e3828
8 changes: 5 additions & 3 deletions App/localization/languages/en-us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@
"details_header_latest_update_ago": "ago",
"details_header_primary_pollutant_label": "Primary Pollutant:",
"details_distance_label": "AQI Station: {{distanceToStation}}{{distanceUnit}} away",
"distance_unit": "mi",
"haversine_distance_unit": "mile",
"distance_unit_short_km": "km",
"distance_unit_short_mi": "mi",
"distance_unit_long_km": "kilometer",
"distance_unit_long_mi": "mile",
"past_stations_loading": "Loading",
"past_stations_date_from_to": "{{startDate}} to {{endDate}}",
"past_stations_monitored_weekly": "Stations monitored from you during the week",
Expand All @@ -76,7 +78,7 @@
"about_weird_results_message_1": "We have also encountered a few surprising results: large cities with better air than small villages; sudden huge increases in the number of cigarettes; stations of the same town showing significantly different numbers... The fact is air quality depends on several factors such as temperature, pressure, humidity and even wind direction and intensity. If the result seems weird for you, check",
"about_weird_results_link_1": "WAQI",
"about_weird_results_message_2": "for more information and history on your station.",
"about_distance_title": "Distance",
"about_distance_unit_title": "Distance Unit",
"about_credits_title": "Credits",
"about_credits_concept_and_development": "Concept & Development by",
"about_credits_design_and_copywriting": "Design & Copywriting by",
Expand Down
8 changes: 5 additions & 3 deletions App/localization/languages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@
"details_header_latest_update_ago": "ago",
"details_header_primary_pollutant_label": "Primary Pollutant:",
"details_distance_label": "AQI Station: {{distanceToStation}}{{distanceUnit}} away",
"distance_unit": "km",
"haversine_distance_unit": "km",
"distance_unit_short_km": "km",
"distance_unit_short_mi": "mi",
"distance_unit_long_km": "kilometer",
"distance_unit_long_mi": "mile",
"past_stations_loading": "Loading",
"past_stations_date_from_to": "{{startDate}} to {{endDate}}",
"past_stations_monitored_weekly": "Stations monitored from you during the week",
Expand All @@ -76,7 +78,7 @@
"about_weird_results_message_1": "We have also encountered a few surprising results: large cities with better air than small villages; sudden huge increases in the number of cigarettes; stations of the same town showing significantly different numbers... The fact is air quality depends on several factors such as temperature, pressure, humidity and even wind direction and intensity. If the result seems weird for you, check",
"about_weird_results_link_1": "WAQI",
"about_weird_results_message_2": "for more information and history on your station.",
"about_distance_title": "Distance",
"about_distance_unit_title": "Distance Unit",
"about_credits_title": "Credits",
"about_credits_concept_and_development": "Concept & Development by",
"about_credits_design_and_copywriting": "Design & Copywriting by",
Expand Down
9 changes: 6 additions & 3 deletions App/localization/languages/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
"details_header_latest_update_label": "脷ltima actualizaci贸n:",
"details_header_primary_pollutant_label": "Contaminante primario:",
"details_distance_label": "Estaci贸n AQI: a {{distanceToStation}}{{distanceUnit}}",
"distance_unit": "km",
"haversine_distance_unit": "km",
"distance_unit_short_km": "km",
"distance_unit_short_mi": "mi",
"distance_unit_long_km": "kil贸metro",
"distance_unit_long_mi": "milla",
"about_how_do_you_calculate_the_number_of_cigarettes_title": "C谩lculo de cigarrillos",
"about_how_do_you_calculate_the_number_of_cigarettes_message_1": "Esta aplicaci贸n se inspir贸 en los hallazgos de Berkeley Earth sobre la",
"about_how_do_you_calculate_the_number_of_cigarettes_link_1": "Equivalencia entre la contaminaci贸n del aire y el tabaquismo.",
Expand All @@ -54,11 +56,12 @@
"about_weird_results_message_1": "Hemos encontrado algunos resultados sorprendentes: ciudades grandes con mejor aire que peque帽as aldeas;grandes aumentos en el n煤mero de cigarrillos; Las estaciones de la misma ciudad muestran n煤meros significativamente diferentes ... El hecho es que la calidad del aire depende de varios factores, como la temperatura, la presi贸n, la humedad e incluso la direcci贸n e intensidad del viento. Si el resultado te parece extra帽o, verifica",
"about_weird_results_link_1": "WAQI",
"about_weird_results_message_2": "Para m谩s informaci贸n en su estaci贸n.",
"about_distance_unit_title": "Unidad de Distancia",
"about_credits_title": "Creditos",
"about_credits_concept_and_development": "Concepto y Desarrollo por",
"about_credits_design_and_copywriting": "Dise帽o y Copywriting por",
"about_credits_data_from": "Datos de calidad del aire de",
"about_credits_source_code": "C贸digo fuente",
"about_credits_available_github": "disponible en Github",
"about_language": "Idioma"
}
}