refine plural marks (#7065)

src/view/com/feeds/FeedSourceCard.tsx

@@ -300,11 +300,14 @@ export function FeedSourceCardLoaded({
 
         {showLikes && feed.type === 'feed' ? (
           <Text type="sm-medium" style={[pal.text, pal.textLight]}>
-            <Plural
-              value={feed.likeCount || 0}
-              one="Liked by # user"
-              other="Liked by # users"
-            />
+            <Trans>
+              Liked by{' '}
+              <Plural
+                value={feed.likeCount || 0}
+                one="# user"
+                other="# users"
+              />
+            </Trans>
           </Text>
         ) : null}
       </Pressable>

src/view/com/util/post-ctrls/PostCtrls.tsx

@@ -258,10 +258,12 @@ let PostCtrls = ({
             }
           }}
           accessibilityRole="button"
-          accessibilityLabel={plural(post.replyCount || 0, {
-            one: 'Reply (# reply)',
-            other: 'Reply (# replies)',
-          })}
+          accessibilityLabel={_(
+            msg`Reply (${plural(post.replyCount || 0, {
+              one: '# reply',
+              other: '# replies',
+            })})`,
+          )}
           accessibilityHint=""
           hitSlop={POST_CTRL_HITSLOP}>
           <Bubble
@@ -298,14 +300,18 @@ let PostCtrls = ({
           accessibilityRole="button"
           accessibilityLabel={
             post.viewer?.like
-              ? plural(post.likeCount || 0, {
-                  one: 'Unlike (# like)',
-                  other: 'Unlike (# likes)',
-                })
-              : plural(post.likeCount || 0, {
-                  one: 'Like (# like)',
-                  other: 'Like (# likes)',
-                })
+              ? _(
+                  msg`Unlike (${plural(post.likeCount || 0, {
+                    one: '# like',
+                    other: '# likes',
+                  })})`,
+                )
+              : _(
+                  msg`Like (${plural(post.likeCount || 0, {
+                    one: '# like',
+                    other: '# likes',
+                  })})`,
+                )
           }
           accessibilityHint=""
           hitSlop={POST_CTRL_HITSLOP}>

src/view/com/util/post-ctrls/RepostButton.tsx

@@ -62,11 +62,21 @@ let RepostButton = ({
           {padding: 5},
         ]}
         hoverStyle={t.atoms.bg_contrast_25}
-        label={`${
+        label={
           isReposted
-            ? _(msg`Undo repost`)
-            : _(msg({message: 'Repost', context: 'action'}))
-        } (${plural(repostCount || 0, {one: '# repost', other: '# reposts'})})`}
+            ? _(
+                msg`Undo repost (${plural(repostCount || 0, {
+                  one: '# repost',
+                  other: '# reposts',
+                })})`,
+              )
+            : _(
+                msg`Repost (${plural(repostCount || 0, {
+                  one: '# repost',
+                  other: '# reposts',
+                })})`,
+              )
+        }
         shape="round"
         variant="ghost"
         color="secondary"

src/view/screens/ProfileFeed.tsx

@@ -587,11 +587,9 @@ function AboutSection({
             label={_(msg`View users who like this feed`)}
             to={makeCustomFeedLink(feedOwnerDid, feedRkey, 'liked-by')}
             style={[t.atoms.text_contrast_medium, a.font_bold]}>
-            <Plural
-              value={likeCount}
-              one="Liked by # user"
-              other="Liked by # users"
-            />
+            <Trans>
+              Liked by <Plural value={likeCount} one="# user" other="# users" />
+            </Trans>
           </InlineLinkText>
         )}
       </View>