From ed2b10a04f6549abdd7f940b833d91ef67e8f08b Mon Sep 17 00:00:00 2001
From: Ken-ichi Ueda <kenichi.ueda@gmail.com>
Date: Thu, 31 Oct 2024 12:34:37 -0700
Subject: [PATCH] feat: minor text updates

---
 src/components/AddObsModal.tsx                |  4 ++--
 .../ObsEdit/Sheets/GeoprivacySheet.tsx        |  2 +-
 src/components/Settings/Settings.js           | 16 +++++++------
 src/components/SoundRecorder/SoundRecorder.js | 24 ++++++++-----------
 src/i18n/l10n/en.ftl                          | 15 +++++++-----
 src/i18n/l10n/en.ftl.json                     | 10 ++++----
 src/i18n/strings.ftl                          | 15 +++++++-----
 tests/unit/components/Settings.test.js        |  4 ++--
 8 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/src/components/AddObsModal.tsx b/src/components/AddObsModal.tsx
index cfd72bb48..0ecda3433 100644
--- a/src/components/AddObsModal.tsx
+++ b/src/components/AddObsModal.tsx
@@ -55,7 +55,7 @@ const AddObsModal = ( { closeModal, navAndCloseModal }: Props ) => {
       accessibilityHint: t( "Navigates-to-AI-camera" )
     },
     standardCamera: {
-      text: t( "Take-photos-with-the-camera" ),
+      text: t( "Take-multiple-photos-of-a-single-organism" ),
       icon: "camera",
       onPress: ( ) => navAndCloseModal( "Camera", { camera: "Standard" } ),
       testID: "camera-button",
@@ -73,7 +73,7 @@ const AddObsModal = ( { closeModal, navAndCloseModal }: Props ) => {
       accessibilityHint: t( "Navigates-to-photo-importer" )
     },
     soundRecorder: {
-      text: t( "Record-sounds" ),
+      text: t( "Record-a-sound" ),
       icon: "microphone",
       onPress: ( ) => navAndCloseModal( "SoundRecorder" ),
       testID: "record-sound-button",
diff --git a/src/components/ObsEdit/Sheets/GeoprivacySheet.tsx b/src/components/ObsEdit/Sheets/GeoprivacySheet.tsx
index fc7f9b78e..592019196 100644
--- a/src/components/ObsEdit/Sheets/GeoprivacySheet.tsx
+++ b/src/components/ObsEdit/Sheets/GeoprivacySheet.tsx
@@ -37,7 +37,7 @@ const GeoprivacySheet = ( {
     },
     private: {
       label: t( "Private" ),
-      text: t( "The-location-will-not-be-visible" ),
+      text: t( "The-location-will-not-be-visible-to-others" ),
       value: GEOPRIVACY_PRIVATE
     }
   } ), [t] );
diff --git a/src/components/Settings/Settings.js b/src/components/Settings/Settings.js
index 0f9baa844..a519f2855 100644
--- a/src/components/Settings/Settings.js
+++ b/src/components/Settings/Settings.js
@@ -187,15 +187,15 @@ const Settings = ( ) => {
         />
       </Debug>
       <Heading4 className="mt-7">{t( "INATURALIST-ACCOUNT-SETTINGS" )}</Heading4>
-      <Body2 className="mt-2">{t( "To-access-all-other-settings" )}</Body2>
+      <Body2 className="mt-2">{t( "Edit-your-profile-change-your-settings" )}</Body2>
       <Button
         className="mt-4"
-        text={t( "INATURALIST-SETTINGS" )}
+        text={t( "ACCOUNT-SETTINGS" )}
         onPress={() => {
           confirmInternetConnection( );
           if ( !isConnected ) { return; }
           navigation.navigate( "FullPageWebView", {
-            title: t( "SETTINGS" ),
+            title: t( "ACCOUNT-SETTINGS" ),
             loggedIn: true,
             initialUrl: SETTINGS_URL,
             blurEvent: FINISHED_WEB_SETTINGS,
@@ -203,15 +203,17 @@ const Settings = ( ) => {
             skipSetSourceInShouldStartLoadWithRequest: true,
             shouldLoadUrl: url => {
               async function signOutGoHome() {
-                // sign out
-                await signOut( { realm, clearRealm: true, queryClient } );
-                // navigate to My Obs
-                navigation.navigate( "ObsList" );
                 Alert.alert(
                   t( "Account-Deleted" ),
                   t( "It-may-take-up-to-an-hour-to-remove-content" )
                 );
+                // sign out
+                await signOut( { realm, clearRealm: true, queryClient } );
+                // navigate to My Obs
+                navigation.navigate( "ObsList" );
               }
+              // If the webview navigates to a URL that indicates the account
+              // was deleted, sign the current user out of the app
               if ( url === `${Config.OAUTH_API_URL}/?account_deleted=true` ) {
                 signOutGoHome( );
                 return false;
diff --git a/src/components/SoundRecorder/SoundRecorder.js b/src/components/SoundRecorder/SoundRecorder.js
index 96ac82a74..26ed256e0 100644
--- a/src/components/SoundRecorder/SoundRecorder.js
+++ b/src/components/SoundRecorder/SoundRecorder.js
@@ -189,17 +189,11 @@ const SoundRecorder = (): Node => {
     ? [{ file_url: uri }]
     : [];
 
-  let helpText = t( "Press-record-to-start" );
-  switch ( status ) {
-    case RECORDING:
-      helpText = t( "Recording-sound" );
-      break;
-    case STOPPED:
-      helpText = t( "Recording-stopped-Tap-play-the-current-recording" );
-      break;
-    default:
-      helpText = t( "Press-record-to-start" );
-  }
+  const helpText = useMemo( ( ) => {
+    if ( status === RECORDING ) return t( "Recording-sound" );
+    if ( status === STOPPED ) return t( "Recording-stopped-Tap-play-the-current-recording" );
+    return null;
+  }, [status, t] );
 
   const onBack = () => {
     if ( !params.addEvidence ) {
@@ -264,9 +258,11 @@ const SoundRecorder = (): Node => {
           </View>
         ) }
       </View>
-      <View className="justify-center h-[60px]">
-        <Body1 className="text-white text-center p-2">{helpText}</Body1>
-      </View>
+      { helpText && (
+        <View className="justify-center h-[60px]">
+          <Body1 className="text-white text-center p-2">{helpText}</Body1>
+        </View>
+      ) }
       <MediaNavButtons
         captureButton={captureButton}
         onConfirm={navToObsEdit}
diff --git a/src/i18n/l10n/en.ftl b/src/i18n/l10n/en.ftl
index 94e9431d2..5521bf782 100644
--- a/src/i18n/l10n/en.ftl
+++ b/src/i18n/l10n/en.ftl
@@ -38,6 +38,8 @@ accessible-comname-sciname = { $commonName } ({ $scientificName })
 accessible-sciname-comname = { $scientificName } ({ $commonName })
 # Alert message shown after account deletion
 Account-Deleted = Account Deleted
+# Label for button that shows all account settings
+ACCOUNT-SETTINGS = ACCOUNT SETTINGS
 ACTIVITY = ACTIVITY
 # Label for a button that adds a vote of agreement
 Add-agreement = Add agreement
@@ -373,6 +375,7 @@ EDIT-LOCATION = EDIT LOCATION
 # Label for interactive element that takes you to a location choosing screen
 Edit-location = Edit location
 Edit-Observation = Edit Observation
+Edit-your-profile-change-your-settings = Edit your profile, change your notifications settings, and manage all other parts of your account.
 # Label for button that edits an observation's taxon
 Edits-this-observations-taxon = Edits this observation's taxon
 EDUCATORS = EDUCATORS
@@ -789,8 +792,6 @@ POTENTIAL-DISAGREEMENT = POTENTIAL DISAGREEMENT
 Potential-disagreement-description = <0>Is the evidence enough to confirm this is </0><1></1><0>?<0>
 Potential-disagreement-disagree = <0>No, but this is a member of </0><1></1>
 Potential-disagreement-unsure = <0>I don't know but I am sure this is </0><1></1>
-# Help text for beginning a sound recording
-Press-record-to-start = Press record to start
 Previous-observation = Previous observation
 Privacy-Policy = Privacy Policy
 PRIVACY-POLICY = PRIVACY POLICY
@@ -887,13 +888,14 @@ Ranks-Zoosection = Zoosection
 Ranks-ZOOSUBSECTION = ZOOSUBSECTION
 Ranks-Zoosubsection = Zoosubsection
 Read-more-on-Wikipedia = Read more on Wikipedia
+# Help text for the button that opens the sound recorder
+Record-a-sound = Record a sound
 # Heading for the sound recorder
 RECORD-NEW-SOUND = RECORD NEW SOUND
 # Title of screen asking for permission to access the microphone
 Record-organism-sounds-with-the-microphone = Record organism sounds with the microphone
 # Text for a button prompting the user to grant access to the microphone
 RECORD-SOUND = RECORD SOUND
-Record-sounds = Record sounds with your microphone
 # Imperative verb for recording a sound
 Record-verb = Record
 # Status while recording a sound
@@ -1064,8 +1066,9 @@ supporting--identification = Supporting
 Switches-to-tab = Switches to { $tab } tab.
 Sync-observations = Sync observations
 Syncing = Syncing...
+# Help text for the button that opens the multi-capture camera
+Take-multiple-photos-of-a-single-organism = Take multiple photos of a single organism
 Take-photo = Take photo
-Take-photos-with-the-camera = Take photos of a single organism with the camera
 # label in project requirements
 Taxa = Taxa
 TAXON = TAXON
@@ -1083,7 +1086,8 @@ Thanks-for-using-any-suggestions = Thanks for using this app! Do you have any su
 That-user-profile-doesnt-exist = That user profile doesn't exist
 The-exact-location-will-be-hidden = The exact location will be hidden publicly, and instead generalized to a larger area. (Threatened and endangered species are automatically obscured).
 The-iNaturalist-Network = The iNaturalist network is a collection of localized websites that are fully connected to the global iNaturalist community. Network sites are supported by local institutions that promote local use and facilitate the use of data from iNaturalist to benefit local biodiversity.
-The-location-will-not-be-visible = The location will not be visible to others, which means it may be difficult to identify.
+# Describes what happens when geoprivacy is set to private
+The-location-will-not-be-visible-to-others = The location will not be visible to others, which might make the observation impossible to identify
 The-models-that-suggest-species = The models that suggest species based on visual similarity and location are thanks in part to collaborations with Sara Beery, Tom Brooks, Elijah Cole, Christian Lange, Oisin Mac Aodha, Pietro Perona, and Grant Van Horn.
 There-is-no-way = There is no way to have an iNaturalist account without storing personal information, so the only way to revoke this consent is to delete your account.
 #  Wild status sheet descriptions
@@ -1091,7 +1095,6 @@ This-is-a-wild-organism = This is a wild organism and wasn't placed in this loca
 This-is-how-taxon-names-will-be-displayed = This is how all taxon names will be displayed to you across iNaturalist:
 This-observer-has-opted-out-of-the-Community-Taxon = This observer has opted out of the Community Taxon
 This-organism-was-placed-by-humans = This organism was placed in this location by humans. This applies to things like garden plants, pets, and zoo animals.
-To-access-all-other-settings = To access all other account settings, click here:
 To-learn-more-about-what-information = To learn more about what information we collect and how we use it, please see our Privacy Policy and our Terms of Use.
 To-sync-your-observations-to-iNaturalist = To sync your observations to iNaturalist, please log in.
 To-view-nearby-organisms-please-enable-location = To view nearby organisms, please enable location.
diff --git a/src/i18n/l10n/en.ftl.json b/src/i18n/l10n/en.ftl.json
index 4ad62fc9d..3ed6891f7 100644
--- a/src/i18n/l10n/en.ftl.json
+++ b/src/i18n/l10n/en.ftl.json
@@ -9,6 +9,7 @@
   "accessible-comname-sciname": "{ $commonName } ({ $scientificName })",
   "accessible-sciname-comname": "{ $scientificName } ({ $commonName })",
   "Account-Deleted": "Account Deleted",
+  "ACCOUNT-SETTINGS": "ACCOUNT SETTINGS",
   "ACTIVITY": "ACTIVITY",
   "Add-agreement": "Add agreement",
   "ADD-AN-ID": "ADD AN ID",
@@ -214,6 +215,7 @@
   "EDIT-LOCATION": "EDIT LOCATION",
   "Edit-location": "Edit location",
   "Edit-Observation": "Edit Observation",
+  "Edit-your-profile-change-your-settings": "Edit your profile, change your notifications settings, and manage all other parts of your account.",
   "Edits-this-observations-taxon": "Edits this observation's taxon",
   "EDUCATORS": "EDUCATORS",
   "EMAIL": "EMAIL",
@@ -506,7 +508,6 @@
   "Potential-disagreement-description": "<0>Is the evidence enough to confirm this is </0><1></1><0>?<0>",
   "Potential-disagreement-disagree": "<0>No, but this is a member of </0><1></1>",
   "Potential-disagreement-unsure": "<0>I don't know but I am sure this is </0><1></1>",
-  "Press-record-to-start": "Press record to start",
   "Previous-observation": "Previous observation",
   "Privacy-Policy": "Privacy Policy",
   "PRIVACY-POLICY": "PRIVACY POLICY",
@@ -596,10 +597,10 @@
   "Ranks-ZOOSUBSECTION": "ZOOSUBSECTION",
   "Ranks-Zoosubsection": "Zoosubsection",
   "Read-more-on-Wikipedia": "Read more on Wikipedia",
+  "Record-a-sound": "Record a sound",
   "RECORD-NEW-SOUND": "RECORD NEW SOUND",
   "Record-organism-sounds-with-the-microphone": "Record organism sounds with the microphone",
   "RECORD-SOUND": "RECORD SOUND",
-  "Record-sounds": "Record sounds with your microphone",
   "Record-verb": "Record",
   "Recording-sound": "Recording sound",
   "Recording-stopped-Tap-play-the-current-recording": "Recording stopped. Tap play the current recording.",
@@ -718,8 +719,8 @@
   "Switches-to-tab": "Switches to { $tab } tab.",
   "Sync-observations": "Sync observations",
   "Syncing": "Syncing...",
+  "Take-multiple-photos-of-a-single-organism": "Take multiple photos of a single organism",
   "Take-photo": "Take photo",
-  "Take-photos-with-the-camera": "Take photos of a single organism with the camera",
   "Taxa": "Taxa",
   "TAXON": "TAXON",
   "TAXON-NAMES-DISPLAY": "TAXON NAMES DISPLAY",
@@ -734,14 +735,13 @@
   "That-user-profile-doesnt-exist": "That user profile doesn't exist",
   "The-exact-location-will-be-hidden": "The exact location will be hidden publicly, and instead generalized to a larger area. (Threatened and endangered species are automatically obscured).",
   "The-iNaturalist-Network": "The iNaturalist network is a collection of localized websites that are fully connected to the global iNaturalist community. Network sites are supported by local institutions that promote local use and facilitate the use of data from iNaturalist to benefit local biodiversity.",
-  "The-location-will-not-be-visible": "The location will not be visible to others, which means it may be difficult to identify.",
+  "The-location-will-not-be-visible-to-others": "The location will not be visible to others, which might make the observation impossible to identify",
   "The-models-that-suggest-species": "The models that suggest species based on visual similarity and location are thanks in part to collaborations with Sara Beery, Tom Brooks, Elijah Cole, Christian Lange, Oisin Mac Aodha, Pietro Perona, and Grant Van Horn.",
   "There-is-no-way": "There is no way to have an iNaturalist account without storing personal information, so the only way to revoke this consent is to delete your account.",
   "This-is-a-wild-organism": "This is a wild organism and wasn't placed in this location by humans.",
   "This-is-how-taxon-names-will-be-displayed": "This is how all taxon names will be displayed to you across iNaturalist:",
   "This-observer-has-opted-out-of-the-Community-Taxon": "This observer has opted out of the Community Taxon",
   "This-organism-was-placed-by-humans": "This organism was placed in this location by humans. This applies to things like garden plants, pets, and zoo animals.",
-  "To-access-all-other-settings": "To access all other account settings, click here:",
   "To-learn-more-about-what-information": "To learn more about what information we collect and how we use it, please see our Privacy Policy and our Terms of Use.",
   "To-sync-your-observations-to-iNaturalist": "To sync your observations to iNaturalist, please log in.",
   "To-view-nearby-organisms-please-enable-location": "To view nearby organisms, please enable location.",
diff --git a/src/i18n/strings.ftl b/src/i18n/strings.ftl
index 94e9431d2..5521bf782 100644
--- a/src/i18n/strings.ftl
+++ b/src/i18n/strings.ftl
@@ -38,6 +38,8 @@ accessible-comname-sciname = { $commonName } ({ $scientificName })
 accessible-sciname-comname = { $scientificName } ({ $commonName })
 # Alert message shown after account deletion
 Account-Deleted = Account Deleted
+# Label for button that shows all account settings
+ACCOUNT-SETTINGS = ACCOUNT SETTINGS
 ACTIVITY = ACTIVITY
 # Label for a button that adds a vote of agreement
 Add-agreement = Add agreement
@@ -373,6 +375,7 @@ EDIT-LOCATION = EDIT LOCATION
 # Label for interactive element that takes you to a location choosing screen
 Edit-location = Edit location
 Edit-Observation = Edit Observation
+Edit-your-profile-change-your-settings = Edit your profile, change your notifications settings, and manage all other parts of your account.
 # Label for button that edits an observation's taxon
 Edits-this-observations-taxon = Edits this observation's taxon
 EDUCATORS = EDUCATORS
@@ -789,8 +792,6 @@ POTENTIAL-DISAGREEMENT = POTENTIAL DISAGREEMENT
 Potential-disagreement-description = <0>Is the evidence enough to confirm this is </0><1></1><0>?<0>
 Potential-disagreement-disagree = <0>No, but this is a member of </0><1></1>
 Potential-disagreement-unsure = <0>I don't know but I am sure this is </0><1></1>
-# Help text for beginning a sound recording
-Press-record-to-start = Press record to start
 Previous-observation = Previous observation
 Privacy-Policy = Privacy Policy
 PRIVACY-POLICY = PRIVACY POLICY
@@ -887,13 +888,14 @@ Ranks-Zoosection = Zoosection
 Ranks-ZOOSUBSECTION = ZOOSUBSECTION
 Ranks-Zoosubsection = Zoosubsection
 Read-more-on-Wikipedia = Read more on Wikipedia
+# Help text for the button that opens the sound recorder
+Record-a-sound = Record a sound
 # Heading for the sound recorder
 RECORD-NEW-SOUND = RECORD NEW SOUND
 # Title of screen asking for permission to access the microphone
 Record-organism-sounds-with-the-microphone = Record organism sounds with the microphone
 # Text for a button prompting the user to grant access to the microphone
 RECORD-SOUND = RECORD SOUND
-Record-sounds = Record sounds with your microphone
 # Imperative verb for recording a sound
 Record-verb = Record
 # Status while recording a sound
@@ -1064,8 +1066,9 @@ supporting--identification = Supporting
 Switches-to-tab = Switches to { $tab } tab.
 Sync-observations = Sync observations
 Syncing = Syncing...
+# Help text for the button that opens the multi-capture camera
+Take-multiple-photos-of-a-single-organism = Take multiple photos of a single organism
 Take-photo = Take photo
-Take-photos-with-the-camera = Take photos of a single organism with the camera
 # label in project requirements
 Taxa = Taxa
 TAXON = TAXON
@@ -1083,7 +1086,8 @@ Thanks-for-using-any-suggestions = Thanks for using this app! Do you have any su
 That-user-profile-doesnt-exist = That user profile doesn't exist
 The-exact-location-will-be-hidden = The exact location will be hidden publicly, and instead generalized to a larger area. (Threatened and endangered species are automatically obscured).
 The-iNaturalist-Network = The iNaturalist network is a collection of localized websites that are fully connected to the global iNaturalist community. Network sites are supported by local institutions that promote local use and facilitate the use of data from iNaturalist to benefit local biodiversity.
-The-location-will-not-be-visible = The location will not be visible to others, which means it may be difficult to identify.
+# Describes what happens when geoprivacy is set to private
+The-location-will-not-be-visible-to-others = The location will not be visible to others, which might make the observation impossible to identify
 The-models-that-suggest-species = The models that suggest species based on visual similarity and location are thanks in part to collaborations with Sara Beery, Tom Brooks, Elijah Cole, Christian Lange, Oisin Mac Aodha, Pietro Perona, and Grant Van Horn.
 There-is-no-way = There is no way to have an iNaturalist account without storing personal information, so the only way to revoke this consent is to delete your account.
 #  Wild status sheet descriptions
@@ -1091,7 +1095,6 @@ This-is-a-wild-organism = This is a wild organism and wasn't placed in this loca
 This-is-how-taxon-names-will-be-displayed = This is how all taxon names will be displayed to you across iNaturalist:
 This-observer-has-opted-out-of-the-Community-Taxon = This observer has opted out of the Community Taxon
 This-organism-was-placed-by-humans = This organism was placed in this location by humans. This applies to things like garden plants, pets, and zoo animals.
-To-access-all-other-settings = To access all other account settings, click here:
 To-learn-more-about-what-information = To learn more about what information we collect and how we use it, please see our Privacy Policy and our Terms of Use.
 To-sync-your-observations-to-iNaturalist = To sync your observations to iNaturalist, please log in.
 To-view-nearby-organisms-please-enable-location = To view nearby organisms, please enable location.
diff --git a/tests/unit/components/Settings.test.js b/tests/unit/components/Settings.test.js
index 50e7884df..f685de352 100644
--- a/tests/unit/components/Settings.test.js
+++ b/tests/unit/components/Settings.test.js
@@ -74,7 +74,7 @@ describe( "Settings", ( ) => {
 
     it( "should navigate user to iNaturalist settings", async ( ) => {
       renderComponent( <Settings /> );
-      const iNatSettingsButton = await screen.findByText( /INATURALIST SETTINGS/ );
+      const iNatSettingsButton = await screen.findByText( "ACCOUNT SETTINGS" );
       fireEvent.press( iNatSettingsButton );
       expect( mockNavigate ).toHaveBeenCalledWith(
         "FullPageWebView",
@@ -107,7 +107,7 @@ describe( "Settings", ( ) => {
 
       it( "should not navigate to iNaturalist settings if no internet", async ( ) => {
         renderComponent( <Settings /> );
-        const iNatSettingsButton = await screen.findByText( /INATURALIST SETTINGS/ );
+        const iNatSettingsButton = await screen.findByText( "ACCOUNT SETTINGS" );
         fireEvent.press( iNatSettingsButton );
         expect( mockNavigate ).not.toHaveBeenCalled( );
       } );