forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
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>
authored by
Takayuki KUSANO
Dan Abramov
and committed by
GitHub
83745c92
8621ecd3
+77
-47
+4
src/locale/locales/fr/messages.po
+4
src/locale/locales/fr/messages.po
···
189
189
msgid "<0>{0}</0> {1, plural, one {following} other {following}}"
190
190
msgstr "<0>{0}</0> {1, plural, one {abonnement} other {abonnements}}"
191
191
192
+
#: src/screens/StarterPack/Wizard/index.tsx:497
193
+
msgid "<0>{0}</0> and<1> </1><2>{1} </2>are included in your starter pack"
194
+
msgstr "<0>{0}</0> et<1> </1><2>{1} </2>faites partie de votre pack de démarrage"
195
+
192
196
#: src/screens/StarterPack/Wizard/index.tsx:478
193
197
msgid "<0>{0}</0> is included in your starter pack"
194
198
msgstr "<0>{0}</0> fait partie de votre kit de démarrage"
+4
src/locale/locales/ja/messages.po
+4
src/locale/locales/ja/messages.po
···
185
185
msgid "<0>{0}</0> {1, plural, one {following} other {following}}"
186
186
msgstr "<0>{0}</0> {1, plural, other {フォロー}}"
187
187
188
+
#: src/screens/StarterPack/Wizard/index.tsx:497
189
+
msgid "<0>{0}</0> and<1> </1><2>{1} </2>are included in your starter pack"
190
+
msgstr "<0>{0}</0>と<2>{1}</2>はあなたのスターターパックに含まれています"
191
+
188
192
#: src/screens/StarterPack/Wizard/index.tsx:478
189
193
msgid "<0>{0}</0> is included in your starter pack"
190
194
msgstr "<0>{0}</0>はあなたのスターターパックに含まれています"
+69
-47
src/screens/StarterPack/Wizard/index.tsx
+69
-47
src/screens/StarterPack/Wizard/index.tsx
···
445
445
))}
446
446
</View>
447
447
448
-
{items.length === 0 ? (
448
+
{items.length === 0 /* Assuming this can only happen for feeds */ ? (
449
449
<View style={[a.gap_sm]}>
450
450
<Text style={[a.font_bold, a.text_center, textStyles]}>
451
451
<Trans>Add some feeds to your starter pack!</Trans>
···
456
456
</View>
457
457
) : (
458
458
<Text style={[a.text_center, textStyles]}>
459
-
{state.currentStep === 'Profiles' && items.length === 1 ? (
460
-
<Trans>
461
-
It's just you right now! Add more people to your starter pack by
462
-
searching above.
463
-
</Trans>
464
-
) : items.length === 1 ? (
465
-
<Trans>
466
-
<Text style={[a.font_bold, textStyles]}>
467
-
{getName(items[initialNamesIndex])}
468
-
</Text>{' '}
469
-
is included in your starter pack
470
-
</Trans>
471
-
) : items.length === 2 ? (
472
-
<Trans>
473
-
<Text style={[a.font_bold, textStyles]}>You</Text> and
474
-
<Text> </Text>
475
-
<Text style={[a.font_bold, textStyles]}>
476
-
{getName(items[initialNamesIndex])}{' '}
477
-
</Text>
478
-
are included in your starter pack
479
-
</Trans>
480
-
) : state.currentStep === 'Profiles' ? (
481
-
<Trans context="profiles">
482
-
<Text style={[a.font_bold, textStyles]}>
483
-
{getName(items[initialNamesIndex])},{' '}
484
-
</Text>
485
-
<Text style={[a.font_bold, textStyles]}>
486
-
{getName(items[initialNamesIndex + 1])},{' '}
487
-
</Text>
488
-
and{' '}
489
-
<Plural value={items.length - 2} one="# other" other="# others" />{' '}
490
-
are included in your starter pack
491
-
</Trans>
492
-
) : (
493
-
<Trans context="feeds">
494
-
<Text style={[a.font_bold, textStyles]}>
495
-
{getName(items[initialNamesIndex])},{' '}
496
-
</Text>
497
-
<Text style={[a.font_bold, textStyles]}>
498
-
{getName(items[initialNamesIndex + 1])},{' '}
499
-
</Text>
500
-
and{' '}
501
-
<Plural value={items.length - 2} one="# other" other="# others" />{' '}
502
-
are included in your starter pack
503
-
</Trans>
504
-
)}
459
+
{
460
+
items.length === 1 && state.currentStep === 'Profiles' ? (
461
+
<Trans>
462
+
It's just you right now! Add more people to your starter pack by
463
+
searching above.
464
+
</Trans>
465
+
) : items.length === 1 && state.currentStep === 'Feeds' ? (
466
+
<Trans>
467
+
<Text style={[a.font_bold, textStyles]}>
468
+
{getName(items[initialNamesIndex])}
469
+
</Text>{' '}
470
+
is included in your starter pack
471
+
</Trans>
472
+
) : items.length === 2 && state.currentStep === 'Profiles' ? (
473
+
<Trans>
474
+
<Text style={[a.font_bold, textStyles]}>You</Text> and
475
+
<Text> </Text>
476
+
<Text style={[a.font_bold, textStyles]}>
477
+
{getName(items[initialNamesIndex])}{' '}
478
+
</Text>
479
+
are included in your starter pack
480
+
</Trans>
481
+
) : items.length === 2 && state.currentStep === 'Feeds' ? (
482
+
<Trans>
483
+
<Text style={[a.font_bold, textStyles]}>
484
+
{getName(items[initialNamesIndex])}
485
+
</Text>{' '}
486
+
and
487
+
<Text> </Text>
488
+
<Text style={[a.font_bold, textStyles]}>
489
+
{getName(items[initialNamesIndex + 1])}{' '}
490
+
</Text>
491
+
are included in your starter pack
492
+
</Trans>
493
+
) : items.length > 2 && state.currentStep === 'Profiles' ? (
494
+
<Trans context="profiles">
495
+
<Text style={[a.font_bold, textStyles]}>
496
+
{getName(items[initialNamesIndex])},{' '}
497
+
</Text>
498
+
<Text style={[a.font_bold, textStyles]}>
499
+
{getName(items[initialNamesIndex + 1])},{' '}
500
+
</Text>
501
+
and{' '}
502
+
<Plural
503
+
value={items.length - 2}
504
+
one="# other"
505
+
other="# others"
506
+
/>{' '}
507
+
are included in your starter pack
508
+
</Trans>
509
+
) : items.length > 2 && state.currentStep === 'Feeds' ? (
510
+
<Trans context="feeds">
511
+
<Text style={[a.font_bold, textStyles]}>
512
+
{getName(items[initialNamesIndex])},{' '}
513
+
</Text>
514
+
<Text style={[a.font_bold, textStyles]}>
515
+
{getName(items[initialNamesIndex + 1])},{' '}
516
+
</Text>
517
+
and{' '}
518
+
<Plural
519
+
value={items.length - 2}
520
+
one="# other"
521
+
other="# others"
522
+
/>{' '}
523
+
are included in your starter pack
524
+
</Trans>
525
+
) : null /* Should not happen */
526
+
}
505
527
</Text>
506
528
)}
507
529