From d689d33833fc98039ed6f4595c8bf6e48209371f Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 20 Apr 2020 11:42:03 +0200 Subject: [PATCH] fix: Improve translations slightly (#556) --- App/Screens/About/About.tsx | 4 ++-- App/Screens/Details/Header/Header.tsx | 6 +++--- App/localization/languages/en.json | 2 +- App/localization/languages/es.json | 2 +- App/localization/languages/fr.json | 2 +- App/localization/languages/it.json | 2 +- App/localization/languages/kr.json | 2 +- App/localization/languages/ru.json | 2 +- App/localization/languages/sv.json | 2 +- App/localization/languages/ua.json | 2 +- App/localization/languages/zh-tw.json | 2 +- README.md | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/App/Screens/About/About.tsx b/App/Screens/About/About.tsx index ec05e5ed..7818b8aa 100644 --- a/App/Screens/About/About.tsx +++ b/App/Screens/About/About.tsx @@ -182,7 +182,7 @@ export function About(props: AboutProps): React.ReactElement { {t('about_beta_inaccurate_title')} @@ -207,7 +207,7 @@ export function About(props: AboutProps): React.ReactElement { diff --git a/App/Screens/Details/Header/Header.tsx b/App/Screens/Details/Header/Header.tsx index 55250ba6..c4d15063 100644 --- a/App/Screens/Details/Header/Header.tsx +++ b/App/Screens/Details/Header/Header.tsx @@ -122,9 +122,9 @@ export function Header(props: HeaderProps): React.ReactElement { /> {renderInfo( t('details_header_latest_update_label'), - `${formatDistanceToNow(new Date(api.pm25.date.local))} ${t( - 'details_header_latest_update_ago' - )}` + t('details_header_latest_update_ago', { + time: formatDistanceToNow(new Date(api.pm25.date.local)), + }) )} {renderInfo( t('details_header_primary_pollutant_label'), diff --git a/App/localization/languages/en.json b/App/localization/languages/en.json index fd1557bd..0d5cafac 100644 --- a/App/localization/languages/en.json +++ b/App/localization/languages/en.json @@ -81,7 +81,7 @@ "details_air_quality_station_marker": "Air Quality Station", "details_your_position_marker": "Your position", "details_header_latest_update_label": "Latest Update:", - "details_header_latest_update_ago": "ago", + "details_header_latest_update_ago": "{{time}} ago", "details_header_primary_pollutant_label": "Primary Pollutant:", "details_distance_label": "AQI Station: {{distanceToStation}}{{distanceUnit}} away", "distance_unit_short_km": "km", diff --git a/App/localization/languages/es.json b/App/localization/languages/es.json index 4a4fa06a..49979a38 100644 --- a/App/localization/languages/es.json +++ b/App/localization/languages/es.json @@ -68,7 +68,7 @@ "home_wait_more_days": "{{days}} dias mas", "home_wait_until_results": "para enseñar sus resultados", "search_current_location": "Su ubicación presentemente", - "details_header_latest_update_ago": "hace", + "details_header_latest_update_ago": "hace {{time}}", "distance_unit": "km", "haversine_distance_unit": "km", "past_stations_loading": "Cargando", diff --git a/App/localization/languages/fr.json b/App/localization/languages/fr.json index c915535b..a0995ffe 100644 --- a/App/localization/languages/fr.json +++ b/App/localization/languages/fr.json @@ -68,7 +68,7 @@ "home_wait_more_days": "{{days}} plus de jours", "home_wait_until_results": "Vos résultats", "search_current_location": "Votre position", - "details_header_latest_update_ago": "depuis", + "details_header_latest_update_ago": "il y a {{time}}", "distance_unit": "km", "haversine_distance_unit": "km", "past_stations_loading": "Chargement", diff --git a/App/localization/languages/it.json b/App/localization/languages/it.json index b9d6d9ad..639341f6 100644 --- a/App/localization/languages/it.json +++ b/App/localization/languages/it.json @@ -47,7 +47,7 @@ "details_air_quality_station_marker": "Stazione Qualità Aria", "details_your_position_marker": "La tua posizione", "details_header_latest_update_label": "Ultimo aggiornamento:", - "details_header_latest_update_ago": "fa", + "details_header_latest_update_ago": "fa {{time}}", "details_header_primary_pollutant_label": "Primary Pollutant:", "details_distance_label": "Stazione AQI: {{distanceToStation}}{{distanceUnit}} lontano", "distance_unit_short_km": "km", diff --git a/App/localization/languages/kr.json b/App/localization/languages/kr.json index d5345710..dcd9c58c 100755 --- a/App/localization/languages/kr.json +++ b/App/localization/languages/kr.json @@ -68,7 +68,7 @@ "home_wait_more_days": "{{days}} 일 더", "home_wait_until_results": "결과 표시", "search_current_location": "당신의 현재 위치", - "details_header_latest_update_ago": "전에", + "details_header_latest_update_ago": "전에 {{time}}", "distance_unit": "킬로미터", "haversine_distance_unit": "킬로미터", "past_stations_loading": "로딩중", diff --git a/App/localization/languages/ru.json b/App/localization/languages/ru.json index c8e2c665..4161b431 100644 --- a/App/localization/languages/ru.json +++ b/App/localization/languages/ru.json @@ -47,7 +47,7 @@ "details_air_quality_station_marker": "Станция определения качества воздуха (AQI)", "details_your_position_marker": "Ваше местоположение", "details_header_latest_update_label": "Последнее обновление:", - "details_header_latest_update_ago": "тому назад", + "details_header_latest_update_ago": "тому назад {{time}}", "details_header_primary_pollutant_label": "Основной загрязнитель:", "details_distance_label": "Расстояние до AQI станции: {{distanceToStation}}{{distanceUnit}}", "distance_unit_short_km": "км", diff --git a/App/localization/languages/sv.json b/App/localization/languages/sv.json index 2198ece2..d8fc8ebc 100644 --- a/App/localization/languages/sv.json +++ b/App/localization/languages/sv.json @@ -47,7 +47,7 @@ "details_air_quality_station_marker": "Luftkvalitetsstation", "details_your_position_marker": "Din position", "details_header_latest_update_label": "Senaste uppdatering:", - "details_header_latest_update_ago": "sedan", + "details_header_latest_update_ago": "sedan {{time}}", "details_header_primary_pollutant_label": "Huvudsakligt förorenande ämne:", "details_distance_label": "LKS Station: {{distanceToStation}}{{distanceUnit}} away", "distance_unit_short_km": "km", diff --git a/App/localization/languages/ua.json b/App/localization/languages/ua.json index de788316..9632fa64 100644 --- a/App/localization/languages/ua.json +++ b/App/localization/languages/ua.json @@ -47,7 +47,7 @@ "details_air_quality_station_marker": "Станція моніторингу повітря", "details_your_position_marker": "Твоє положення", "details_header_latest_update_label": "Останнє оновлення:", - "details_header_latest_update_ago": "назад", + "details_header_latest_update_ago": "назад {{time}}", "details_header_primary_pollutant_label": "Основний забрудник:", "details_distance_label": "Станція в {{distanceToStation}}{{distanceUnit}} звідси", "distance_unit_short_km": "км", diff --git a/App/localization/languages/zh-tw.json b/App/localization/languages/zh-tw.json index a8dd5d3a..b2d76202 100644 --- a/App/localization/languages/zh-tw.json +++ b/App/localization/languages/zh-tw.json @@ -68,7 +68,7 @@ "home_wait_more_days": "{{days}} 更多天", "home_wait_until_results": "顯示你的結果", "search_current_location": "你現在的位置", - "details_header_latest_update_ago": "之前", + "details_header_latest_update_ago": "{{time}} 之前", "distance_unit": "公里", "haversine_distance_unit": "公里", "past_stations_loading": "載入中", diff --git a/README.md b/README.md index 036c312c..e608fef0 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ All required API tokens are already pre-filled in `app.example.json`. If you wan If you find a bug, or if you have an idea for this app, please [file an issue here](https://github.com/amaurymartiny/shoot-i-smoke/issues). We really appreciate feedback and inputs! -🇬🇧🇫🇷🇪🇸🇨🇳 You may also contribute with translations with our online tool [POEditor](https://poeditor.com/join/project/iEsj0CSPGX). +🇬🇧🇫🇷🇪🇸🇨🇳 You may also contribute with translations with our online tool [POEditor](https://poeditor.com/join/project/iEsj0CSPGX). If you need context for some terms, here are [some screenshots](https://nx1394.your-storageshare.de/s/grS6CZJGapRSH6i). For code contribution, the codebase heavily relies on functional programming principles via the [`fp-ts`](https://github.com/gcanti/fp-ts) library. The codebase itself is quite simple, so even if you're beginner to functional programming, it shouldn't be hard to follow along. You can start with these [easy tasks](https://github.com/amaurymartiny/shoot-i-smoke/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).