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.

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

Already on GitHub? Sign in to your account

fix: Improve translations slightly #556

Merged
merged 2 commits into from
Apr 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions App/Screens/About/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export function About(props: AboutProps): React.ReactElement {
</View>

<ScrollIntoView
onMount={route.params.scrollInto === 'aboutBetaInaccurate'}
onMount={route.params?.scrollInto === 'aboutBetaInaccurate'}
style={styles.section}
>
<Text style={styles.h2}>{t('about_beta_inaccurate_title')}</Text>
Expand All @@ -207,7 +207,7 @@ export function About(props: AboutProps): React.ReactElement {
</View>

<ScrollIntoView
onMount={route.params.scrollInto === 'aboutWhyIsTheStationSoFarTitle'}
onMount={route.params?.scrollInto === 'aboutWhyIsTheStationSoFarTitle'}
style={styles.section}
>
<Text style={styles.h2}>
Expand Down
6 changes: 3 additions & 3 deletions App/Screens/Details/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "로딩중",
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "км",
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/ua.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "км",
Expand Down
2 changes: 1 addition & 1 deletion App/localization/languages/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "載入中",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down