diff --git a/assets/icons/download_stroke2_corner0_rounded.svg b/assets/icons/download_stroke2_corner0_rounded.svg new file mode 100644 index 00000000..899fef3e --- /dev/null +++ b/assets/icons/download_stroke2_corner0_rounded.svg @@ -0,0 +1 @@ + diff --git a/src/App.native.tsx b/src/App.native.tsx index 780d4058..83f133e9 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -57,6 +57,7 @@ import * as Toast from '#/view/com/util/Toast' import {Shell} from '#/view/shell' import {ThemeProvider as Alf} from '#/alf' import {useColorModeTheme} from '#/alf/util/useColorModeTheme' +import {NuxDialogs} from '#/components/dialogs/nuxs' import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' import {Provider as PortalProvider} from '#/components/Portal' @@ -131,6 +132,7 @@ function InnerApp() { style={s.h100pct}> + diff --git a/src/App.web.tsx b/src/App.web.tsx index 3017a3a2..ff9944fa 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -46,6 +46,7 @@ import {ToastContainer} from '#/view/com/util/Toast.web' import {Shell} from '#/view/shell/index' import {ThemeProvider as Alf} from '#/alf' import {useColorModeTheme} from '#/alf/util/useColorModeTheme' +import {NuxDialogs} from '#/components/dialogs/nuxs' import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' import {Provider as PortalProvider} from '#/components/Portal' @@ -113,6 +114,7 @@ function InnerApp() { + diff --git a/src/alf/index.tsx b/src/alf/index.tsx index 5fa7d3b1..d699de6a 100644 --- a/src/alf/index.tsx +++ b/src/alf/index.tsx @@ -18,9 +18,17 @@ export * from '#/alf/util/themeSelector' export const Context = React.createContext<{ themeName: ThemeName theme: Theme + themes: ReturnType }>({ themeName: 'light', theme: defaultTheme, + themes: createThemes({ + hues: { + primary: BLUE_HUE, + negative: RED_HUE, + positive: GREEN_HUE, + }, + }), }) export function ThemeProvider({ @@ -42,18 +50,22 @@ export function ThemeProvider({ ({ + themes, themeName: themeName, theme: theme, }), - [theme, themeName], + [theme, themeName, themes], )}> {children} ) } -export function useTheme() { - return React.useContext(Context).theme +export function useTheme(theme?: ThemeName) { + const ctx = React.useContext(Context) + return React.useMemo(() => { + return theme ? ctx.themes[theme] : ctx.theme + }, [theme, ctx]) } export function useBreakpoints() { diff --git a/src/components/Dialog/index.tsx b/src/components/Dialog/index.tsx index 158244c8..cdce3765 100644 --- a/src/components/Dialog/index.tsx +++ b/src/components/Dialog/index.tsx @@ -256,7 +256,7 @@ export const ScrollableInner = React.forwardRef< borderTopLeftRadius: 40, borderTopRightRadius: 40, }, - flatten(style), + style, ]} contentContainerStyle={a.pb_4xl} ref={ref}> diff --git a/src/components/dialogs/nuxs/TenMillion/icons/OnePercent.tsx b/src/components/dialogs/nuxs/TenMillion/icons/OnePercent.tsx new file mode 100644 index 00000000..9c8d47af --- /dev/null +++ b/src/components/dialogs/nuxs/TenMillion/icons/OnePercent.tsx @@ -0,0 +1,15 @@ +import React from 'react' +import Svg, {Path} from 'react-native-svg' + +export function OnePercent({fill}: {fill?: string}) { + return ( + + + + ) +} diff --git a/src/components/dialogs/nuxs/TenMillion/icons/PointOnePercent.tsx b/src/components/dialogs/nuxs/TenMillion/icons/PointOnePercent.tsx new file mode 100644 index 00000000..1f9467e4 --- /dev/null +++ b/src/components/dialogs/nuxs/TenMillion/icons/PointOnePercent.tsx @@ -0,0 +1,15 @@ +import React from 'react' +import Svg, {Path} from 'react-native-svg' + +export function PointOnePercent({fill}: {fill?: string}) { + return ( + + + + ) +} diff --git a/src/components/dialogs/nuxs/TenMillion/icons/TenPercent.tsx b/src/components/dialogs/nuxs/TenMillion/icons/TenPercent.tsx new file mode 100644 index 00000000..4197be83 --- /dev/null +++ b/src/components/dialogs/nuxs/TenMillion/icons/TenPercent.tsx @@ -0,0 +1,15 @@ +import React from 'react' +import Svg, {Path} from 'react-native-svg' + +export function TenPercent({fill}: {fill?: string}) { + return ( + + + + ) +} diff --git a/src/components/dialogs/nuxs/TenMillion/icons/TwentyFivePercent.tsx b/src/components/dialogs/nuxs/TenMillion/icons/TwentyFivePercent.tsx new file mode 100644 index 00000000..0d379714 --- /dev/null +++ b/src/components/dialogs/nuxs/TenMillion/icons/TwentyFivePercent.tsx @@ -0,0 +1,15 @@ +import React from 'react' +import Svg, {Path} from 'react-native-svg' + +export function TwentyFivePercent({fill}: {fill?: string}) { + return ( + + + + ) +} diff --git a/src/components/dialogs/nuxs/TenMillion/index.tsx b/src/components/dialogs/nuxs/TenMillion/index.tsx new file mode 100644 index 00000000..801ceb99 --- /dev/null +++ b/src/components/dialogs/nuxs/TenMillion/index.tsx @@ -0,0 +1,650 @@ +import React from 'react' +import {View} from 'react-native' +import Animated, {FadeIn} from 'react-native-reanimated' +import ViewShot from 'react-native-view-shot' +import {Image} from 'expo-image' +import {requestMediaLibraryPermissionsAsync} from 'expo-image-picker' +import * as MediaLibrary from 'expo-media-library' +import {moderateProfile} from '@atproto/api' +import {msg, Trans} from '@lingui/macro' +import {useLingui} from '@lingui/react' + +import {networkRetry} from '#/lib/async/retry' +import {getCanvas} from '#/lib/canvas' +import {shareUrl} from '#/lib/sharing' +import {sanitizeDisplayName} from '#/lib/strings/display-names' +import {sanitizeHandle} from '#/lib/strings/handles' +import {isIOS, isNative} from '#/platform/detection' +import {useModerationOpts} from '#/state/preferences/moderation-opts' +import {useProfileQuery} from '#/state/queries/profile' +import {useAgent, useSession} from '#/state/session' +import {useComposerControls} from 'state/shell' +import {formatCount} from '#/view/com/util/numeric/format' +import {Logomark} from '#/view/icons/Logomark' +import * as Toast from 'view/com/util/Toast' +import { + atoms as a, + ThemeProvider, + tokens, + useBreakpoints, + useTheme, +} from '#/alf' +import {Button, ButtonIcon, ButtonText} from '#/components/Button' +import * as Dialog from '#/components/Dialog' +import {useNuxDialogContext} from '#/components/dialogs/nuxs' +import {OnePercent} from '#/components/dialogs/nuxs/TenMillion/icons/OnePercent' +import {PointOnePercent} from '#/components/dialogs/nuxs/TenMillion/icons/PointOnePercent' +import {TenPercent} from '#/components/dialogs/nuxs/TenMillion/icons/TenPercent' +import {Divider} from '#/components/Divider' +import {GradientFill} from '#/components/GradientFill' +import {ArrowOutOfBox_Stroke2_Corner0_Rounded as Share} from '#/components/icons/ArrowOutOfBox' +import {Download_Stroke2_Corner0_Rounded as Download} from '#/components/icons/Download' +import {Image_Stroke2_Corner0_Rounded as ImageIcon} from '#/components/icons/Image' +import {Loader} from '#/components/Loader' +import {Text} from '#/components/Typography' + +const DEBUG = false +const RATIO = 8 / 10 +const WIDTH = 2000 +const HEIGHT = WIDTH * RATIO + +function getFontSize(count: number) { + const length = count.toString().length + if (length < 7) { + return 80 + } else if (length < 5) { + return 100 + } else { + return 70 + } +} + +function getPercentBadge(percent: number) { + if (percent <= 0.001) { + return PointOnePercent + } else if (percent <= 0.01) { + return OnePercent + } else if (percent <= 0.1) { + return TenPercent + } + return null +} + +function Frame({children}: {children: React.ReactNode}) { + return ( + + {children} + + ) +} + +export function TenMillion() { + const agent = useAgent() + const nuxDialogs = useNuxDialogContext() + const [userNumber, setUserNumber] = React.useState(0) + const fetching = React.useRef(false) + + React.useEffect(() => { + async function fetchUserNumber() { + const isBlueskyHosted = agent.sessionManager.pdsUrl + ?.toString() + .includes('bsky.network') + + if (isBlueskyHosted && agent.session?.accessJwt) { + const res = await fetch( + `https://bsky.social/xrpc/com.atproto.temp.getSignupNumber`, + { + headers: { + Authorization: `Bearer ${agent.session.accessJwt}`, + }, + }, + ) + + if (!res.ok) { + throw new Error('Network request failed') + } + + const data = await res.json() + + if (data.number) { + setUserNumber(data.number) + } else { + // should be rare + nuxDialogs.dismissActiveNux() + } + } + } + + if (!fetching.current) { + fetching.current = true + networkRetry(3, fetchUserNumber).catch(() => { + nuxDialogs.dismissActiveNux() + }) + } + }, [ + agent.sessionManager.pdsUrl, + agent.session?.accessJwt, + setUserNumber, + nuxDialogs.dismissActiveNux, + nuxDialogs, + ]) + + return userNumber ? : null +} + +export function TenMillionInner({userNumber}: {userNumber: number}) { + const t = useTheme() + const lightTheme = useTheme('light') + const {_, i18n} = useLingui() + const control = Dialog.useDialogControl() + const {gtMobile} = useBreakpoints() + const {openComposer} = useComposerControls() + const {currentAccount} = useSession() + const { + isLoading: isProfileLoading, + data: profile, + error: profileError, + } = useProfileQuery({ + did: currentAccount!.did, + }) + const moderationOpts = useModerationOpts() + const nuxDialogs = useNuxDialogContext() + const moderation = React.useMemo(() => { + return profile && moderationOpts + ? moderateProfile(profile, moderationOpts) + : undefined + }, [profile, moderationOpts]) + const [uri, setUri] = React.useState(null) + const percent = userNumber / 10_000_000 + const Badge = getPercentBadge(percent) + const isLoadingData = isProfileLoading || !moderation || !profile + const isLoadingImage = !uri + + const error: string = React.useMemo(() => { + if (profileError) { + return _( + msg`Oh no! We weren't able to generate an image for you to share. Rest assured, we're glad you're here 🦋`, + ) + } + return '' + }, [_, profileError]) + + /* + * Opening and closing + */ + React.useEffect(() => { + const timeout = setTimeout(() => { + control.open() + }, 3e3) + return () => { + clearTimeout(timeout) + } + }, [control]) + const onClose = React.useCallback(() => { + nuxDialogs.dismissActiveNux() + }, [nuxDialogs]) + + /* + * Actions + */ + const sharePost = React.useCallback(() => { + if (uri) { + control.close(() => { + setTimeout(() => { + openComposer({ + text: _( + msg`Bluesky now has over 10 million users, and I was #${i18n.number( + userNumber, + )}!`, + ), // TODO + imageUris: [ + { + uri, + width: WIDTH, + height: HEIGHT, + }, + ], + }) + }, 1e3) + }) + } + }, [_, i18n, control, openComposer, uri, userNumber]) + const onNativeShare = React.useCallback(() => { + if (uri) { + control.close(() => { + shareUrl(uri) + }) + } + }, [uri, control]) + const onNativeDownload = React.useCallback(async () => { + if (uri) { + const res = await requestMediaLibraryPermissionsAsync() + + if (!res) { + Toast.show( + _( + msg`You must grant access to your photo library to save the image.`, + ), + 'xmark', + ) + return + } + + try { + await MediaLibrary.createAssetAsync(uri) + Toast.show(_(msg`Image saved to your camera roll!`)) + } catch (e: unknown) { + console.log(e) + Toast.show(_(msg`An error occurred while saving the image!`), 'xmark') + return + } + } + }, [_, uri]) + const onWebDownload = React.useCallback(async () => { + if (uri) { + const canvas = await getCanvas(uri) + const imgHref = canvas + .toDataURL('image/png') + .replace('image/png', 'image/octet-stream') + const link = document.createElement('a') + link.setAttribute('download', `Bluesky 10M Users.png`) + link.setAttribute('href', imgHref) + link.click() + } + }, [uri]) + + /* + * Canvas stuff + */ + const imageRef = React.useRef(null) + const captureInProgress = React.useRef(false) + const onCanvasReady = React.useCallback(async () => { + if ( + imageRef.current && + imageRef.current.capture && + !captureInProgress.current + ) { + captureInProgress.current = true + const uri = await imageRef.current.capture() + setUri(uri) + } + }, [setUri]) + const canvas = isLoadingData ? null : ( + + + + + + + + + + + + + + {/* Centered content */} + + + + Celebrating {formatCount(i18n, 10000000)} users + {' '} + 🎉 + + + + # + + + {i18n.number(userNumber)} + + + + {Badge && ( + + + + )} + + {/* End centered content */} + + + + {/* + + */} + + + {sanitizeDisplayName( + profile.displayName || + sanitizeHandle(profile.handle), + moderation.ui('displayName'), + )} + + + + {sanitizeHandle(profile.handle, '@')} + + + {profile.createdAt && ( + + + Joined{' '} + {i18n.date(profile.createdAt, { + month: 'short', + day: 'numeric', + year: 'numeric', + })} + + + )} + + + + + + + + + + + + ) + + return ( + + + + + + + {error ? ( + + + (╯°□°)╯︵ ┻━┻ + + + {error} + + + ) : isLoadingData || isLoadingImage ? ( + + ) : ( + + + + )} + + + + {canvas} + + + + Thanks for being one of our first 10 million users. + + + + + Together, we're rebuilding the social internet. We're glad + you're here. + + + + + + + + Brag a little! + + + + + + + + + + + + ) +} diff --git a/src/components/dialogs/nuxs/index.tsx b/src/components/dialogs/nuxs/index.tsx new file mode 100644 index 00000000..78169607 --- /dev/null +++ b/src/components/dialogs/nuxs/index.tsx @@ -0,0 +1,151 @@ +import React from 'react' + +import {useGate} from '#/lib/statsig/statsig' +import {logger} from '#/logger' +import { + Nux, + useNuxs, + useRemoveNuxsMutation, + useUpsertNuxMutation, +} from '#/state/queries/nuxs' +import {useSession} from '#/state/session' +import {isSnoozed, snooze, unsnooze} from '#/components/dialogs/nuxs/snoozing' +import {TenMillion} from '#/components/dialogs/nuxs/TenMillion' +import {IS_DEV} from '#/env' + +type Context = { + activeNux: Nux | undefined + dismissActiveNux: () => void +} + +/** + * If we fail to complete a NUX here, it may show again on next reload, + * or if prefs state updates. If `true`, this fallback ensures that the last + * shown NUX won't show again, at least for this session. + * + * This is temporary, and only needed for the 10Milly dialog rn, since we + * aren't snoozing that one in device storage. + */ +let __isSnoozedFallback = false + +const queuedNuxs: { + id: Nux + enabled(props: {gate: ReturnType}): boolean + /** + * TEMP only intended for use with the 10Milly dialog rn, since there are no + * other NUX dialogs configured + */ + unsafe_disableSnooze: boolean +}[] = [ + { + id: Nux.TenMillionDialog, + enabled({gate}) { + return gate('ten_million_dialog') + }, + unsafe_disableSnooze: true, + }, +] + +const Context = React.createContext({ + activeNux: undefined, + dismissActiveNux: () => {}, +}) + +export function useNuxDialogContext() { + return React.useContext(Context) +} + +export function NuxDialogs() { + const {hasSession} = useSession() + return hasSession ? : null +} + +function Inner() { + const gate = useGate() + const {nuxs} = useNuxs() + const [snoozed, setSnoozed] = React.useState(() => { + return isSnoozed() + }) + const [activeNux, setActiveNux] = React.useState() + const {mutateAsync: upsertNux} = useUpsertNuxMutation() + const {mutate: removeNuxs} = useRemoveNuxsMutation() + + const snoozeNuxDialog = React.useCallback(() => { + snooze() + setSnoozed(true) + }, [setSnoozed]) + + const dismissActiveNux = React.useCallback(() => { + if (!activeNux) return + setActiveNux(undefined) + }, [activeNux, setActiveNux]) + + if (IS_DEV && typeof window !== 'undefined') { + // @ts-ignore + window.clearNuxDialog = (id: Nux) => { + if (!IS_DEV || !id) return + removeNuxs([id]) + unsnooze() + } + } + + React.useEffect(() => { + if (__isSnoozedFallback) return + if (snoozed) return + if (!nuxs) return + + for (const {id, enabled, unsafe_disableSnooze} of queuedNuxs) { + const nux = nuxs.find(nux => nux.id === id) + + // check if completed first + if (nux && nux.completed) continue + + // then check gate (track exposure) + if (!enabled({gate})) continue + + // we have a winner + setActiveNux(id) + + /** + * TEMP only intended for use with the 10Milly dialog rn, since there are no + * other NUX dialogs configured + */ + if (!unsafe_disableSnooze) { + // immediately snooze for a day + snoozeNuxDialog() + } + + // immediately update remote data (affects next reload) + upsertNux({ + id, + completed: true, + data: undefined, + }).catch(e => { + logger.error(`NUX dialogs: failed to upsert '${id}' NUX`, { + safeMessage: e.message, + }) + /* + * TEMP only intended for use with the 10Milly dialog rn + */ + if (unsafe_disableSnooze) { + __isSnoozedFallback = true + } + }) + + break + } + }, [nuxs, snoozed, snoozeNuxDialog, upsertNux, gate]) + + const ctx = React.useMemo(() => { + return { + activeNux, + dismissActiveNux, + } + }, [activeNux, dismissActiveNux]) + + return ( + + {activeNux === Nux.TenMillionDialog && } + + ) +} diff --git a/src/components/dialogs/nuxs/snoozing.ts b/src/components/dialogs/nuxs/snoozing.ts new file mode 100644 index 00000000..91effd05 --- /dev/null +++ b/src/components/dialogs/nuxs/snoozing.ts @@ -0,0 +1,22 @@ +import {simpleAreDatesEqual} from '#/lib/strings/time' +import {device} from '#/storage' + +export function snooze() { + device.set(['lastNuxDialog'], new Date().toISOString()) +} + +export function unsnooze() { + device.set(['lastNuxDialog'], undefined) +} + +export function isSnoozed() { + const lastNuxDialog = device.get(['lastNuxDialog']) + if (!lastNuxDialog) return false + const last = new Date(lastNuxDialog) + const now = new Date() + // already snoozed today + if (simpleAreDatesEqual(last, now)) { + return true + } + return false +} diff --git a/src/components/icons/Download.tsx b/src/components/icons/Download.tsx new file mode 100644 index 00000000..86b49428 --- /dev/null +++ b/src/components/icons/Download.tsx @@ -0,0 +1,5 @@ +import {createSinglePathSVG} from './TEMPLATE' + +export const Download_Stroke2_Corner0_Rounded = createSinglePathSVG({ + path: 'M12 3a1 1 0 0 1 1 1v8.086l1.793-1.793a1 1 0 1 1 1.414 1.414l-3.5 3.5a1 1 0 0 1-1.414 0l-3.5-3.5a1 1 0 1 1 1.414-1.414L11 12.086V4a1 1 0 0 1 1-1ZM4 14a1 1 0 0 1 1 1v4h14v-4a1 1 0 1 1 2 0v5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-5a1 1 0 0 1 1-1Z', +}) diff --git a/src/lib/canvas.ts b/src/lib/canvas.ts new file mode 100644 index 00000000..760c0e67 --- /dev/null +++ b/src/lib/canvas.ts @@ -0,0 +1,15 @@ +export const getCanvas = (base64: string): Promise => { + return new Promise(resolve => { + const image = new Image() + image.onload = () => { + const canvas = document.createElement('canvas') + canvas.width = image.width + canvas.height = image.height + + const ctx = canvas.getContext('2d') + ctx?.drawImage(image, 0, 0) + resolve(canvas) + } + image.src = base64 + }) +} diff --git a/src/lib/hooks/useIntentHandler.ts b/src/lib/hooks/useIntentHandler.ts index 8cccda48..67f1c2c3 100644 --- a/src/lib/hooks/useIntentHandler.ts +++ b/src/lib/hooks/useIntentHandler.ts @@ -71,7 +71,7 @@ export function useIntentHandler() { }, [incomingUrl, composeIntent, verifyEmailIntent]) } -function useComposeIntent() { +export function useComposeIntent() { const closeAllActiveElements = useCloseAllActiveElements() const {openComposer} = useComposerControls() const {hasSession} = useSession() @@ -97,6 +97,10 @@ function useComposeIntent() { if (part.includes('https://') || part.includes('http://')) { return false } + console.log({ + part, + text: VALID_IMAGE_REGEX.test(part), + }) // We also should just filter out cases that don't have all the info we need return VALID_IMAGE_REGEX.test(part) }) diff --git a/src/lib/statsig/gates.ts b/src/lib/statsig/gates.ts index 7966767d..909b93e6 100644 --- a/src/lib/statsig/gates.ts +++ b/src/lib/statsig/gates.ts @@ -1,3 +1,5 @@ export type Gate = // Keep this alphabetic please. - 'debug_show_feedcontext' | 'suggested_feeds_interstitial' + | 'debug_show_feedcontext' + | 'suggested_feeds_interstitial' + | 'ten_million_dialog' diff --git a/src/locale/locales/ja/messages.po b/src/locale/locales/ja/messages.po index 61dc1394..b1c03b59 100644 --- a/src/locale/locales/ja/messages.po +++ b/src/locale/locales/ja/messages.po @@ -115,7 +115,7 @@ msgstr "<0><1>テキストとタグ中の{0}" msgid "{0} joined this week" msgstr "今週、{0}人が参加しました" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:593 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:637 msgid "{0} of {1}" msgstr "{0} / {1}" @@ -123,7 +123,7 @@ msgstr "{0} / {1}" msgid "{0} people have used this starter pack!" msgstr "{0}人がこのスターターパックを使用しました！" -#: src/view/com/util/UserAvatar.tsx:419 +#: src/view/com/util/UserAvatar.tsx:423 msgid "{0}'s avatar" msgstr "{0}のアバター" @@ -372,7 +372,7 @@ msgstr "アカウントを追加" msgid "Add alt text" msgstr "ALTテキストを追加" -#: src/view/com/composer/videos/SubtitleDialog.tsx:107 +#: src/view/com/composer/videos/SubtitleDialog.tsx:109 msgid "Add alt text (optional)" msgstr "ALTテキストを追加（オプション）" @@ -493,9 +493,9 @@ msgid "ALT" msgstr "ALT" #: src/view/com/composer/GifAltText.tsx:144 -#: src/view/com/composer/videos/SubtitleDialog.tsx:54 -#: src/view/com/composer/videos/SubtitleDialog.tsx:102 -#: src/view/com/composer/videos/SubtitleDialog.tsx:106 +#: src/view/com/composer/videos/SubtitleDialog.tsx:56 +#: src/view/com/composer/videos/SubtitleDialog.tsx:104 +#: src/view/com/composer/videos/SubtitleDialog.tsx:108 #: src/view/com/modals/EditImage.tsx:316 #: src/view/screens/AccessibilitySettings.tsx:87 msgid "Alt text" @@ -522,11 +522,11 @@ msgstr "以前のメールアドレス{0}にメールが送信されました。 msgid "An error has occurred" msgstr "エラーが発生しました" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:369 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:413 msgid "An error occurred" msgstr "エラーが発生しました" -#: src/state/queries/video/video.ts:227 +#: src/state/queries/video/video.ts:232 msgid "An error occurred while compressing the video." msgstr "ビデオの圧縮中にエラーが発生しました。" @@ -534,11 +534,11 @@ msgstr "ビデオの圧縮中にエラーが発生しました。" msgid "An error occurred while generating your starter pack. Want to try again?" msgstr "スターターパックの生成中にエラーが発生しました。再度試しますか？" -#: src/view/com/util/post-embeds/VideoEmbed.tsx:213 +#: src/view/com/util/post-embeds/VideoEmbed.tsx:215 msgid "An error occurred while loading the video. Please try again later." msgstr "ビデオの読み込み時にエラーが発生しました。時間をおいてもう一度お試しください。" -#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:170 +#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:174 msgid "An error occurred while loading the video. Please try again." msgstr "ビデオの読み込み時にエラーが発生しました。もう一度お試しください。" @@ -547,7 +547,7 @@ msgstr "ビデオの読み込み時にエラーが発生しました。もう一 msgid "An error occurred while saving the QR code!" msgstr "QRコードの保存中にエラーが発生しました！" -#: src/view/com/composer/videos/SelectVideoBtn.tsx:61 +#: src/view/com/composer/videos/SelectVideoBtn.tsx:68 msgid "An error occurred while selecting the video" msgstr "ビデオの選択中にエラーが発生しました" @@ -556,7 +556,7 @@ msgstr "ビデオの選択中にエラーが発生しました" msgid "An error occurred while trying to follow all" msgstr "すべてフォローしようとしたらエラーが発生しました" -#: src/state/queries/video/video.ts:194 +#: src/state/queries/video/video.ts:199 msgid "An error occurred while uploading the video." msgstr "ビデオのアップロード中にエラーが発生しました。" @@ -702,7 +702,7 @@ msgstr "あなたのフィードから{0}を削除してもよろしいですか msgid "Are you sure you want to remove this from your feeds?" msgstr "本当にこのフィードをあなたのフィードから削除したいですか？" -#: src/view/com/composer/Composer.tsx:837 +#: src/view/com/composer/Composer.tsx:841 msgid "Are you sure you'd like to discard this draft?" msgstr "本当にこの下書きを破棄しますか？" @@ -844,6 +844,10 @@ msgstr "Bluesky は、ホスティング プロバイダーを選択できるオ msgid "Bluesky is better with friends!" msgstr "Blueskyは友達と一緒のほうが楽しい！" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:201 +msgid "Bluesky now has over 10 million users, and I was #{0}!" +msgstr "Bluesky のユーザー数は現在 1,000 万人を超えており、私は #{0} でした。" + #: src/components/StarterPack/ProfileStarterPacks.tsx:282 msgid "Bluesky will choose a set of recommended accounts from people in your network." msgstr "Blueskyはあなたのつながっているユーザーからおすすめのアカウントを選びます。" @@ -865,6 +869,10 @@ msgstr "画像のぼかしとフィードからのフィルタリング" msgid "Books" msgstr "書籍" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:583 +msgid "Brag a little!" +msgstr "ちょっと自慢してみよう！" + #: src/components/FeedInterstitials.tsx:346 msgid "Browse more accounts on the Explore page" msgstr "検索ページでさらにアカウントを見る" @@ -927,8 +935,8 @@ msgstr "英数字、スペース、ハイフン、アンダースコアのみが #: src/components/Prompt.tsx:124 #: src/components/TagMenu/index.tsx:282 #: src/screens/Deactivated.tsx:161 -#: src/view/com/composer/Composer.tsx:590 -#: src/view/com/composer/Composer.tsx:605 +#: src/view/com/composer/Composer.tsx:595 +#: src/view/com/composer/Composer.tsx:610 #: src/view/com/modals/ChangeEmail.tsx:213 #: src/view/com/modals/ChangeEmail.tsx:215 #: src/view/com/modals/ChangeHandle.tsx:148 @@ -996,14 +1004,18 @@ msgstr "リンク先のウェブサイトを開くことをキャンセル" msgid "Cannot interact with a blocked user" msgstr "ブロックしたユーザーとはやりとりできません" -#: src/view/com/composer/videos/SubtitleDialog.tsx:133 +#: src/view/com/composer/videos/SubtitleDialog.tsx:135 msgid "Captions (.vtt)" msgstr "キャプション（.vtt）" -#: src/view/com/composer/videos/SubtitleDialog.tsx:54 +#: src/view/com/composer/videos/SubtitleDialog.tsx:56 msgid "Captions & alt text" msgstr "キャプション＆ALTテキスト" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:336 +msgid "Celebrating {0} users" +msgstr "{0} 人のユーザーを祝福" + #: src/view/com/modals/VerifyEmail.tsx:160 msgid "Change" msgstr "変更" @@ -1238,7 +1250,7 @@ msgstr "下部のナビゲーションバーを閉じる" msgid "Closes password update alert" msgstr "パスワード更新アラートを閉じる" -#: src/view/com/composer/Composer.tsx:602 +#: src/view/com/composer/Composer.tsx:607 msgid "Closes post composer and discards post draft" msgstr "投稿の編集画面を閉じて下書きを削除する" @@ -1277,7 +1289,7 @@ msgstr "初期設定を完了してアカウントを使い始める" msgid "Complete the challenge" msgstr "テストをクリアしてください" -#: src/view/com/composer/Composer.tsx:710 +#: src/view/com/composer/Composer.tsx:715 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length" msgstr "{MAX_GRAPHEME_LENGTH}文字までの投稿を作成" @@ -1495,7 +1507,7 @@ msgstr "リストの読み込みに失敗しました" msgid "Could not mute chat" msgstr "チャットのミュートに失敗しました" -#: src/view/com/composer/videos/VideoPreview.web.tsx:45 +#: src/view/com/composer/videos/VideoPreview.web.tsx:56 msgid "Could not process your video" msgstr "ビデオを処理できませんでした" @@ -1604,7 +1616,7 @@ msgstr "ダークモード" msgid "Dark theme" msgstr "ダークテーマ" -#: src/screens/Signup/StepInfo/index.tsx:191 +#: src/screens/Signup/StepInfo/index.tsx:192 msgid "Date of birth" msgstr "生年月日" @@ -1738,7 +1750,7 @@ msgstr "引用投稿を切り離しますか？" msgid "Dialog: adjust who can interact with this post" msgstr "ダイアログ：この投稿に誰が反応できるか調整" -#: src/view/com/composer/Composer.tsx:351 +#: src/view/com/composer/Composer.tsx:356 msgid "Did you want to say anything?" msgstr "なにか言いたいことはあった？" @@ -1763,7 +1775,7 @@ msgstr "メールでの２要素認証を無効化" msgid "Disable haptic feedback" msgstr "触覚フィードバックを無効化" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:335 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:379 msgid "Disable subtitles" msgstr "サブタイトル（字幕）を無効にする" @@ -1776,11 +1788,11 @@ msgstr "サブタイトル（字幕）を無効にする" msgid "Disabled" msgstr "無効" -#: src/view/com/composer/Composer.tsx:839 +#: src/view/com/composer/Composer.tsx:843 msgid "Discard" msgstr "破棄" -#: src/view/com/composer/Composer.tsx:836 +#: src/view/com/composer/Composer.tsx:840 msgid "Discard draft?" msgstr "下書きを削除しますか？" @@ -1806,7 +1818,7 @@ msgstr "新しいフィードを探す" #~ msgid "Dismiss" #~ msgstr "消す" -#: src/view/com/composer/Composer.tsx:1106 +#: src/view/com/composer/Composer.tsx:1110 msgid "Dismiss error" msgstr "エラーを消す" @@ -1858,8 +1870,8 @@ msgstr "ドメインを確認しました！" #: src/screens/Onboarding/StepProfile/index.tsx:325 #: src/view/com/auth/server-input/index.tsx:169 #: src/view/com/auth/server-input/index.tsx:170 -#: src/view/com/composer/videos/SubtitleDialog.tsx:167 -#: src/view/com/composer/videos/SubtitleDialog.tsx:177 +#: src/view/com/composer/videos/SubtitleDialog.tsx:171 +#: src/view/com/composer/videos/SubtitleDialog.tsx:181 #: src/view/com/modals/AddAppPasswords.tsx:243 #: src/view/com/modals/AltImage.tsx:141 #: src/view/com/modals/crop-image/CropImage.web.tsx:177 @@ -1891,6 +1903,10 @@ msgstr "Blueskyをダウンロード" msgid "Download CAR file" msgstr "CARファイルをダウンロード" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:591 +msgid "Download image" +msgstr "画像をダウンロード" + #: src/view/com/composer/text-input/TextInput.web.tsx:269 msgid "Drop to add images" msgstr "ドロップして画像を追加する" @@ -1952,7 +1968,7 @@ msgctxt "action" msgid "Edit" msgstr "編集" -#: src/view/com/util/UserAvatar.tsx:328 +#: src/view/com/util/UserAvatar.tsx:332 #: src/view/com/util/UserBanner.tsx:92 msgid "Edit avatar" msgstr "アバターを編集" @@ -2112,7 +2128,7 @@ msgstr "有効にするメディアプレイヤー" msgid "Enable priority notifications" msgstr "優先通知を有効にする" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:336 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:380 msgid "Enable subtitles" msgstr "サブタイトル（字幕）を有効にする" @@ -2130,7 +2146,7 @@ msgstr "有効" msgid "End of feed" msgstr "フィードの終わり" -#: src/view/com/composer/videos/SubtitleDialog.tsx:157 +#: src/view/com/composer/videos/SubtitleDialog.tsx:161 msgid "Ensure you have selected a language for each subtitle file." msgstr "各字幕ファイルに言語が選択されてることを確認してください。" @@ -2232,7 +2248,7 @@ msgstr "フォローしているユーザーは除外" msgid "Excludes users you follow" msgstr "フォローしているユーザーは除外" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:353 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:397 msgid "Exit fullscreen" msgstr "全画面表示を終了" @@ -2667,7 +2683,7 @@ msgctxt "from-feed" msgid "From <0/>" msgstr "<0/>から" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:354 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:398 msgid "Fullscreen" msgstr "全画面表示" @@ -2696,7 +2712,7 @@ msgstr "開始" msgid "Getting started" msgstr "入門" -#: src/components/MediaPreview.tsx:119 +#: src/components/MediaPreview.tsx:120 msgid "GIF" msgstr "GIF" @@ -3098,7 +3114,7 @@ msgstr "招待、ただし個人的なもの" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "今はあなただけ！上で検索してスターターパックにより多くのユーザーを追加してください。" -#: src/view/com/composer/Composer.tsx:1125 +#: src/view/com/composer/Composer.tsx:1129 msgid "Job ID: {0}" msgstr "ジョブID：{0}" @@ -3117,6 +3133,10 @@ msgstr "Blueskyに参加" msgid "Join the conversation" msgstr "会話に参加" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:461 +msgid "Joined {0}" +msgstr "{0} 参加" + #: src/screens/Onboarding/index.tsx:21 #: src/screens/Onboarding/state.ts:89 msgid "Journalism" @@ -3580,8 +3600,12 @@ msgstr "映画" msgid "Music" msgstr "音楽" +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:389 +msgctxt "video" +msgid "Mute" +msgstr "" + #: src/components/TagMenu/index.tsx:263 -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:345 msgid "Mute" msgstr "ミュート" @@ -4042,6 +4066,10 @@ msgstr "ちょっと！" msgid "Oh no! Something went wrong." msgstr "ちょっと！何らかの問題が発生したようです。" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:171 +msgid "Oh no! We weren't able to generate an image for you to share. Rest assured, we're glad you're here 🦋" +msgstr "ああ、残念！共有するための画像を生成できませんでした。ご安心ください、ここに来てくれて嬉しいです🦋" + #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:339 msgid "OK" msgstr "OK" @@ -4062,7 +4090,7 @@ msgstr "<0><1/><2><3/>" msgid "Onboarding reset" msgstr "オンボーディングのリセット" -#: src/view/com/composer/Composer.tsx:667 +#: src/view/com/composer/Composer.tsx:672 msgid "One or more images is missing alt text." msgstr "１つもしくは複数の画像にALTテキストがありません。" @@ -4113,8 +4141,8 @@ msgid "Open conversation options" msgstr "会話のオプションを開く" #: src/screens/Messages/Conversation/MessageInput.web.tsx:165 -#: src/view/com/composer/Composer.tsx:819 -#: src/view/com/composer/Composer.tsx:820 +#: src/view/com/composer/Composer.tsx:823 +#: src/view/com/composer/Composer.tsx:824 msgid "Open emoji picker" msgstr "絵文字を入力" @@ -4283,11 +4311,11 @@ msgid "Opens the threads preferences" msgstr "スレッドの設定を開く" #: src/view/com/notifications/FeedItem.tsx:551 -#: src/view/com/util/UserAvatar.tsx:420 +#: src/view/com/util/UserAvatar.tsx:424 msgid "Opens this profile" msgstr "プロフィールを開く" -#: src/view/com/composer/videos/SelectVideoBtn.tsx:81 +#: src/view/com/composer/videos/SelectVideoBtn.tsx:88 msgid "Opens video picker" msgstr "ビデオの選択画面を開く" @@ -4365,11 +4393,11 @@ msgid "Password updated!" msgstr "パスワードが更新されました！" #: src/view/com/util/post-embeds/GifEmbed.tsx:44 -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:322 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:366 msgid "Pause" msgstr "一時停止" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:275 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:319 msgid "Pause video" msgstr "ビデオを一時停止" @@ -4429,7 +4457,7 @@ msgid "Pinned to your feeds" msgstr "フィードにピン留めしました" #: src/view/com/util/post-embeds/GifEmbed.tsx:44 -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:323 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:367 msgid "Play" msgstr "再生" @@ -4441,8 +4469,8 @@ msgstr "{0}を再生" msgid "Play or pause the GIF" msgstr "GIFの再生や一時停止" -#: src/view/com/util/post-embeds/VideoEmbed.tsx:187 -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:276 +#: src/view/com/util/post-embeds/VideoEmbed.tsx:189 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:320 msgid "Play video" msgstr "ビデオを再生" @@ -4514,7 +4542,7 @@ msgstr "@{0}としてサインインしてください" msgid "Please Verify Your Email" msgstr "メールアドレスを確認してください" -#: src/view/com/composer/Composer.tsx:355 +#: src/view/com/composer/Composer.tsx:360 msgid "Please wait for your link card to finish loading" msgstr "リンクカードが読み込まれるまでお待ちください" @@ -4527,8 +4555,8 @@ msgstr "政治" msgid "Porn" msgstr "ポルノ" -#: src/view/com/composer/Composer.tsx:642 -#: src/view/com/composer/Composer.tsx:649 +#: src/view/com/composer/Composer.tsx:647 +#: src/view/com/composer/Composer.tsx:654 msgctxt "action" msgid "Post" msgstr "投稿" @@ -4698,11 +4726,11 @@ msgstr "ユーザーを一括でミュートまたはブロックする、公開 msgid "Public, shareable lists which can drive feeds." msgstr "フィードとして利用できる、公開された共有可能なリスト。" -#: src/view/com/composer/Composer.tsx:627 +#: src/view/com/composer/Composer.tsx:632 msgid "Publish post" msgstr "投稿を公開" -#: src/view/com/composer/Composer.tsx:627 +#: src/view/com/composer/Composer.tsx:632 msgid "Publish reply" msgstr "返信を公開" @@ -4832,7 +4860,7 @@ msgstr "アカウントを削除" msgid "Remove attachment" msgstr "添付を削除" -#: src/view/com/util/UserAvatar.tsx:387 +#: src/view/com/util/UserAvatar.tsx:391 msgid "Remove Avatar" msgstr "アバターを削除" @@ -4900,7 +4928,7 @@ msgstr "引用を削除" msgid "Remove repost" msgstr "リポストを削除" -#: src/view/com/composer/videos/SubtitleDialog.tsx:260 +#: src/view/com/composer/videos/SubtitleDialog.tsx:264 msgid "Remove subtitle file" msgstr "字幕ファイルを削除" @@ -4961,7 +4989,7 @@ msgstr "返信できません" msgid "Replies to this post are disabled." msgstr "この投稿への返信は無効化されています。" -#: src/view/com/composer/Composer.tsx:640 +#: src/view/com/composer/Composer.tsx:645 msgctxt "action" msgid "Reply" msgstr "返信" @@ -5415,7 +5443,7 @@ msgstr "Blueskyの求人を見る" msgid "See this guide" msgstr "ガイドを見る" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:587 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:631 msgid "Seek slider" msgstr "シークバー" @@ -5455,7 +5483,7 @@ msgstr "GIF「{0}」を選ぶ" msgid "Select how long to mute this word for." msgstr "このワードをどのくらいの間ミュートするのかを選択。" -#: src/view/com/composer/videos/SubtitleDialog.tsx:245 +#: src/view/com/composer/videos/SubtitleDialog.tsx:249 msgid "Select language..." msgstr "言語を選択…" @@ -5487,7 +5515,7 @@ msgstr "報告先のモデレーションサービスを選んでください" msgid "Select the service that hosts your data." msgstr "データをホストするサービスを選択します。" -#: src/view/com/composer/videos/SelectVideoBtn.tsx:80 +#: src/view/com/composer/videos/SelectVideoBtn.tsx:87 msgid "Select video" msgstr "ビデオを選択" @@ -5503,7 +5531,7 @@ msgstr "登録されたフィードに含める言語を選択します。選択 msgid "Select your app language for the default text to display in the app." msgstr "アプリに表示されるデフォルトのテキストの言語を選択" -#: src/screens/Signup/StepInfo/index.tsx:192 +#: src/screens/Signup/StepInfo/index.tsx:193 msgid "Select your date of birth" msgstr "生年月日を選択" @@ -5643,6 +5671,7 @@ msgstr "性的行為または性的なヌード。" msgid "Sexually Suggestive" msgstr "性的にきわどい" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:607 #: src/components/StarterPack/QrCodeDialog.tsx:177 #: src/screens/StarterPack/StarterPackScreen.tsx:411 #: src/screens/StarterPack/StarterPackScreen.tsx:582 @@ -5679,6 +5708,14 @@ msgstr "とにかく共有" msgid "Share feed" msgstr "フィードを共有" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:590 +msgid "Share image externally" +msgstr "画像を外部に共有する" + +#: src/components/dialogs/nuxs/TenMillion/index.tsx:602 +msgid "Share image in post" +msgstr "投稿で画像を共有" + #: src/components/StarterPack/ShareDialog.tsx:124 #: src/components/StarterPack/ShareDialog.tsx:131 #: src/screens/StarterPack/StarterPackScreen.tsx:586 @@ -5950,8 +5987,8 @@ msgstr "何らかの問題が発生したようなので、もう一度お試し msgid "Something went wrong!" msgstr "何らかの問題が発生したようです！" -#: src/App.native.tsx:102 -#: src/App.web.tsx:83 +#: src/App.native.tsx:103 +#: src/App.web.tsx:84 msgid "Sorry! Your session expired. Please log in again." msgstr "大変申し訳ありません！セッションの有効期限が切れました。もう一度ログインしてください。" @@ -6153,6 +6190,10 @@ msgstr "ジョークを言って！" msgid "Tell us a little more" msgstr "もう少し教えて" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:487 +msgid "Ten Million" +msgstr "1000万" + #: src/view/shell/desktop/RightNav.tsx:90 msgid "Terms" msgstr "条件" @@ -6186,6 +6227,10 @@ msgstr "テキストの入力フィールド" msgid "Thank you. Your report has been sent." msgstr "ありがとうございます。あなたの報告は送信されました。" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:562 +msgid "Thanks for being one of our first 10 million users." +msgstr "最初の 1,000 万人のユーザーの 1 人になっていただきありがとうございます。" + #: src/components/intents/VerifyEmailIntentDialog.tsx:74 msgid "Thanks, you have successfully verified your email address." msgstr "" @@ -6271,7 +6316,7 @@ msgstr "投稿が削除された可能性があります。" msgid "The Privacy Policy has been moved to <0/>" msgstr "プライバシーポリシーは<0/>に移動しました" -#: src/state/queries/video/video.ts:222 +#: src/state/queries/video/video.ts:227 msgid "The selected video is larger than 50MB." msgstr "選択したビデオのサイズが50MBを超えています。" @@ -6608,7 +6653,7 @@ msgstr "メールでの２要素認証を無効にするには、メールアド msgid "To report a conversation, please report one of its messages via the conversation screen. This lets our moderators understand the context of your issue." msgstr "会話を報告するには、会話の画面からメッセージのうちの一つを報告してください。それによって問題の文脈をモデレーターが理解できるようになります。" -#: src/view/com/composer/videos/SelectVideoBtn.tsx:106 +#: src/view/com/composer/videos/SelectVideoBtn.tsx:113 msgid "To upload videos to Bluesky, you must first verify your email." msgstr "Blueskyにビデオをアップロードするには、まずメールアドレスを確認しなくてはなりません。" @@ -6616,6 +6661,10 @@ msgstr "Blueskyにビデオをアップロードするには、まずメール msgid "To whom would you like to send this report?" msgstr "この報告を誰に送りたいですか？" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:566 +msgid "Together, we're rebuilding the social internet. We're glad you're here." +msgstr "私たちは一緒にソーシャル インターネットを再構築しています。ご参加いただきありがとうございます。" + #: src/view/com/util/forms/DropdownButton.tsx:255 msgid "Toggle dropdown" msgstr "ドロップダウンを切り替え" @@ -6739,8 +6788,12 @@ msgstr "アカウントのフォローを解除" msgid "Unlike this feed" msgstr "このフィードからいいねを外す" +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:388 +msgctxt "video" +msgid "Unmute" +msgstr "" + #: src/components/TagMenu/index.tsx:263 -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:344 #: src/view/screens/ProfileList.tsx:689 msgid "Unmute" msgstr "ミュートを解除" @@ -6767,7 +6820,7 @@ msgstr "会話のミュートを解除" msgid "Unmute thread" msgstr "スレッドのミュートを解除" -#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:273 +#: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:317 msgid "Unmute video" msgstr "ビデオのミュートを解除" @@ -6809,7 +6862,7 @@ msgstr "このラベラーの登録を解除" msgid "Unsubscribed from list" msgstr "リストの登録を解除しました" -#: src/state/queries/video/video.ts:240 +#: src/state/queries/video/video.ts:245 msgid "Unsupported video type: {mimeType}" msgstr "サポートしていないビデオ形式：{mimeType}" @@ -6846,20 +6899,20 @@ msgstr "代わりに写真をアップロード" msgid "Upload a text file to:" msgstr "テキストファイルのアップロード先：" -#: src/view/com/util/UserAvatar.tsx:355 -#: src/view/com/util/UserAvatar.tsx:358 +#: src/view/com/util/UserAvatar.tsx:359 +#: src/view/com/util/UserAvatar.tsx:362 #: src/view/com/util/UserBanner.tsx:123 #: src/view/com/util/UserBanner.tsx:126 msgid "Upload from Camera" msgstr "カメラからアップロード" -#: src/view/com/util/UserAvatar.tsx:372 +#: src/view/com/util/UserAvatar.tsx:376 #: src/view/com/util/UserBanner.tsx:140 msgid "Upload from Files" msgstr "ファイルからアップロード" -#: src/view/com/util/UserAvatar.tsx:366 #: src/view/com/util/UserAvatar.tsx:370 +#: src/view/com/util/UserAvatar.tsx:374 #: src/view/com/util/UserBanner.tsx:134 #: src/view/com/util/UserBanner.tsx:138 msgid "Upload from Library" @@ -6988,7 +7041,7 @@ msgstr "このコンテンツやプロフィールにいいねをしているユ msgid "Value:" msgstr "値：" -#: src/view/com/composer/videos/SelectVideoBtn.tsx:104 +#: src/view/com/composer/videos/SelectVideoBtn.tsx:111 msgid "Verified email required" msgstr "メールアドレスの確認が必要" @@ -7017,7 +7070,7 @@ msgstr "メールアドレスを確認" msgid "Verify New Email" msgstr "新しいメールアドレスを確認" -#: src/view/com/composer/videos/SelectVideoBtn.tsx:108 +#: src/view/com/composer/videos/SelectVideoBtn.tsx:115 msgid "Verify now" msgstr "確認する" @@ -7047,11 +7100,11 @@ msgstr "ビデオの処理に失敗" msgid "Video Games" msgstr "ビデオゲーム" -#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:163 +#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:167 msgid "Video not found." msgstr "ビデオが見つかりません。" -#: src/view/com/composer/videos/SubtitleDialog.tsx:99 +#: src/view/com/composer/videos/SubtitleDialog.tsx:101 msgid "Video settings" msgstr "ビデオの設定" @@ -7059,6 +7112,11 @@ msgstr "ビデオの設定" msgid "Video: {0}" msgstr "ビデオ：{0}" +#: src/view/com/composer/videos/SelectVideoBtn.tsx:58 +#: src/view/com/composer/videos/VideoPreview.web.tsx:44 +msgid "Videos must be less than 60 seconds long" +msgstr "" + #: src/screens/Profile/Header/Shell.tsx:113 msgid "View {0}'s avatar" msgstr "{0}のアバターを表示" @@ -7224,7 +7282,7 @@ msgstr "大変申し訳ありませんが、現在ミュートされたワード msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "大変申し訳ありませんが、検索を完了できませんでした。数分後に再試行してください。" -#: src/view/com/composer/Composer.tsx:417 +#: src/view/com/composer/Composer.tsx:422 msgid "We're sorry! The post you are replying to has been deleted." msgstr "大変申し訳ありません！返信しようとしている投稿は削除されました。" @@ -7255,7 +7313,7 @@ msgstr "あなたのスターターパックを何と呼びたいですか？" #: src/view/com/auth/SplashScreen.tsx:40 #: src/view/com/auth/SplashScreen.web.tsx:86 -#: src/view/com/composer/Composer.tsx:512 +#: src/view/com/composer/Composer.tsx:517 msgid "What's up?" msgstr "最近どう？" @@ -7322,11 +7380,11 @@ msgstr "ワイド" msgid "Write a message" msgstr "メッセージを書く" -#: src/view/com/composer/Composer.tsx:708 +#: src/view/com/composer/Composer.tsx:713 msgid "Write post" msgstr "投稿を書く" -#: src/view/com/composer/Composer.tsx:511 +#: src/view/com/composer/Composer.tsx:516 #: src/view/com/post-thread/PostThreadComposePrompt.tsx:42 msgid "Write your reply" msgstr "返信を書く" @@ -7646,15 +7704,19 @@ msgstr "あなたのアカウント" msgid "Your account has been deleted" msgstr "あなたのアカウントは削除されました" +#: src/state/queries/video/video.ts:185 +msgid "Your account is not yet old enough to upload videos. Please try again later." +msgstr "" + #: src/view/screens/Settings/ExportCarDialog.tsx:65 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately." msgstr "あなたのアカウントの公開データの全記録を含むリポジトリは、「CAR」ファイルとしてダウンロードできます。このファイルには、画像などのメディア埋め込み、また非公開のデータは含まれていないため、それらは個別に取得する必要があります。" -#: src/screens/Signup/StepInfo/index.tsx:180 +#: src/screens/Signup/StepInfo/index.tsx:181 msgid "Your birth date" msgstr "生年月日" -#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:167 +#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:171 msgid "Your browser does not support the video format. Please try a different browser." msgstr "利用中のブラウザがこのビデオ形式をサポートしていません。他のブラウザをお試しください。" @@ -7705,7 +7767,7 @@ msgstr "ミュートしたワード" msgid "Your password has been changed successfully!" msgstr "パスワードの変更が完了しました！" -#: src/view/com/composer/Composer.tsx:463 +#: src/view/com/composer/Composer.tsx:468 msgid "Your post has been published" msgstr "投稿を公開しました" @@ -7721,7 +7783,7 @@ msgstr "あなたのプロフィール" msgid "Your profile, posts, feeds, and lists will no longer be visible to other Bluesky users. You can reactivate your account at any time by logging in." msgstr "あなたのプロフィール、投稿、フィード、そしてリストは他のBlueskyユーザーに見えなくなります。ログインすることでいつでもアカウントを再有効化できます。" -#: src/view/com/composer/Composer.tsx:462 +#: src/view/com/composer/Composer.tsx:467 msgid "Your reply has been published" msgstr "返信を公開しました" diff --git a/src/locale/locales/pt-BR/messages.po b/src/locale/locales/pt-BR/messages.po index c51e3e82..d49528e9 100644 --- a/src/locale/locales/pt-BR/messages.po +++ b/src/locale/locales/pt-BR/messages.po @@ -139,7 +139,7 @@ msgstr "{0} pessoas já usaram este pacote inicial!" #~ msgid "{0} your feeds" #~ msgstr "{0} seus feeds" -#: src/view/com/util/UserAvatar.tsx:419 +#: src/view/com/util/UserAvatar.tsx:423 msgid "{0}'s avatar" msgstr "Avatar de {0}" @@ -656,7 +656,7 @@ msgstr "Ocorreu um erro ao gerar seu pacote inicial. Quer tentar novamente?" msgid "An error occurred while loading the video. Please try again later." msgstr "Ocorreu um erro ao carregar o vídeo. Tente novamente mais tarde." -#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:171 +#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:174 msgid "An error occurred while loading the video. Please try again." msgstr "Ocorreu um erro ao carregar o vídeo. Tente novamente." @@ -1005,6 +1005,10 @@ msgstr "Bluesky é melhor com amigos!" #~ msgid "Bluesky is public." #~ msgstr "Bluesky é público." +#: src/components/dialogs/nuxs/TenMillion/index.tsx:201 +msgid "Bluesky now has over 10 million users, and I was #{0}!" +msgstr "O Bluesky agora tem mais de 10 milhões de usuários, e eu tinha #{0}!" + #: src/components/StarterPack/ProfileStarterPacks.tsx:282 msgid "Bluesky will choose a set of recommended accounts from people in your network." msgstr "O Bluesky escolherá um conjunto de contas recomendadas dentre as pessoas em sua rede." @@ -1026,6 +1030,10 @@ msgstr "Desfocar imagens e filtrar dos feeds" msgid "Books" msgstr "Livros" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:583 +msgid "Brag a little!" +msgstr "Gabe-se um pouco!" + #: src/components/FeedInterstitials.tsx:346 msgid "Browse more accounts on the Explore page" msgstr "Navegue por mais contas na página Explorar" @@ -1173,6 +1181,10 @@ msgstr "Legendas (.vtt)" msgid "Captions & alt text" msgstr "Legendas e texto alt" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:336 +msgid "Celebrating {0} users" +msgstr "Comemorando {0} usuários" + #: src/view/com/modals/VerifyEmail.tsx:160 msgid "Change" msgstr "Alterar" @@ -1867,7 +1879,7 @@ msgstr "Tema escuro" #~ msgid "Dark Theme" #~ msgstr "Modo Escuro" -#: src/screens/Signup/StepInfo/index.tsx:191 +#: src/screens/Signup/StepInfo/index.tsx:192 msgid "Date of birth" msgstr "Data de nascimento" @@ -2174,6 +2186,10 @@ msgstr "Baixe o Bluesky" msgid "Download CAR file" msgstr "Baixar arquivo CAR" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:591 +msgid "Download image" +msgstr "Baixar imagem" + #: src/view/com/composer/text-input/TextInput.web.tsx:269 msgid "Drop to add images" msgstr "Solte para adicionar imagens" @@ -2239,7 +2255,7 @@ msgctxt "action" msgid "Edit" msgstr "Editar" -#: src/view/com/util/UserAvatar.tsx:328 +#: src/view/com/util/UserAvatar.tsx:332 #: src/view/com/util/UserBanner.tsx:92 msgid "Edit avatar" msgstr "Editar avatar" @@ -3545,6 +3561,10 @@ msgstr "Crie uma conta no Bluesky" msgid "Join the conversation" msgstr "Participe da conversa" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:461 +msgid "Joined {0}" +msgstr "Juntou-se {0}" + #: src/screens/Onboarding/index.tsx:21 #: src/screens/Onboarding/state.ts:89 msgid "Journalism" @@ -4551,6 +4571,10 @@ msgstr "Opa!" msgid "Oh no! Something went wrong." msgstr "Opa! Algo deu errado." +#: src/components/dialogs/nuxs/TenMillion/index.tsx:171 +msgid "Oh no! We weren't able to generate an image for you to share. Rest assured, we're glad you're here 🦋" +msgstr "Ah, não! Não conseguimos gerar uma imagem para você compartilhar. Fique tranquilo, estamos felizes que você esteja aqui 🦋" + #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:339 msgid "OK" msgstr "OK" @@ -4821,7 +4845,7 @@ msgid "Opens the threads preferences" msgstr "Abre as preferências de threads" #: src/view/com/notifications/FeedItem.tsx:551 -#: src/view/com/util/UserAvatar.tsx:420 +#: src/view/com/util/UserAvatar.tsx:424 msgid "Opens this profile" msgstr "Abre este perfil" @@ -5410,7 +5434,7 @@ msgstr "Remover conta" msgid "Remove attachment" msgstr "" -#: src/view/com/util/UserAvatar.tsx:387 +#: src/view/com/util/UserAvatar.tsx:391 msgid "Remove Avatar" msgstr "Remover avatar" @@ -6153,7 +6177,7 @@ msgstr "Selecione quais idiomas você deseja ver nos seus feeds. Se nenhum for s msgid "Select your app language for the default text to display in the app." msgstr "Selecione o idioma do seu aplicativo" -#: src/screens/Signup/StepInfo/index.tsx:192 +#: src/screens/Signup/StepInfo/index.tsx:193 msgid "Select your date of birth" msgstr "Selecione sua data de nascimento" @@ -6321,6 +6345,7 @@ msgstr "Atividade sexual ou nudez erótica." msgid "Sexually Suggestive" msgstr "Sexualmente Sugestivo" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:607 #: src/components/StarterPack/QrCodeDialog.tsx:177 #: src/screens/StarterPack/StarterPackScreen.tsx:411 #: src/screens/StarterPack/StarterPackScreen.tsx:582 @@ -6357,6 +6382,14 @@ msgstr "Compartilhar assim" msgid "Share feed" msgstr "Compartilhar feed" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:590 +msgid "Share image externally" +msgstr "Compartilhar imagem externamente" + +#: src/components/dialogs/nuxs/TenMillion/index.tsx:602 +msgid "Share image in post" +msgstr "Compartilhe a imagem na postagem" + #: src/components/StarterPack/ShareDialog.tsx:124 #: src/components/StarterPack/ShareDialog.tsx:131 #: src/screens/StarterPack/StarterPackScreen.tsx:586 @@ -6668,8 +6701,8 @@ msgstr "Algo deu errado. Por favor, tente novamente." msgid "Something went wrong!" msgstr "Algo deu errado!" -#: src/App.native.tsx:102 -#: src/App.web.tsx:83 +#: src/App.native.tsx:103 +#: src/App.web.tsx:84 msgid "Sorry! Your session expired. Please log in again." msgstr "Opa! Sua sessão expirou. Por favor, entre novamente." @@ -6912,6 +6945,10 @@ msgstr "Conte uma piada!" msgid "Tell us a little more" msgstr "Conte-nos um pouco mais" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:487 +msgid "Ten Million" +msgstr "Dez milhões" + #: src/view/shell/desktop/RightNav.tsx:90 msgid "Terms" msgstr "Termos" @@ -6949,6 +6986,10 @@ msgstr "Campo de entrada de texto" msgid "Thank you. Your report has been sent." msgstr "Obrigado. Sua denúncia foi enviada." +#: src/components/dialogs/nuxs/TenMillion/index.tsx:562 +msgid "Thanks for being one of our first 10 million users." +msgstr "Obrigado por ser um dos nossos primeiros 10 milhões de usuários." + #: src/components/intents/VerifyEmailIntentDialog.tsx:74 msgid "Thanks, you have successfully verified your email address." msgstr "" @@ -7437,6 +7478,10 @@ msgstr "Para enviar vídeos para o Bluesky, você deve primeiro verificar seu e- msgid "To whom would you like to send this report?" msgstr "Para quem você gostaria de enviar esta denúncia?" +#: src/components/dialogs/nuxs/TenMillion/index.tsx:566 +msgid "Together, we're rebuilding the social internet. We're glad you're here." +msgstr "Juntos, estamos reconstruindo a internet social. Estamos felizes que você esteja aqui." + #: src/components/dialogs/MutedWords.tsx:112 #~ msgid "Toggle between muted word options." #~ msgstr "Alternar entre opções de uma palavra silenciada" @@ -7691,20 +7736,20 @@ msgstr "Enviar uma foto" msgid "Upload a text file to:" msgstr "Carregar um arquivo de texto para:" -#: src/view/com/util/UserAvatar.tsx:355 -#: src/view/com/util/UserAvatar.tsx:358 +#: src/view/com/util/UserAvatar.tsx:359 +#: src/view/com/util/UserAvatar.tsx:362 #: src/view/com/util/UserBanner.tsx:123 #: src/view/com/util/UserBanner.tsx:126 msgid "Upload from Camera" msgstr "Tirar uma foto" -#: src/view/com/util/UserAvatar.tsx:372 +#: src/view/com/util/UserAvatar.tsx:376 #: src/view/com/util/UserBanner.tsx:140 msgid "Upload from Files" msgstr "Carregar um arquivo" -#: src/view/com/util/UserAvatar.tsx:366 #: src/view/com/util/UserAvatar.tsx:370 +#: src/view/com/util/UserAvatar.tsx:374 #: src/view/com/util/UserBanner.tsx:134 #: src/view/com/util/UserBanner.tsx:138 msgid "Upload from Library" @@ -7904,7 +7949,7 @@ msgstr "Falha no processamento do vídeo" msgid "Video Games" msgstr "Games" -#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:164 +#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:167 msgid "Video not found." msgstr "Vídeo não encontrado." @@ -8572,11 +8617,11 @@ msgstr "Sua conta ainda não tem idade suficiente para enviar vídeos. Por favor msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately." msgstr "O repositório da sua conta, contendo todos os seus dados públicos, pode ser baixado como um arquivo \"CAR\". Este arquivo não inclui imagens ou dados privados, estes devem ser exportados separadamente." -#: src/screens/Signup/StepInfo/index.tsx:180 +#: src/screens/Signup/StepInfo/index.tsx:181 msgid "Your birth date" msgstr "Sua data de nascimento" -#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:168 +#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:171 msgid "Your browser does not support the video format. Please try a different browser." msgstr "Seu navegador não suporta o formato de vídeo. Por favor, tente um navegador diferente." diff --git a/src/state/queries/nuxs/definitions.ts b/src/state/queries/nuxs/definitions.ts index c5cb1e9d..865967d3 100644 --- a/src/state/queries/nuxs/definitions.ts +++ b/src/state/queries/nuxs/definitions.ts @@ -3,27 +3,16 @@ import zod from 'zod' import {BaseNux} from '#/state/queries/nuxs/types' export enum Nux { - One = 'one', - Two = 'two', + TenMillionDialog = 'TenMillionDialog', } export const nuxNames = new Set(Object.values(Nux)) -export type AppNux = - | BaseNux<{ - id: Nux.One - data: { - likes: number - } - }> - | BaseNux<{ - id: Nux.Two - data: undefined - }> +export type AppNux = BaseNux<{ + id: Nux.TenMillionDialog + data: undefined +}> -export const NuxSchemas = { - [Nux.One]: zod.object({ - likes: zod.number(), - }), - [Nux.Two]: undefined, +export const NuxSchemas: Record | undefined> = { + [Nux.TenMillionDialog]: undefined, } diff --git a/src/state/queries/nuxs/index.ts b/src/state/queries/nuxs/index.ts index 2945e67e..e183bcfa 100644 --- a/src/state/queries/nuxs/index.ts +++ b/src/state/queries/nuxs/index.ts @@ -57,6 +57,7 @@ export function useUpsertNuxMutation() { const agent = useAgent() return useMutation({ + retry: 3, mutationFn: async (nux: AppNux) => { await agent.bskyAppUpsertNux(serializeAppNux(nux)) // triggers a refetch @@ -72,6 +73,7 @@ export function useRemoveNuxsMutation() { const agent = useAgent() return useMutation({ + retry: 3, mutationFn: async (ids: string[]) => { await agent.bskyAppRemoveNuxs(ids) // triggers a refetch diff --git a/src/state/queries/nuxs/types.ts b/src/state/queries/nuxs/types.ts index 5b791847..2331582a 100644 --- a/src/state/queries/nuxs/types.ts +++ b/src/state/queries/nuxs/types.ts @@ -4,6 +4,4 @@ export type Data = Record | undefined export type BaseNux< T extends Pick & {data: Data}, -> = T & { - completed: boolean -} +> = Pick & T diff --git a/src/storage/schema.ts b/src/storage/schema.ts index 6522d75a..bc41fd3e 100644 --- a/src/storage/schema.ts +++ b/src/storage/schema.ts @@ -1,4 +1,6 @@ /** * Device data that's specific to the device and does not vary based account */ -export type Device = {} +export type Device = { + lastNuxDialog: string | undefined +} diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx index 66c9708b..eb46a8bd 100644 --- a/src/view/com/util/UserAvatar.tsx +++ b/src/view/com/util/UserAvatar.tsx @@ -43,6 +43,7 @@ interface BaseUserAvatarProps { interface UserAvatarProps extends BaseUserAvatarProps { moderation?: ModerationUI usePlainRNImage?: boolean + onLoad?: () => void } interface EditableUserAvatarProps extends BaseUserAvatarProps { @@ -174,6 +175,7 @@ let UserAvatar = ({ avatar, moderation, usePlainRNImage = false, + onLoad, }: UserAvatarProps): React.ReactNode => { const pal = usePalette('default') const backgroundColor = pal.colors.backgroundLight @@ -224,6 +226,7 @@ let UserAvatar = ({ uri: hackModifyThumbnailPath(avatar, size < 90), }} blurRadius={moderation?.blur ? BLUR_AMOUNT : 0} + onLoad={onLoad} /> ) : ( )} {alert} diff --git a/src/view/icons/Logomark.tsx b/src/view/icons/Logomark.tsx new file mode 100644 index 00000000..5715a1a4 --- /dev/null +++ b/src/view/icons/Logomark.tsx @@ -0,0 +1,29 @@ +import React from 'react' +import Svg, {Path, PathProps, SvgProps} from 'react-native-svg' + +import {usePalette} from '#/lib/hooks/usePalette' + +const ratio = 54 / 61 + +export function Logomark({ + fill, + ...rest +}: {fill?: PathProps['fill']} & SvgProps) { + const pal = usePalette('default') + // @ts-ignore it's fiiiiine + const size = parseInt(rest.width || 32) + + return ( + + + + ) +} diff --git a/src/view/shell/Composer.web.tsx b/src/view/shell/Composer.web.tsx index 42696139..ee1ed662 100644 --- a/src/view/shell/Composer.web.tsx +++ b/src/view/shell/Composer.web.tsx @@ -63,6 +63,7 @@ export function Composer({}: {winHeight: number}) { mention={state.mention} openEmojiPicker={onOpenPicker} text={state.text} + imageUris={state.imageUris} />