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>zio/stable
Takayuki KUSANO
GitHub
parent
8621ecd38a
commit
83745c923f
|
|
@ -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}}"
|
msgid "<0>{0}</0> {1, plural, one {following} other {following}}"
|
||||||
msgstr "<0>{0}</0> {1, plural, one {abonnement} other {abonnements}}"
|
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
|
#: src/screens/StarterPack/Wizard/index.tsx:478
|
||||||
msgid "<0>{0}</0> is included in your starter pack"
|
msgid "<0>{0}</0> is included in your starter pack"
|
||||||
msgstr "<0>{0}</0> fait partie de votre kit de démarrage"
|
msgstr "<0>{0}</0> fait partie de votre kit de démarrage"
|
||||||
|
|
|
||||||
|
|
@ -185,6 +185,10 @@ msgstr "<0>{0}</0> {1, plural, other {フォロワー}}"
|
||||||
msgid "<0>{0}</0> {1, plural, one {following} other {following}}"
|
msgid "<0>{0}</0> {1, plural, one {following} other {following}}"
|
||||||
msgstr "<0>{0}</0> {1, plural, other {フォロー}}"
|
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
|
#: src/screens/StarterPack/Wizard/index.tsx:478
|
||||||
msgid "<0>{0}</0> is included in your starter pack"
|
msgid "<0>{0}</0> is included in your starter pack"
|
||||||
msgstr "<0>{0}</0>はあなたのスターターパックに含まれています"
|
msgstr "<0>{0}</0>はあなたのスターターパックに含まれています"
|
||||||
|
|
|
||||||
|
|
@ -445,7 +445,7 @@ function Footer({
|
||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{items.length === 0 ? (
|
{items.length === 0 /* Assuming this can only happen for feeds */ ? (
|
||||||
<View style={[a.gap_sm]}>
|
<View style={[a.gap_sm]}>
|
||||||
<Text style={[a.font_bold, a.text_center, textStyles]}>
|
<Text style={[a.font_bold, a.text_center, textStyles]}>
|
||||||
<Trans>Add some feeds to your starter pack!</Trans>
|
<Trans>Add some feeds to your starter pack!</Trans>
|
||||||
|
|
@ -456,52 +456,74 @@ function Footer({
|
||||||
</View>
|
</View>
|
||||||
) : (
|
) : (
|
||||||
<Text style={[a.text_center, textStyles]}>
|
<Text style={[a.text_center, textStyles]}>
|
||||||
{state.currentStep === 'Profiles' && items.length === 1 ? (
|
{
|
||||||
<Trans>
|
items.length === 1 && state.currentStep === 'Profiles' ? (
|
||||||
It's just you right now! Add more people to your starter pack by
|
<Trans>
|
||||||
searching above.
|
It's just you right now! Add more people to your starter pack by
|
||||||
</Trans>
|
searching above.
|
||||||
) : items.length === 1 ? (
|
</Trans>
|
||||||
<Trans>
|
) : items.length === 1 && state.currentStep === 'Feeds' ? (
|
||||||
<Text style={[a.font_bold, textStyles]}>
|
<Trans>
|
||||||
{getName(items[initialNamesIndex])}
|
<Text style={[a.font_bold, textStyles]}>
|
||||||
</Text>{' '}
|
{getName(items[initialNamesIndex])}
|
||||||
is included in your starter pack
|
</Text>{' '}
|
||||||
</Trans>
|
is included in your starter pack
|
||||||
) : items.length === 2 ? (
|
</Trans>
|
||||||
<Trans>
|
) : items.length === 2 && state.currentStep === 'Profiles' ? (
|
||||||
<Text style={[a.font_bold, textStyles]}>You</Text> and
|
<Trans>
|
||||||
<Text> </Text>
|
<Text style={[a.font_bold, textStyles]}>You</Text> and
|
||||||
<Text style={[a.font_bold, textStyles]}>
|
<Text> </Text>
|
||||||
{getName(items[initialNamesIndex])}{' '}
|
<Text style={[a.font_bold, textStyles]}>
|
||||||
</Text>
|
{getName(items[initialNamesIndex])}{' '}
|
||||||
are included in your starter pack
|
</Text>
|
||||||
</Trans>
|
are included in your starter pack
|
||||||
) : state.currentStep === 'Profiles' ? (
|
</Trans>
|
||||||
<Trans context="profiles">
|
) : items.length === 2 && state.currentStep === 'Feeds' ? (
|
||||||
<Text style={[a.font_bold, textStyles]}>
|
<Trans>
|
||||||
{getName(items[initialNamesIndex])},{' '}
|
<Text style={[a.font_bold, textStyles]}>
|
||||||
</Text>
|
{getName(items[initialNamesIndex])}
|
||||||
<Text style={[a.font_bold, textStyles]}>
|
</Text>{' '}
|
||||||
{getName(items[initialNamesIndex + 1])},{' '}
|
and
|
||||||
</Text>
|
<Text> </Text>
|
||||||
and{' '}
|
<Text style={[a.font_bold, textStyles]}>
|
||||||
<Plural value={items.length - 2} one="# other" other="# others" />{' '}
|
{getName(items[initialNamesIndex + 1])}{' '}
|
||||||
are included in your starter pack
|
</Text>
|
||||||
</Trans>
|
are included in your starter pack
|
||||||
) : (
|
</Trans>
|
||||||
<Trans context="feeds">
|
) : items.length > 2 && state.currentStep === 'Profiles' ? (
|
||||||
<Text style={[a.font_bold, textStyles]}>
|
<Trans context="profiles">
|
||||||
{getName(items[initialNamesIndex])},{' '}
|
<Text style={[a.font_bold, textStyles]}>
|
||||||
</Text>
|
{getName(items[initialNamesIndex])},{' '}
|
||||||
<Text style={[a.font_bold, textStyles]}>
|
</Text>
|
||||||
{getName(items[initialNamesIndex + 1])},{' '}
|
<Text style={[a.font_bold, textStyles]}>
|
||||||
</Text>
|
{getName(items[initialNamesIndex + 1])},{' '}
|
||||||
and{' '}
|
</Text>
|
||||||
<Plural value={items.length - 2} one="# other" other="# others" />{' '}
|
and{' '}
|
||||||
are included in your starter pack
|
<Plural
|
||||||
</Trans>
|
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>
|
</Text>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue