Add labels to a few missing places (#4838)
This commit is contained in:
		
							parent
							
								
									e7b485f185
								
							
						
					
					
						commit
						783fd351ba
					
				
					 12 changed files with 60 additions and 18 deletions
				
			
		|  | @ -42,6 +42,7 @@ export function BlockedByListDialog({ | ||||||
|               <React.Fragment key={block.source.list.uri}> |               <React.Fragment key={block.source.list.uri}> | ||||||
|                 {i === 0 ? null : ', '} |                 {i === 0 ? null : ', '} | ||||||
|                 <InlineLinkText |                 <InlineLinkText | ||||||
|  |                   label={block.source.list.name} | ||||||
|                   to={listUriToHref(block.source.list.uri)} |                   to={listUriToHref(block.source.list.uri)} | ||||||
|                   style={[a.text_md, a.leading_snug]}> |                   style={[a.text_md, a.leading_snug]}> | ||||||
|                   {block.source.list.name} |                   {block.source.list.name} | ||||||
|  |  | ||||||
|  | @ -140,6 +140,7 @@ function HeaderReady({ | ||||||
|     userBlock?: ModerationCause |     userBlock?: ModerationCause | ||||||
|   } |   } | ||||||
| }) { | }) { | ||||||
|  |   const {_} = useLingui() | ||||||
|   const t = useTheme() |   const t = useTheme() | ||||||
|   const convoState = useConvo() |   const convoState = useConvo() | ||||||
|   const profile = useProfileShadow(profileUnshadowed) |   const profile = useProfileShadow(profileUnshadowed) | ||||||
|  | @ -156,6 +157,7 @@ function HeaderReady({ | ||||||
|     <View style={[a.flex_1]}> |     <View style={[a.flex_1]}> | ||||||
|       <View style={[a.w_full, a.flex_row, a.align_center, a.justify_between]}> |       <View style={[a.w_full, a.flex_row, a.align_center, a.justify_between]}> | ||||||
|         <Link |         <Link | ||||||
|  |           label={_(msg`View ${displayName}'s profile`)} | ||||||
|           style={[a.flex_row, a.align_start, a.gap_md, a.flex_1, a.pr_md]} |           style={[a.flex_row, a.align_start, a.gap_md, a.flex_1, a.pr_md]} | ||||||
|           to={makeProfileLink(profile)}> |           to={makeProfileLink(profile)}> | ||||||
|           <View style={[a.pt_2xs]}> |           <View style={[a.pt_2xs]}> | ||||||
|  |  | ||||||
|  | @ -174,7 +174,7 @@ export function LabelerLabelPreference({ | ||||||
|   disabled?: boolean |   disabled?: boolean | ||||||
|   labelerDid?: string |   labelerDid?: string | ||||||
| }) { | }) { | ||||||
|   const {i18n} = useLingui() |   const {_, i18n} = useLingui() | ||||||
|   const t = useTheme() |   const t = useTheme() | ||||||
|   const {gtPhone} = useBreakpoints() |   const {gtPhone} = useBreakpoints() | ||||||
| 
 | 
 | ||||||
|  | @ -243,7 +243,10 @@ export function LabelerLabelPreference({ | ||||||
|               ) : isGlobalLabel ? ( |               ) : isGlobalLabel ? ( | ||||||
|                 <Trans> |                 <Trans> | ||||||
|                   Configured in{' '} |                   Configured in{' '} | ||||||
|                   <InlineLinkText to="/moderation" style={a.text_sm}> |                   <InlineLinkText | ||||||
|  |                     label={_(msg`moderation settings`)} | ||||||
|  |                     to="/moderation" | ||||||
|  |                     style={a.text_sm}> | ||||||
|                     moderation settings |                     moderation settings | ||||||
|                   </InlineLinkText> |                   </InlineLinkText> | ||||||
|                   . |                   . | ||||||
|  |  | ||||||
|  | @ -128,6 +128,9 @@ function Label({ | ||||||
|   const t = useTheme() |   const t = useTheme() | ||||||
|   const {_} = useLingui() |   const {_} = useLingui() | ||||||
|   const {labeler, strings} = useLabelInfo(label) |   const {labeler, strings} = useLabelInfo(label) | ||||||
|  |   const sourceName = labeler | ||||||
|  |     ? sanitizeHandle(labeler.creator.handle, '@') | ||||||
|  |     : label.src | ||||||
|   return ( |   return ( | ||||||
|     <View |     <View | ||||||
|       style={[ |       style={[ | ||||||
|  | @ -169,13 +172,12 @@ function Label({ | ||||||
|             <Trans> |             <Trans> | ||||||
|               Source:{' '} |               Source:{' '} | ||||||
|               <InlineLinkText |               <InlineLinkText | ||||||
|  |                 label={sourceName} | ||||||
|                 to={makeProfileLink( |                 to={makeProfileLink( | ||||||
|                   labeler ? labeler.creator : {did: label.src, handle: ''}, |                   labeler ? labeler.creator : {did: label.src, handle: ''}, | ||||||
|                 )} |                 )} | ||||||
|                 onPress={() => control.close()}> |                 onPress={() => control.close()}> | ||||||
|                 {labeler |                 {sourceName} | ||||||
|                   ? sanitizeHandle(labeler.creator.handle, '@') |  | ||||||
|                   : label.src} |  | ||||||
|               </InlineLinkText> |               </InlineLinkText> | ||||||
|             </Trans> |             </Trans> | ||||||
|           )} |           )} | ||||||
|  | @ -203,6 +205,9 @@ function AppealForm({ | ||||||
|   const isAccountReport = 'did' in subject |   const isAccountReport = 'did' in subject | ||||||
|   const agent = useAgent() |   const agent = useAgent() | ||||||
|   const gate = useGate() |   const gate = useGate() | ||||||
|  |   const sourceName = labeler | ||||||
|  |     ? sanitizeHandle(labeler.creator.handle, '@') | ||||||
|  |     : label.src | ||||||
| 
 | 
 | ||||||
|   const {mutate, isPending} = useMutation({ |   const {mutate, isPending} = useMutation({ | ||||||
|     mutationFn: async () => { |     mutationFn: async () => { | ||||||
|  | @ -260,12 +265,13 @@ function AppealForm({ | ||||||
|         <Trans> |         <Trans> | ||||||
|           This appeal will be sent to{' '} |           This appeal will be sent to{' '} | ||||||
|           <InlineLinkText |           <InlineLinkText | ||||||
|  |             label={sourceName} | ||||||
|             to={makeProfileLink( |             to={makeProfileLink( | ||||||
|               labeler ? labeler.creator : {did: label.src, handle: ''}, |               labeler ? labeler.creator : {did: label.src, handle: ''}, | ||||||
|             )} |             )} | ||||||
|             onPress={() => control.close()} |             onPress={() => control.close()} | ||||||
|             style={[a.text_md, a.leading_snug]}> |             style={[a.text_md, a.leading_snug]}> | ||||||
|             {labeler ? sanitizeHandle(labeler.creator.handle, '@') : label.src} |             {sourceName} | ||||||
|           </InlineLinkText> |           </InlineLinkText> | ||||||
|           . |           . | ||||||
|         </Trans> |         </Trans> | ||||||
|  |  | ||||||
|  | @ -240,7 +240,10 @@ export function ModerationScreenInner({ | ||||||
|           )} |           )} | ||||||
|         </Button> |         </Button> | ||||||
|         <Divider /> |         <Divider /> | ||||||
|         <Link testID="moderationlistsBtn" to="/moderation/modlists"> |         <Link | ||||||
|  |           label={_(msg`View your moderation lists`)} | ||||||
|  |           testID="moderationlistsBtn" | ||||||
|  |           to="/moderation/modlists"> | ||||||
|           {state => ( |           {state => ( | ||||||
|             <SubItem |             <SubItem | ||||||
|               title={_(msg`Moderation lists`)} |               title={_(msg`Moderation lists`)} | ||||||
|  | @ -252,7 +255,10 @@ export function ModerationScreenInner({ | ||||||
|           )} |           )} | ||||||
|         </Link> |         </Link> | ||||||
|         <Divider /> |         <Divider /> | ||||||
|         <Link testID="mutedAccountsBtn" to="/moderation/muted-accounts"> |         <Link | ||||||
|  |           label={_(msg`View your muted accounts`)} | ||||||
|  |           testID="mutedAccountsBtn" | ||||||
|  |           to="/moderation/muted-accounts"> | ||||||
|           {state => ( |           {state => ( | ||||||
|             <SubItem |             <SubItem | ||||||
|               title={_(msg`Muted accounts`)} |               title={_(msg`Muted accounts`)} | ||||||
|  | @ -264,7 +270,10 @@ export function ModerationScreenInner({ | ||||||
|           )} |           )} | ||||||
|         </Link> |         </Link> | ||||||
|         <Divider /> |         <Divider /> | ||||||
|         <Link testID="blockedAccountsBtn" to="/moderation/blocked-accounts"> |         <Link | ||||||
|  |           label={_(msg`View your blocked accounts`)} | ||||||
|  |           testID="blockedAccountsBtn" | ||||||
|  |           to="/moderation/blocked-accounts"> | ||||||
|           {state => ( |           {state => ( | ||||||
|             <SubItem |             <SubItem | ||||||
|               title={_(msg`Blocked accounts`)} |               title={_(msg`Blocked accounts`)} | ||||||
|  | @ -356,6 +365,7 @@ export function ModerationScreenInner({ | ||||||
|                     <Trans> |                     <Trans> | ||||||
|                       Adult content can only be enabled via the Web at{' '} |                       Adult content can only be enabled via the Web at{' '} | ||||||
|                       <InlineLinkText |                       <InlineLinkText | ||||||
|  |                         label={_(msg`The Bluesky web application`)} | ||||||
|                         to="" |                         to="" | ||||||
|                         onPress={evt => { |                         onPress={evt => { | ||||||
|                           evt.preventDefault() |                           evt.preventDefault() | ||||||
|  | @ -569,7 +579,9 @@ function PwiOptOut() { | ||||||
|           </Trans> |           </Trans> | ||||||
|         </Text> |         </Text> | ||||||
| 
 | 
 | ||||||
|         <InlineLinkText to="https://blueskyweb.zendesk.com/hc/en-us/articles/15835264007693-Data-Privacy"> |         <InlineLinkText | ||||||
|  |           label={_(msg`Learn more about what is public on Bluesky.`)} | ||||||
|  |           to="https://blueskyweb.zendesk.com/hc/en-us/articles/15835264007693-Data-Privacy"> | ||||||
|           <Trans>Learn more about what is public on Bluesky.</Trans> |           <Trans>Learn more about what is public on Bluesky.</Trans> | ||||||
|         </InlineLinkText> |         </InlineLinkText> | ||||||
|       </View> |       </View> | ||||||
|  |  | ||||||
|  | @ -45,14 +45,20 @@ export const Policies = ({ | ||||||
|   const els = [] |   const els = [] | ||||||
|   if (tos) { |   if (tos) { | ||||||
|     els.push( |     els.push( | ||||||
|       <InlineLinkText key="tos" to={tos}> |       <InlineLinkText | ||||||
|  |         label={_(msg`Read the Bluesky Terms of Service`)} | ||||||
|  |         key="tos" | ||||||
|  |         to={tos}> | ||||||
|         {_(msg`Terms of Service`)} |         {_(msg`Terms of Service`)} | ||||||
|       </InlineLinkText>, |       </InlineLinkText>, | ||||||
|     ) |     ) | ||||||
|   } |   } | ||||||
|   if (pp) { |   if (pp) { | ||||||
|     els.push( |     els.push( | ||||||
|       <InlineLinkText key="pp" to={pp}> |       <InlineLinkText | ||||||
|  |         label={_(msg`Read the Bluesky Privacy Policy`)} | ||||||
|  |         key="pp" | ||||||
|  |         to={pp}> | ||||||
|         {_(msg`Privacy Policy`)} |         {_(msg`Privacy Policy`)} | ||||||
|       </InlineLinkText>, |       </InlineLinkText>, | ||||||
|     ) |     ) | ||||||
|  |  | ||||||
|  | @ -166,6 +166,7 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { | ||||||
|               <Text style={[t.atoms.text, !gtMobile && a.text_md]}> |               <Text style={[t.atoms.text, !gtMobile && a.text_md]}> | ||||||
|                 <Trans>Having trouble?</Trans>{' '} |                 <Trans>Having trouble?</Trans>{' '} | ||||||
|                 <InlineLinkText |                 <InlineLinkText | ||||||
|  |                   label={_(msg`Contact support`)} | ||||||
|                   to={FEEDBACK_FORM_URL({email: state.email})} |                   to={FEEDBACK_FORM_URL({email: state.email})} | ||||||
|                   style={[!gtMobile && a.text_md]}> |                   style={[!gtMobile && a.text_md]}> | ||||||
|                   <Trans>Contact support</Trans> |                   <Trans>Contact support</Trans> | ||||||
|  |  | ||||||
|  | @ -132,6 +132,7 @@ export const SplashScreen = ({ | ||||||
| 
 | 
 | ||||||
| function Footer() { | function Footer() { | ||||||
|   const t = useTheme() |   const t = useTheme() | ||||||
|  |   const {_} = useLingui() | ||||||
| 
 | 
 | ||||||
|   return ( |   return ( | ||||||
|     <View |     <View | ||||||
|  | @ -147,13 +148,19 @@ function Footer() { | ||||||
|         a.flex_1, |         a.flex_1, | ||||||
|         t.atoms.border_contrast_medium, |         t.atoms.border_contrast_medium, | ||||||
|       ]}> |       ]}> | ||||||
|       <InlineLinkText to="https://bsky.social"> |       <InlineLinkText | ||||||
|  |         label={_(msg`Learn more about Bluesky`)} | ||||||
|  |         to="https://bsky.social"> | ||||||
|         <Trans>Business</Trans> |         <Trans>Business</Trans> | ||||||
|       </InlineLinkText> |       </InlineLinkText> | ||||||
|       <InlineLinkText to="https://bsky.social/about/blog"> |       <InlineLinkText | ||||||
|  |         label={_(msg`Read the Bluesky blog`)} | ||||||
|  |         to="https://bsky.social/about/blog"> | ||||||
|         <Trans>Blog</Trans> |         <Trans>Blog</Trans> | ||||||
|       </InlineLinkText> |       </InlineLinkText> | ||||||
|       <InlineLinkText to="https://bsky.social/about/join"> |       <InlineLinkText | ||||||
|  |         label={_(msg`See jobs at Bluesky`)} | ||||||
|  |         to="https://bsky.social/about/join"> | ||||||
|         <Trans>Jobs</Trans> |         <Trans>Jobs</Trans> | ||||||
|       </InlineLinkText> |       </InlineLinkText> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -73,7 +73,7 @@ export function HomeHeaderLayoutMobile({ | ||||||
|           ]}> |           ]}> | ||||||
|           {IS_DEV && ( |           {IS_DEV && ( | ||||||
|             <> |             <> | ||||||
|               <Link to="/sys/debug"> |               <Link label="View storybook" to="/sys/debug"> | ||||||
|                 <ColorPalette size="md" /> |                 <ColorPalette size="md" /> | ||||||
|               </Link> |               </Link> | ||||||
|             </> |             </> | ||||||
|  |  | ||||||
|  | @ -99,6 +99,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) { | ||||||
|         <Trans> |         <Trans> | ||||||
|           This feed is no longer online. We are showing{' '} |           This feed is no longer online. We are showing{' '} | ||||||
|           <InlineLinkText |           <InlineLinkText | ||||||
|  |             label={_(msg`The Discover feed`)} | ||||||
|             to="/profile/bsky.app/feed/whats-hot" |             to="/profile/bsky.app/feed/whats-hot" | ||||||
|             style={[a.text_md]}> |             style={[a.text_md]}> | ||||||
|             Discover |             Discover | ||||||
|  |  | ||||||
|  | @ -94,6 +94,7 @@ export function ExportCarDialog({ | ||||||
|               This feature is in beta. You can read more about repository |               This feature is in beta. You can read more about repository | ||||||
|               exports in{' '} |               exports in{' '} | ||||||
|               <InlineLinkText |               <InlineLinkText | ||||||
|  |                 label={_(msg`View blogpost for more details`)} | ||||||
|                 to="https://docs.bsky.app/blog/repo-export" |                 to="https://docs.bsky.app/blog/repo-export" | ||||||
|                 style={[a.text_sm]}> |                 style={[a.text_sm]}> | ||||||
|                 this blogpost |                 this blogpost | ||||||
|  |  | ||||||
|  | @ -13,18 +13,20 @@ export function Links() { | ||||||
|       <H1>Links</H1> |       <H1>Links</H1> | ||||||
| 
 | 
 | ||||||
|       <View style={[a.gap_md, a.align_start]}> |       <View style={[a.gap_md, a.align_start]}> | ||||||
|         <InlineLinkText to="https://google.com" style={[a.text_lg]}> |         <InlineLinkText label="foo" to="https://google.com" style={[a.text_lg]}> | ||||||
|           https://google.com
 |           https://google.com
 | ||||||
|         </InlineLinkText> |         </InlineLinkText> | ||||||
|         <InlineLinkText to="https://google.com" style={[a.text_lg]}> |         <InlineLinkText label="foo" to="https://google.com" style={[a.text_lg]}> | ||||||
|           External with custom children (google.com) |           External with custom children (google.com) | ||||||
|         </InlineLinkText> |         </InlineLinkText> | ||||||
|         <InlineLinkText |         <InlineLinkText | ||||||
|  |           label="foo" | ||||||
|           to="https://bsky.social" |           to="https://bsky.social" | ||||||
|           style={[a.text_md, t.atoms.text_contrast_low]}> |           style={[a.text_md, t.atoms.text_contrast_low]}> | ||||||
|           Internal (bsky.social) |           Internal (bsky.social) | ||||||
|         </InlineLinkText> |         </InlineLinkText> | ||||||
|         <InlineLinkText |         <InlineLinkText | ||||||
|  |           label="foo" | ||||||
|           to="https://bsky.app/profile/bsky.app" |           to="https://bsky.app/profile/bsky.app" | ||||||
|           style={[a.text_md]}> |           style={[a.text_md]}> | ||||||
|           Internal (bsky.app) |           Internal (bsky.app) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue