Fix footer messages in starter pack wizard (#4650)

* Fix footer messages in StarterPack wizard and updates ja messages

* Updates to minimize diff

* Revert "Updates to minimize diff"

This reverts commit 4d1dfe131a5ffc31fc5e6162dbcc90e77e042734.

* Revert "Fix footer messages in StarterPack wizard and updates ja messages"

This reverts commit 9a90898abc66c281f44696347043ce5da5859d60.

* Fix labels for plurals in starter packs

* Update translations

---------

Co-authored-by: Dan Abramov <dan.abramov@gmail.com>

3 files changed, 77 insertions, 47 deletions

diff --git a/src/locale/locales/fr/messages.po b/src/locale/locales/fr/messages.po
index a4e6fab24..208128fc1 100644
--- a/src/locale/locales/fr/messages.po
+++ b/src/locale/locales/fr/messages.po
@@ -189,6 +189,10 @@ msgstr "<0>{0}</0> {1, plural, one {abonné·e} other {abonné·e·s}}"
 msgid "<0>{0}</0> {1, plural, one {following} other {following}}"
 msgstr "<0>{0}</0> {1, plural, one {abonnement} other {abonnements}}"
 
+#: src/screens/StarterPack/Wizard/index.tsx:497
+msgid "<0>{0}</0> and<1> </1><2>{1} </2>are included in your starter pack"
+msgstr "<0>{0}</0> et<1> </1><2>{1} </2>faites partie de votre pack de démarrage"
+
 #: src/screens/StarterPack/Wizard/index.tsx:478
 msgid "<0>{0}</0> is included in your starter pack"
 msgstr "<0>{0}</0> fait partie de votre kit de démarrage"
diff --git a/src/locale/locales/ja/messages.po b/src/locale/locales/ja/messages.po
index 908bd5d4a..a4a923f62 100644
--- a/src/locale/locales/ja/messages.po
+++ b/src/locale/locales/ja/messages.po
@@ -185,6 +185,10 @@ msgstr "<0>{0}</0> {1, plural, other {フォロワー}}"
 msgid "<0>{0}</0> {1, plural, one {following} other {following}}"
 msgstr "<0>{0}</0> {1, plural, other {フォロー}}"
 
+#: src/screens/StarterPack/Wizard/index.tsx:497
+msgid "<0>{0}</0> and<1> </1><2>{1} </2>are included in your starter pack"
+msgstr "<0>{0}</0>と<2>{1}</2>はあなたのスターターパックに含まれています"
+
 #: src/screens/StarterPack/Wizard/index.tsx:478
 msgid "<0>{0}</0> is included in your starter pack"
 msgstr "<0>{0}</0>はあなたのスターターパックに含まれています"
diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx
index b231e317e..2f50e878a 100644
--- a/src/screens/StarterPack/Wizard/index.tsx
+++ b/src/screens/StarterPack/Wizard/index.tsx
@@ -445,7 +445,7 @@ function Footer({
         ))}
       </View>
 
-      {items.length === 0 ? (
+      {items.length === 0 /* Assuming this can only happen for feeds */ ? (
         <View style={[a.gap_sm]}>
           <Text style={[a.font_bold, a.text_center, textStyles]}>
             <Trans>Add some feeds to your starter pack!</Trans>
@@ -456,52 +456,74 @@ function Footer({
         </View>
       ) : (
         <Text style={[a.text_center, textStyles]}>
-          {state.currentStep === 'Profiles' && items.length === 1 ? (
-            <Trans>
-              It's just you right now! Add more people to your starter pack by
-              searching above.
-            </Trans>
-          ) : items.length === 1 ? (
-            <Trans>
-              <Text style={[a.font_bold, textStyles]}>
-                {getName(items[initialNamesIndex])}
-              </Text>{' '}
-              is included in your starter pack
-            </Trans>
-          ) : items.length === 2 ? (
-            <Trans>
-              <Text style={[a.font_bold, textStyles]}>You</Text> and
-              <Text> </Text>
-              <Text style={[a.font_bold, textStyles]}>
-                {getName(items[initialNamesIndex])}{' '}
-              </Text>
-              are included in your starter pack
-            </Trans>
-          ) : state.currentStep === 'Profiles' ? (
-            <Trans context="profiles">
-              <Text style={[a.font_bold, textStyles]}>
-                {getName(items[initialNamesIndex])},{' '}
-              </Text>
-              <Text style={[a.font_bold, textStyles]}>
-                {getName(items[initialNamesIndex + 1])},{' '}
-              </Text>
-              and{' '}
-              <Plural value={items.length - 2} one="# other" other="# others" />{' '}
-              are included in your starter pack
-            </Trans>
-          ) : (
-            <Trans context="feeds">
-              <Text style={[a.font_bold, textStyles]}>
-                {getName(items[initialNamesIndex])},{' '}
-              </Text>
-              <Text style={[a.font_bold, textStyles]}>
-                {getName(items[initialNamesIndex + 1])},{' '}
-              </Text>
-              and{' '}
-              <Plural value={items.length - 2} one="# other" other="# others" />{' '}
-              are included in your starter pack
-            </Trans>
-          )}
+          {
+            items.length === 1 && state.currentStep === 'Profiles' ? (
+              <Trans>
+                It's just you right now! Add more people to your starter pack by
+                searching above.
+              </Trans>
+            ) : items.length === 1 && state.currentStep === 'Feeds' ? (
+              <Trans>
+                <Text style={[a.font_bold, textStyles]}>
+                  {getName(items[initialNamesIndex])}
+                </Text>{' '}
+                is included in your starter pack
+              </Trans>
+            ) : items.length === 2 && state.currentStep === 'Profiles' ? (
+              <Trans>
+                <Text style={[a.font_bold, textStyles]}>You</Text> and
+                <Text> </Text>
+                <Text style={[a.font_bold, textStyles]}>
+                  {getName(items[initialNamesIndex])}{' '}
+                </Text>
+                are included in your starter pack
+              </Trans>
+            ) : items.length === 2 && state.currentStep === 'Feeds' ? (
+              <Trans>
+                <Text style={[a.font_bold, textStyles]}>
+                  {getName(items[initialNamesIndex])}
+                </Text>{' '}
+                and
+                <Text> </Text>
+                <Text style={[a.font_bold, textStyles]}>
+                  {getName(items[initialNamesIndex + 1])}{' '}
+                </Text>
+                are included in your starter pack
+              </Trans>
+            ) : items.length > 2 && state.currentStep === 'Profiles' ? (
+              <Trans context="profiles">
+                <Text style={[a.font_bold, textStyles]}>
+                  {getName(items[initialNamesIndex])},{' '}
+                </Text>
+                <Text style={[a.font_bold, textStyles]}>
+                  {getName(items[initialNamesIndex + 1])},{' '}
+                </Text>
+                and{' '}
+                <Plural
+                  value={items.length - 2}
+                  one="# other"
+                  other="# others"
+                />{' '}
+                are included in your starter pack
+              </Trans>
+            ) : items.length > 2 && state.currentStep === 'Feeds' ? (
+              <Trans context="feeds">
+                <Text style={[a.font_bold, textStyles]}>
+                  {getName(items[initialNamesIndex])},{' '}
+                </Text>
+                <Text style={[a.font_bold, textStyles]}>
+                  {getName(items[initialNamesIndex + 1])},{' '}
+                </Text>
+                and{' '}
+                <Plural
+                  value={items.length - 2}
+                  one="# other"
+                  other="# others"
+                />{' '}
+                are included in your starter pack
+              </Trans>
+            ) : null /* Should not happen */
+          }
         </Text>
       )}