From 6d280f4f345264f781de631fd2a07fcc048b929e Mon Sep 17 00:00:00 2001
From: Aaron Titus <aaron@crisiscleanup.org>
Date: Fri, 16 Aug 2024 17:56:57 -0600
Subject: [PATCH 1/2] Tutorial localizations

---
 .../java/com/crisiscleanup/ui/TutorialGraphics.kt    | 12 ++++++------
 .../com/crisiscleanup/feature/menu/ui/MenuScreen.kt  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/crisiscleanup/ui/TutorialGraphics.kt b/app/src/main/java/com/crisiscleanup/ui/TutorialGraphics.kt
index 9a3561b6..3cdba9bb 100644
--- a/app/src/main/java/com/crisiscleanup/ui/TutorialGraphics.kt
+++ b/app/src/main/java/com/crisiscleanup/ui/TutorialGraphics.kt
@@ -38,7 +38,7 @@ internal fun TutorialOverlay(
     val t = LocalAppTranslator.current
     val textMeasurer = rememberTextMeasurer()
 
-    val stepForwardText = t("~~(Press anywhere on screen to continue tutorial)")
+    val stepForwardText = t("tutorial.press_anywhere_continue")
 
     val navBarSizePosition = tutorialViewLookup[TutorialViewId.AppNavBar] ?: LayoutSizePosition()
 
@@ -80,9 +80,9 @@ internal fun TutorialOverlay(
 
                 val viewSizeOffset = getDynamicSpotlightSizeOffset(viewSizePosition)
                 val instructionKey = if (viewId == TutorialViewId.ProvideFeedback) {
-                    "~~Let us know of any issues with this app"
+                    t("tutorial.report_issues")
                 } else {
-                    "~~Invite teammates to Crisis Cleanup"
+                    t("tutorial.invite_teammates")
                 }
                 val stepInstruction = t(instructionKey)
                 menuTutorialDynamicContent(
@@ -116,7 +116,7 @@ internal fun TutorialOverlay(
                     stepForwardOffset,
                 )
 
-                val stepInstruction = t("~~Use the navigation tabs to start Working")
+                val stepInstruction = t("tutorial.use_nav_to_work")
                 menuTutorialAppNav(
                     textMeasurer,
                     isHorizontalBar,
@@ -136,7 +136,7 @@ internal fun TutorialOverlay(
                 )
 
                 val viewSizeOffset = getAppBarSpotlightSizeOffset(viewSizePosition)
-                val stepInstruction = t("~~Open account information")
+                val stepInstruction = t("tutorial.open_profile")
                 menuTutorialAccountToggle(
                     textMeasurer,
                     isHorizontalBar,
@@ -156,7 +156,7 @@ internal fun TutorialOverlay(
                 )
 
                 val viewSizeOffset = getAppBarSpotlightSizeOffset(viewSizePosition, 1.2f)
-                val stepInstruction = t("~~Select and change Incidents")
+                val stepInstruction = t("tutorial.select_change_incidents")
                 menuTutorialSelectIncident(
                     textMeasurer,
                     viewSizeOffset,
diff --git a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/ui/MenuScreen.kt b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/ui/MenuScreen.kt
index 5a940845..c215dc44 100644
--- a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/ui/MenuScreen.kt
+++ b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/ui/MenuScreen.kt
@@ -381,7 +381,7 @@ private fun MenuTutorial(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            text = t("~~Open tutorial"),
+            text = t("tutorial.open_tutorial"),
             modifier = Modifier
                 .clickable(
                     onClick = onStartTutorial,

From 277bf4e9d24d42eaa85c0dc27ce511b73d3710e8 Mon Sep 17 00:00:00 2001
From: Aaron Titus <aaron@crisiscleanup.org>
Date: Fri, 16 Aug 2024 17:57:11 -0600
Subject: [PATCH 2/2] Request Redeploy localizations

---
 .../feature/organizationmanage/ui/RequestRedeployScreen.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/feature/organizationmanage/src/main/java/com/crisiscleanup/feature/organizationmanage/ui/RequestRedeployScreen.kt b/feature/organizationmanage/src/main/java/com/crisiscleanup/feature/organizationmanage/ui/RequestRedeployScreen.kt
index 7511ec91..f4ad003c 100644
--- a/feature/organizationmanage/src/main/java/com/crisiscleanup/feature/organizationmanage/ui/RequestRedeployScreen.kt
+++ b/feature/organizationmanage/src/main/java/com/crisiscleanup/feature/organizationmanage/ui/RequestRedeployScreen.kt
@@ -72,7 +72,7 @@ fun RequestRedeployRoute(
                 val incidents = readyState.incidents
                 if (incidents.isEmpty()) {
                     Text(
-                        t("~~There are no Incidents left for deploying."),
+                        t("requestRedeploy.system_thinks_access_all_incidents"),
                         listItemModifier,
                     )
                 } else {
@@ -219,14 +219,14 @@ private fun IncidentOptions(
                         if (isApproved) {
                             Icon(
                                 CrisisCleanupIcons.Check,
-                                contentDescription = t("~~{incident_name} is already approved")
+                                contentDescription = t("requestRedeploy.you_already_have_access_to_incident_name")
                                     .replace("{incident_name}", incident.shortName),
                                 tint = green600,
                             )
                         } else if (isRequested) {
                             Icon(
                                 CrisisCleanupIcons.PendingRequestRedeploy,
-                                contentDescription = t("~~{incident_name} is already awaiting redeploy")
+                                contentDescription = t("requestRedeploy.existing_request_pending_name")
                                     .replace("{incident_name}", incident.shortName),
                             )
                         }