Skip to content

Commit

Permalink
fix: change data to observations throughout app (#2495)
Browse files Browse the repository at this point in the history 
* fix: update delete account screen #2474

* fix: update interstitial text (#2473)

* fix: remove duplicated delete site text

* fix: update delete site dialog text (#2472)

* fix: fix transfer sites screen text (#2469)

* fix: use cannot instead of can’t for internal consistency

* fix: update delete project text (#1150)

* fix: update team management text (#2468)

* fix: update depth text (#2467)

* fix: update projects screen text (#2466)

* fix: update data privacy text (#2465)

* fix: update requirements text (#2464)

* chore: update snapshots

* chore: generate PO files
  • Loading branch information
@paulschreiber
paulschreiber authored Nov 18, 2024
1 parent e0e27a1 commit e444fbc
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 89 deletions.
2 changes: 1 addition & 1 deletion dev-client/__tests__/snapshot/__snapshots__/CreateProjectScreen-test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ exports[`renders correctly 1`] = `
}
}
>
All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).
All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).
</Text>
<Text
letterSpacing="0.15px"
Expand Down
2 changes: 1 addition & 1 deletion dev-client/__tests__/snapshot/__snapshots__/CreateSiteScreen-test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ exports[`renders correctly 1`] = `
}
}
>
All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).
All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).
</Text>
<Text
letterSpacing="0.15px"
Expand Down
4 changes: 2 additions & 2 deletions dev-client/__tests__/snapshot/__snapshots__/ProjectViewScreen-test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,7 @@ exports[`renders correctly 1`] = `
}
}
>
All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).
All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).
</Text>
<Text
letterSpacing="0.15px"
Expand Down Expand Up @@ -3375,7 +3375,7 @@ exports[`renders correctly 1`] = `
}
}
>
Data Collection Requirements
Observation Requirements
</Text>
<View
accessibilityRole="button"
Expand Down
2 changes: 1 addition & 1 deletion dev-client/__tests__/snapshot/__snapshots__/SiteTabsScreen-test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,7 @@ exports[`renders correctly 1`] = `
}
}
>
All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).
All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).
</Text>
<Text
letterSpacing="0.15px"
Expand Down
82 changes: 44 additions & 38 deletions dev-client/locales/po/en.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2024-10-18T20:10:11.766Z\n"
"PO-Revision-Date: 2024-10-18T20:10:11.767Z\n"
"POT-Creation-Date: 2024-11-18T16:51:33.732Z\n"
"PO-Revision-Date: 2024-11-18T16:51:33.733Z\n"

msgid "welcome##title"
msgstr "Welcome to LandPKS Soil ID"
Expand All @@ -18,7 +18,7 @@ msgid "welcome##version_includes##bullet_1"
msgstr "Soil identification for US locations"

msgid "welcome##version_includes##bullet_2"
msgstr "Slope and soil data collection"
msgstr "Slope and soil observations"

msgid "welcome##version_includes##bullet_3"
msgstr "Site notes"
Expand Down Expand Up @@ -232,15 +232,6 @@ msgstr "Site Settings"
msgid "site##dashboard##delete_button"
msgstr "Delete this site"

msgid "site##dashboard##delete_site_modal##title"
msgstr "Delete site?"

msgid "site##dashboard##delete_site_modal##body"
msgstr "This will permanently delete the site {{siteName}} and all of its data. This cannot be undone."

msgid "site##dashboard##delete_site_modal##action_name"
msgstr "Delete"

msgid "site##dashboard##location_accuracy"
msgstr "Location Accuracy"

Expand Down Expand Up @@ -515,7 +506,7 @@ msgid "projects##none##header"
msgstr "You don’t have any projects."

msgid "projects##none##info"
msgstr "Projects let you group sites, set data needs, and manage team members."
msgstr "Projects let you group sites, set requirements, and manage team members."

msgid "projects##learn_more"
msgstr "Learn more about using projects"
Expand Down Expand Up @@ -678,9 +669,9 @@ msgstr "Delete project?"

msgid "projects##settings##delete_description"
msgstr ""
"This will permanently delete the project and its sites’ data. This can’t be undone.\n"
"This will permanently delete the project and its sites’ observations. This cannot be undone.\n"
"\n"
"Project managers have the option to transfer sites from this project to keep site data."
"Project managers have the option to transfer sites from this project to keep site observations."

msgid "projects##sites##empty_viewer"
msgstr "This project has no sites yet."
Expand Down Expand Up @@ -714,7 +705,7 @@ msgstr "Delete site?"

msgid "projects##sites##delete_site_modal##body"
msgstr ""
"This will permanently delete the site {{siteName}} and all of its data. This cannot be undone.\n"
"This will permanently delete the site {{siteName}} and all of its observations. This cannot be undone.\n"
"\n"
"Project managers can remove the site from this project to retain its data."

Expand All @@ -725,7 +716,7 @@ msgid "projects##sites##remove_site_modal##title"
msgstr "Remove site from project?"

msgid "projects##sites##remove_site_modal##body"
msgstr "Only you will have access to this site and its data. Other project team members will no longer have access."
msgstr "Only you will have access to this site. Other project team members will no longer have access."

msgid "projects##sites##remove_site_modal##action_name"
msgstr "Remove Site"
Expand All @@ -735,9 +726,9 @@ msgstr "Transfer sites?"

msgid "projects##sites##transfer_site_modal##body"
msgstr ""
"Transferred sites will use the data settings and team member roles from this project.\n"
"Transferred sites will use the inputs, settings and team member roles from this project.\n"
"\n"
"If sites have data entered at different depths than what is specified in this project, that data will be deleted. This can’t be undone."
"If sites have observations entered at different depths than what is specified in this project, rhose observations will be deleted. This cannot be undone."

msgid "projects##sites##transfer_site_modal##action_name"
msgstr "Transfer"
Expand Down Expand Up @@ -785,22 +776,22 @@ msgid "projects##manage_member##manager_help"
msgstr "Can view and edit all aspects of the project and its affiliated sites"

msgid "projects##manage_member##contributor_help"
msgstr "Can view, add, and edit site data"
msgstr "Can view site data, and add and edit observations"

msgid "projects##manage_member##viewer_help"
msgstr "Can view site data"
msgstr "Can view site data and observations"

msgid "projects##manage_member##remove"
msgstr "Remove from project"

msgid "projects##manage_member##remove_help"
msgstr "Remove the team member’s access to this project, retaining any data contributed to sites"
msgstr "Remove the team member’s access to this project, retaining any observations contributed to sites"

msgid "projects##manage_member##confirm_removal_title"
msgstr "Remove from Project?"

msgid "projects##manage_member##confirm_removal_body"
msgstr "This will remove the team member from the project, but will retain their contributed site data."
msgstr "This will remove the team member from the project. Yheir contributed site observations will be retained."

msgid "projects##manage_member##confirm_removal_action"
msgstr "Remove"
Expand All @@ -809,7 +800,7 @@ msgid "projects##transfer_sites##heading"
msgstr "Transfer Sites to this Project"

msgid "projects##transfer_sites##description"
msgstr "Transfer LandPKS Soil ID sites you manage to this project. When you transfer sites, they will use the data settings and team member roles from this project."
msgstr "Transfer LandPKS Soil ID sites you manage to this project. When you transfer sites, they will use the inputs, settings and team member roles from this project."

msgid "projects##transfer_sites##unaffiliated"
msgstr "Unaffiliated"
Expand Down Expand Up @@ -971,7 +962,7 @@ msgid "general##info##privacy_item1"
msgstr "<bold>Public sites</bold> are visible to anyone on the LandPKS data portal."

msgid "general##info##privacy_item2"
msgstr "All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII)."
msgstr "All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII)."

msgid "general##info##privacy_item3"
msgstr "<bold>A private site</bold> not affiliated with a project is only visible to the person who created it. That person can change the privacy at any time. "
Expand Down Expand Up @@ -1094,7 +1085,7 @@ msgid "delete_account##confirm##p3"
msgstr "The following won’t be deleted:"

msgid "delete_account##confirm##p4##b0"
msgstr "data you contributed to a project for which you aren’t the only manager"
msgstr "observations you contributed to a project for which you aren’t the only manager"

msgid "delete_account##confirm##p4##b1"
msgstr "your Terraso account (including groups, landscapes, and story maps)"
Expand Down Expand Up @@ -1223,11 +1214,14 @@ msgid "soil##project_settings##pit_required_label"
msgstr "Soil pit required"

msgid "soil##project_settings##required_data_title"
msgstr "Data Collection Requirements"
msgstr "Observation Requirements"

msgid "soil##required_method"
msgstr "{{method}} (required)"

msgid "soil##collection_method_summary##soilTexture"
msgstr "Texture Class"

msgid "soil##collection_method##slope"
msgstr "Slope and Landscape"

Expand Down Expand Up @@ -1280,10 +1274,22 @@ msgid "soil##collection_method_description##soilTexture"
msgstr "Includes texture class and rock fragment volume"

msgid "soil##vertical_cracking##description"
msgstr "Surface cracks develop in clay-rich soils after they dry out."

msgid "soil##vertical_cracking##no_cracks"
msgstr ""
"Vertical cracks may appear on the soil surface when some soils experience changes in moisture or temperature. The cracks may be permanent, or they may disappear after some time.\n"
"\n"
"Vertical cracks are at least $t(soil.vertical_cracking.description_width, {\"context\": \"{{units}}\"}) wide and $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep. You should be able to place a pencil inside the cracks."
"<bold>No Cracks</bold>\n"
"No cracks are visible on the soil surface."

msgid "soil##vertical_cracking##surface_cracks"
msgstr ""
"<bold>Surface Cracks</bold>\n"
"Surface cracks are less than $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep."

msgid "soil##vertical_cracking##deep_vertical_cracks"
msgstr ""
"<bold>Deep Vertical Cracks</bold>\n"
"Deep vertical cracks are at least $t(soil.vertical_cracking.description_width, {\"context\": \"{{units}}\"}) wide and $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep. You should be able to place a pencil inside the cracks."

msgid "soil##vertical_cracking##description_width_METRIC"
msgstr "5 mm"
Expand Down Expand Up @@ -1370,7 +1376,7 @@ msgid "soil##depth##update_modal##title"
msgstr "Change depth?"

msgid "soil##depth##update_modal##body"
msgstr "Data that has been entered at this depth will be deleted. This action cannot be undone."
msgstr "Soil pit observations that has been entered at this depth will be deleted. This action cannot be undone."

msgid "soil##depth##update_modal##action"
msgstr "Change"
Expand All @@ -1379,7 +1385,7 @@ msgid "soil##depth##delete_modal##title"
msgstr "Delete depth?"

msgid "soil##depth##delete_modal##body"
msgstr "Data that has been entered at this depth will be deleted. This action cannot be undone."
msgstr "Observations that have been entered at this depth will be deleted. This action cannot be undone."

msgid "soil##depth##delete_modal##action"
msgstr "Delete"
Expand Down Expand Up @@ -1409,18 +1415,18 @@ msgid "soil##texture##label"
msgstr "Texture Class"

msgid "soil##texture##info##title"
msgstr "Soil Texture"
msgstr "Texture Class"

msgid "soil##texture##info##description"
msgstr ""
"Soil is made up of particles of different sizes. Once you remove all large particles (anything over $t(soil.texture.info.description_diameter,{\"context\":\"{{units}}\"}) in diameter), what is left is a mixture of sand, silt, and clay.\n"
"Soil is made up of particles of different sizes. Once you remove all rock fragments (anything over $t(soil.texture.info.description_diameter,{\"context\":\"{{units}}\"}) in diameter), what is left is a mixture of sand, silt, and clay.\n"
"\n"
"<bold>Soil texture</bold> is determined by the percent of sand, silt, and clay in the soil. Changes in this ratio can have large impacts on the potential of the soil.\n"
"<bold>Texture class</bold> is determined by the percent of sand, silt, and clay in the soil. Changes in this ratio can have large impacts on the potential of the soil.\n"
"\n"
"Soil texture determines many important characteristics of your land, including:"

msgid "soil##texture##info##description_end"
msgstr "Knowing the soil texture also helps you more accurately identify your soil."
msgstr "Knowing the soil texture helps you more accurately identify your soil."

msgid "soil##texture##info##description_diameter_METRIC"
msgstr "2mm"
Expand Down Expand Up @@ -1459,7 +1465,7 @@ msgid "soil##texture##guide##result"
msgstr "Soil Texture: {{result}}"

msgid "soil##texture##guide##use_label"
msgstr "Use This Texture"
msgstr "Use This Texture Class"

msgid "soil##texture##guide##ribbon_length##SM"
msgstr "<2.5cm"
Expand Down Expand Up @@ -1549,7 +1555,7 @@ msgid "soil##texture##guide##grittyness_details_3"
msgstr "<0>Not gritty or smooth</0> means that neither of those two textures dominates. You may still feel some sand grains or some soapiness, but the feel of the soil is not predominantly one or the other."

msgid "soil##texture##guide_intro"
msgstr "Don’t know your soil texture? Use the step-by-step guide."
msgstr "Don’t know the texture class? Use the step-by-step guide."

msgid "soil##texture##use_guide_label"
msgstr "Use Guide"
Expand Down
40 changes: 23 additions & 17 deletions dev-client/locales/po/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2024-10-18T20:10:11.771Z\n"
"PO-Revision-Date: 2024-10-18T20:10:11.771Z\n"
"POT-Creation-Date: 2024-11-18T16:51:33.737Z\n"
"PO-Revision-Date: 2024-11-18T16:51:33.737Z\n"

msgid "welcome##title"
msgstr "Bienvenido a LandPKS Soil ID"
Expand Down Expand Up @@ -155,15 +155,6 @@ msgstr "Configuraciones del sitio"
msgid "site##dashboard##delete_button"
msgstr "Eliminar este sitio"

msgid "site##dashboard##delete_site_modal##title"
msgstr "¿Eliminar sitio?"

msgid "site##dashboard##delete_site_modal##body"
msgstr "Esto eliminará el sitio {{siteName}} y todos sus datos de manera permanente. Esto no se puede deshacer."

msgid "site##dashboard##delete_site_modal##action_name"
msgstr "Eliminar"

msgid "site##dashboard##location_accuracy"
msgstr "Precisión de ubicación"

Expand Down Expand Up @@ -1228,7 +1219,7 @@ msgid "soil##texture##guide##grittyness_help"
msgstr "¿Cómo se siente el suelo?"

msgid "soil##texture##guide##use_label"
msgstr "Usar esta textura"
msgstr "Usar esta clase de textura"

msgid "soil##texture##guide##ribbon_length##SM"
msgstr "<2.5cm"
Expand Down Expand Up @@ -1590,11 +1581,14 @@ msgstr "Requisitos para la recogida de datos"
msgid "soil##required_method"
msgstr "{{method}} (obligatorio)"

msgid "soil##collection_method_summary##soilTexture"
msgstr "Clase de textura"

msgid "soil##collection_method##slope"
msgstr "Incluye la inclinación, forma, aspecto y posición del pendiente del suelo."

msgid "soil##collection_method##soilTexture"
msgstr "Incluye clase de textura, porcentaje de arcilla y fragmentos de roca"
msgstr "Textura del suelo"

msgid "soil##collection_method##rockFragmentVolume"
msgstr "Fragmento de roca"
Expand Down Expand Up @@ -1642,10 +1636,22 @@ msgid "soil##collection_method_description##soilTexture"
msgstr "Incluye clase de textura y volumen de fragmentos de roca"

msgid "soil##vertical_cracking##description"
msgstr "Surface cracks develop in clay-rich soils after they dry out."

msgid "soil##vertical_cracking##no_cracks"
msgstr ""
"Pueden aparecer grietas verticales en la superficie cuando algunos suelos experimentan cambios de humedad o temperatura. Las grietas pueden ser permanentes o desaparecer con el tiempo.\n"
"\n"
"Las grietas verticales tienen al menos $t(soil.vertical_cracking.description_width, {\"context\": \"{{units}}\"}) de ancho y $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) de profundidad. Deberías poder colocar un lápiz dentro de las grietas."
"<bold>No Cracks</bold>\n"
"No cracks are visible on the soil surface."

msgid "soil##vertical_cracking##surface_cracks"
msgstr ""
"<bold>Surface Cracks</bold>\n"
"Surface cracks are less than $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep."

msgid "soil##vertical_cracking##deep_vertical_cracks"
msgstr ""
"<bold>Deep Vertical Cracks</bold>\n"
"Deep vertical cracks are at least $t(soil.vertical_cracking.description_width, {\"context\": \"{{units}}\"}) wide and $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep. You should be able to place a pencil inside the cracks."

msgid "soil##vertical_cracking##description_width_METRIC"
msgstr "5 mm"
Expand Down Expand Up @@ -1840,7 +1846,7 @@ msgstr ""
"\n"
"La forma de la pendiente se determina en dos direcciones: <bold>pendiente descendente</bold> y <bold>pendiente transversal</bold>.\n"
"\n"
"En primer lugar, determina la dirección principal de la pendiente en el lugar. No tomes en cuenta pequeños baches o zanjas; mira alrededor de $t(pendiente.forma.info.descripcion_distancia, {\"context\": \"{{units}}\"}\"}) en todas las direcciones.\n"
"En primer lugar, determina la dirección principal de la pendiente en el lugar. No tomes en cuenta pequeños baches o zanjas; mira alrededor de $t(slope.shape.info.description_distance, {\"context\": \"{{units}}\"}) en todas las direcciones.\n"
"\n"
"Si lloviera, ¿en qué dirección general fluiría el agua cuesta abajo? Esto se denomina la dirección <bold>pendiente abajo</bold>.\n"
"\n"
Expand Down
6 changes: 3 additions & 3 deletions dev-client/src/screens/SiteSettingsScreen/SiteSettingsScreen.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ export const SiteSettingsScreen = ({siteId}: Props) => {
onPress={onOpen}
/>
)}
title={t('site.dashboard.delete_site_modal.title')}
body={t('site.dashboard.delete_site_modal.body', {
title={t('project.sites.delete_site_modal.title')}
body={t('project.sites.delete_site_modal.body', {
siteName: site.name,
})}
actionName={t('site.dashboard.delete_site_modal.action_name')}
actionName={t('project.sites.delete_site_modal.action_name')}
handleConfirm={onDelete}
/>
</Column>
Expand Down
Loading

0 comments on commit e444fbc

Please sign in to comment.