Stop passing _ around in composer functions (#10256)

This commit is contained in:
Samuel Newman
2026-04-15 07:39:51 -07:00
committed by GitHub
parent bcbc114189
commit ecc78efb12
5 changed files with 129 additions and 137 deletions
+19 -19
View File
@@ -263,7 +263,7 @@ export async function processVideo(
agent: BskyAgent,
did: string,
signal: AbortSignal,
_: I18n['_'],
i18n: I18n,
) {
let video: CompressedVideo | undefined
try {
@@ -274,7 +274,7 @@ export async function processVideo(
signal,
})
} catch (e) {
const message = getCompressErrorMessage(e, _)
const message = getCompressErrorMessage(e, i18n)
if (message !== null) {
dispatch({
type: 'to_error',
@@ -297,13 +297,13 @@ export async function processVideo(
agent,
did,
signal,
_,
i18n,
setProgress: p => {
dispatch({type: 'update_progress', progress: p, signal})
},
})
} catch (e) {
const message = getUploadErrorMessage(e, _)
const message = getUploadErrorMessage(e, i18n)
if (message !== null) {
dispatch({
type: 'to_error',
@@ -355,7 +355,7 @@ export async function processVideo(
logger.error('Error processing video', {safeMessage: e})
dispatch({
type: 'to_error',
error: _(msg`Video failed to process`),
error: i18n._(msg`Video failed to process`),
signal,
})
return // Exit async loop
@@ -387,20 +387,20 @@ export async function processVideo(
}
}
function getCompressErrorMessage(e: unknown, _: I18n['_']): string | null {
function getCompressErrorMessage(e: unknown, i18n: I18n): string | null {
if (e instanceof AbortError) {
return null
}
if (e instanceof VideoTooLargeError) {
return _(
return i18n._(
msg`The selected video is larger than 100 MB. Please try again with a smaller file.`,
)
}
logger.error('Error compressing video', {safeMessage: e})
return _(msg`An error occurred while compressing the video.`)
return i18n._(msg`An error occurred while compressing the video.`)
}
function getUploadErrorMessage(e: unknown, _: I18n['_']): string | null {
function getUploadErrorMessage(e: unknown, i18n: I18n): string | null {
if (e instanceof AbortError) {
return null
}
@@ -408,38 +408,38 @@ function getUploadErrorMessage(e: unknown, _: I18n['_']): string | null {
// https://github.com/bluesky-social/tango/blob/lumi/lumi/worker/permissions.go#L77
switch (e.message) {
case 'User is not allowed to upload videos':
return _(msg`You are not allowed to upload videos.`)
return i18n._(msg`You are not allowed to upload videos.`)
case 'Uploading is disabled at the moment':
return _(
return i18n._(
msg`Hold up! We’re gradually giving access to video, and you’re still waiting in line. Check back soon!`,
)
case "Failed to get user's upload stats":
return _(
return i18n._(
msg`We were unable to determine if you are allowed to upload videos. Please try again.`,
)
case 'User has exceeded daily upload bytes limit':
return _(
return i18n._(
msg`You've reached your daily limit for video uploads (too many bytes)`,
)
case 'User has exceeded daily upload videos limit':
return _(
return i18n._(
msg`You've reached your daily limit for video uploads (too many videos)`,
)
case 'Account is not old enough to upload videos':
return _(
return i18n._(
msg`Your account is not yet old enough to upload videos. Please try again later.`,
)
case 'file size (100000001 bytes) is larger than the maximum allowed size (100000000 bytes)':
return _(
return i18n._(
msg`The selected video is larger than 100 MB. Please try again with a smaller file.`,
)
case 'Confirm your email address to upload videos':
return _(msg`Please confirm your email address to upload videos.`)
return i18n._(msg`Please confirm your email address to upload videos.`)
}
}
if (isNetworkError(e)) {
return _(
return i18n._(
msg`An error occurred while uploading the video. Please check your internet connection and try again.`,
)
} else {
@@ -448,5 +448,5 @@ function getUploadErrorMessage(e: unknown, _: I18n['_']): string | null {
}
const message = e instanceof Error ? e.message : ''
return _(msg`An error occurred while uploading the video. ${message}`)
return i18n._(msg`An error occurred while uploading the video. ${message}`)
}