From 6697ff58b30a1f4838fdca3820c725457ec483d4 Mon Sep 17 00:00:00 2001 From: Innei Date: Sat, 5 Oct 2024 21:27:15 +0800 Subject: [PATCH] fix: i18n key and dark mode in wide mode and transition other ux fix Signed-off-by: Innei --- apps/renderer/src/atoms/sidebar.ts | 2 + .../src/modules/entry-content/index.tsx | 19 +++++- .../src/modules/feed-column/auto-updater.tsx | 2 +- .../feeds/[feedId]/[entryId]/index.tsx | 58 +++++++++++++------ apps/renderer/src/pages/(main)/layout.tsx | 49 +++++++++++----- locales/app/en.json | 6 +- locales/app/zh-CN.json | 6 +- locales/app/zh-HK.json | 6 +- locales/app/zh-TW.json | 6 +- locales/external/ar-DZ.json | 6 +- locales/external/ar-IQ.json | 6 +- locales/external/ar-MA.json | 6 +- locales/external/ar-SA.json | 6 +- locales/external/ar-TN.json | 6 +- locales/external/ar-kw.json | 6 +- locales/external/de.json | 6 +- locales/external/en.json | 6 +- locales/external/es.json | 6 +- locales/external/fi.json | 6 +- locales/external/fr.json | 6 +- locales/external/it.json | 6 +- locales/external/ja.json | 6 +- locales/external/ko.json | 6 +- locales/external/pt.json | 6 +- locales/external/ru.json | 6 +- locales/external/tr.json | 6 +- locales/external/zh-CN.json | 6 +- locales/external/zh-HK.json | 6 +- locales/external/zh-TW.json | 6 +- tailwind.config.ts | 3 + 30 files changed, 170 insertions(+), 107 deletions(-) diff --git a/apps/renderer/src/atoms/sidebar.ts b/apps/renderer/src/atoms/sidebar.ts index cc32606cd6..8eb66b845f 100644 --- a/apps/renderer/src/atoms/sidebar.ts +++ b/apps/renderer/src/atoms/sidebar.ts @@ -49,3 +49,5 @@ viewAtom.onMount = () => { } } export const [, , useFeedColumnShow, , , setFeedColumnShow] = createAtomHooks(atom(true)) + +export const [, , useFeedColumnTempShow, , , setFeedColumnTempShow] = createAtomHooks(atom(false)) diff --git a/apps/renderer/src/modules/entry-content/index.tsx b/apps/renderer/src/modules/entry-content/index.tsx index b005c3bdf7..6206f0050e 100644 --- a/apps/renderer/src/modules/entry-content/index.tsx +++ b/apps/renderer/src/modules/entry-content/index.tsx @@ -51,14 +51,19 @@ import { EntryHeader } from "./header" import { EntryContentLoading } from "./loading" import { EntryContentProvider } from "./provider" +export interface EntryContentClassNames { + header?: string +} export const EntryContent = ({ entryId, noMedia, compact, + classNames, }: { entryId: ActiveEntryId noMedia?: boolean compact?: boolean + classNames?: EntryContentClassNames }) => { const title = useFeedHeaderTitle() const { feedId, view } = useRouteParams() @@ -79,14 +84,22 @@ export const EntryContent = ({ ) } - return + return ( + + ) } export const EntryContentRender: Component<{ entryId: string noMedia?: boolean compact?: boolean -}> = ({ entryId, noMedia, className, compact }) => { + classNames?: EntryContentClassNames +}> = ({ entryId, noMedia, className, compact, classNames }) => { const { t } = useTranslation() const entry = useEntry(entryId) @@ -179,7 +192,7 @@ export const EntryContentRender: Component<{ diff --git a/apps/renderer/src/modules/feed-column/auto-updater.tsx b/apps/renderer/src/modules/feed-column/auto-updater.tsx index 25a383a736..c372eb3dd4 100644 --- a/apps/renderer/src/modules/feed-column/auto-updater.tsx +++ b/apps/renderer/src/modules/feed-column/auto-updater.tsx @@ -67,7 +67,7 @@ export const AutoUpdater = () => { } as any } /> -
{t("notify.update_info", { APP_NAME })}
+
{t("notify.update_info", { app_name: APP_NAME })}
{t("notify.update_info_1")}
) diff --git a/apps/renderer/src/pages/(main)/(layer)/feeds/[feedId]/[entryId]/index.tsx b/apps/renderer/src/pages/(main)/(layer)/feeds/[feedId]/[entryId]/index.tsx index ad61cc914d..247c9e564e 100644 --- a/apps/renderer/src/pages/(main)/(layer)/feeds/[feedId]/[entryId]/index.tsx +++ b/apps/renderer/src/pages/(main)/(layer)/feeds/[feedId]/[entryId]/index.tsx @@ -2,6 +2,8 @@ import { AnimatePresence } from "framer-motion" import { useParams } from "react-router-dom" import { useUISettingKey } from "~/atoms/settings/ui" +import { useFeedColumnShow, useFeedColumnTempShow } from "~/atoms/sidebar" +import { m } from "~/components/common/Motion" import { ActionButton } from "~/components/ui/button" import { ROUTE_ENTRY_PENDING, views } from "~/constants" import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry" @@ -19,28 +21,48 @@ export const Component = () => { const realEntryId = entryId === ROUTE_ENTRY_PENDING ? "" : entryId const disable = views[view].wideMode || (settingWideMode && !realEntryId) const wideMode = settingWideMode && realEntryId + const feedColumnTempShow = useFeedColumnTempShow() + const feedColumnShow = useFeedColumnShow() + const shouldHeaderPaddingLeft = feedColumnTempShow && !feedColumnShow return ( - {!disable && ( -
- {wideMode && ( - navigate({ entryId: null })} - > - - - )} - -
- )} + + {!disable && ( + + {wideMode && ( + navigate({ entryId: null })} + > + + + )} + + + )} + ) diff --git a/apps/renderer/src/pages/(main)/layout.tsx b/apps/renderer/src/pages/(main)/layout.tsx index 78535b2e70..c67d58fa74 100644 --- a/apps/renderer/src/pages/(main)/layout.tsx +++ b/apps/renderer/src/pages/(main)/layout.tsx @@ -2,7 +2,7 @@ import { repository } from "@pkg" import { Slot } from "@radix-ui/react-slot" import { throttle } from "lodash-es" import type { PropsWithChildren } from "react" -import React, { useEffect, useRef, useState } from "react" +import React, { forwardRef, useEffect, useRef, useState } from "react" import { useHotkeys } from "react-hotkeys-hook" import { Trans, useTranslation } from "react-i18next" import { useResizable } from "react-resizable-layout" @@ -10,8 +10,13 @@ import { Outlet } from "react-router-dom" import { setMainContainerElement } from "~/atoms/dom" import { useViewport } from "~/atoms/hooks/viewport" -import { getUISettings, setUISetting } from "~/atoms/settings/ui" -import { setFeedColumnShow, useFeedColumnShow } from "~/atoms/sidebar" +import { getUISettings, setUISetting, useUISettingKey } from "~/atoms/settings/ui" +import { + setFeedColumnShow, + setFeedColumnTempShow, + useFeedColumnShow, + useFeedColumnTempShow, +} from "~/atoms/sidebar" import { useLoginModalShow, useWhoami } from "~/atoms/user" import { AppErrorBoundary } from "~/components/common/AppErrorBoundary" import { ErrorComponentType } from "~/components/errors/enum" @@ -88,7 +93,7 @@ export function Component() { return (
-
{t("notify.unSupportWidth", { APP_NAME })}
+
{t("notify.unSupportWidth", { app_name: APP_NAME })}
), }} - values={{ APP_NAME }} + values={{ app_name: APP_NAME }} />
@@ -119,11 +124,7 @@ export function Component() { } return ( -
+ {!import.meta.env.PROD && } @@ -168,10 +169,28 @@ export function Component() { )} -
+ ) } +const RootContainer = forwardRef(({ children }, ref) => { + const feedColWidth = useUISettingKey("feedColWidth") + return ( +
+ {children} +
+ ) +}) + const FeedResponsiveResizerContainer = ({ containerRef, children, @@ -191,11 +210,15 @@ const FeedResponsiveResizerContainer = ({ }) const feedColumnShow = useFeedColumnShow() - const [feedColumnTempShow, setFeedColumnTempShow] = useState(false) + const feedColumnTempShow = useFeedColumnTempShow() + const isInEntryContentWideMode = useUISettingKey("wideMode") useEffect(() => { const handler = throttle((e: MouseEvent) => { const mouseX = e.clientX + const mouseY = e.clientY + + if (mouseY < 100 && isInEntryContentWideMode) return const threshold = feedColumnTempShow ? getUISettings().feedColWidth : 100 if (mouseX < threshold) { @@ -209,7 +232,7 @@ const FeedResponsiveResizerContainer = ({ return () => { document.removeEventListener("mousemove", handler) } - }, [feedColumnTempShow]) + }, [feedColumnTempShow, isInEntryContentWideMode]) useHotkeys( shortcuts.layout.toggleSidebar.key, diff --git a/locales/app/en.json b/locales/app/en.json index 3540276dcc..dd5f50e87f 100644 --- a/locales/app/en.json +++ b/locales/app/en.json @@ -159,11 +159,11 @@ "mark_all_read_button.mark_as_read": "Mark {{which}} as read", "mark_all_read_button.undo": "Undo", "notify.unSupportDisplay": "Some websites can't be displayed here. Download desktop app to view it.", - "notify.unSupportWidth": "{{APP_NAME}} is not yet supported on mobile devices", + "notify.unSupportWidth": "{{app_name}} is not yet supported on mobile devices", "notify.unSupportWidth_1": "Your device width is {{width}}, which is less than the minimum supported width {{minWidth}}.", - "notify.unSupportWidth_2": "Please switch to the desktop app to continue using {{APP_NAME}}
Download: ", + "notify.unSupportWidth_2": "Please switch to the desktop app to continue using {{app_name}}
Download: ", "notify.unfollow_feed": " have been unfollowed.", - "notify.update_info": "{{APP_NAME}} is ready to update!", + "notify.update_info": "{{app_name}} is ready to update!", "notify.update_info_1": "Click to restart", "player.back_10s": "Back 10s", "player.close": "Close", diff --git a/locales/app/zh-CN.json b/locales/app/zh-CN.json index cee1b80dac..7578c0daaa 100644 --- a/locales/app/zh-CN.json +++ b/locales/app/zh-CN.json @@ -159,11 +159,11 @@ "mark_all_read_button.mark_as_read": "标记{{which}}为已读", "mark_all_read_button.undo": "撤销", "notify.unSupportDisplay": "某些网站无法在此显示，请下载桌面应用查看", - "notify.unSupportWidth": "{{APP_NAME}} 目前尚不支持移动设备", + "notify.unSupportWidth": "{{app_name}} 目前尚不支持移动设备", "notify.unSupportWidth_1": "您的设备宽度为 {{width}}，低于支持的最小宽度 {{minWidth}}", - "notify.unSupportWidth_2": "请切换到桌面应用继续使用 {{APP_NAME}}
下载链接：", + "notify.unSupportWidth_2": "请切换到桌面应用继续使用 {{app_name}}
下载链接：", "notify.unfollow_feed": "已取消订阅 ", - "notify.update_info": "{{APP_NAME}} 已准备好更新！", + "notify.update_info": "{{app_name}} 已准备好更新！", "notify.update_info_1": "点击重新启动", "player.back_10s": "后退 10s", "player.close": "关闭", diff --git a/locales/app/zh-HK.json b/locales/app/zh-HK.json index ee9f4b6922..6c04972657 100644 --- a/locales/app/zh-HK.json +++ b/locales/app/zh-HK.json @@ -159,11 +159,11 @@ "mark_all_read_button.mark_as_read": "標記 {{which}} 為已讀", "mark_all_read_button.undo": "撤銷", "notify.unSupportDisplay": "某些網站無法顯示，請下載桌面應用程式檢視", - "notify.unSupportWidth": "{{APP_NAME}} 目前尚未支援流動裝置", + "notify.unSupportWidth": "{{app_name}} 目前尚未支援流動裝置", "notify.unSupportWidth_1": "您的裝置寬度為 {{width}}，低於支援的最小寬度 {{minWidth}}", - "notify.unSupportWidth_2": "請切換至桌面應用程式繼續使用 {{APP_NAME}}
下載連結：", + "notify.unSupportWidth_2": "請切換至桌面應用程式繼續使用 {{app_name}}
下載連結：", "notify.unfollow_feed": "已取消關注 。", - "notify.update_info": "{{APP_NAME}} 已準備好更新！", + "notify.update_info": "{{app_name}} 已準備好更新！", "notify.update_info_1": "點擊以重新啟動", "player.back_10s": "倒退 10 秒", "player.close": "關閉", diff --git a/locales/app/zh-TW.json b/locales/app/zh-TW.json index b563742654..0be29628be 100644 --- a/locales/app/zh-TW.json +++ b/locales/app/zh-TW.json @@ -159,11 +159,11 @@ "mark_all_read_button.mark_as_read": "將 {{which}} 標記為已讀", "mark_all_read_button.undo": "復原", "notify.unSupportDisplay": "某些網站無法顯示，請下載桌面應用程式以查看", - "notify.unSupportWidth": "{{APP_NAME}} 目前尚未支援行動裝置", + "notify.unSupportWidth": "{{app_name}} 目前尚未支援行動裝置", "notify.unSupportWidth_1": "您的裝置寬度為 {{width}}，小於支援的最小寬度 {{minWidth}}", - "notify.unSupportWidth_2": "請切換到桌面應用程式以繼續使用 {{APP_NAME}}
下載連結：", + "notify.unSupportWidth_2": "請切換到桌面應用程式以繼續使用 {{app_name}}
下載連結：", "notify.unfollow_feed": "已取消關注 ", - "notify.update_info": "{{APP_NAME}} 已準備好更新！", + "notify.update_info": "{{app_name}} 已準備好更新！", "notify.update_info_1": "點擊重新啟動", "player.back_10s": "後退 10 秒", "player.close": "關閉", diff --git a/locales/external/ar-DZ.json b/locales/external/ar-DZ.json index 18a102b590..4c791fa6c7 100644 --- a/locales/external/ar-DZ.json +++ b/locales/external/ar-DZ.json @@ -22,7 +22,7 @@ "login.redirecting": "إعادة التوجيه", "login.welcomeTo": "مرحبًا بك في", "redirect.continueInBrowser": "المتابعة في المتصفح", - "redirect.instruction": "الآن هو الوقت المناسب لفتح {{APP_NAME}} وإغلاق هذه الصفحة بأمان.", - "redirect.openApp": "افتح {{APP_NAME}}", - "redirect.successMessage": "تم الاتصال بنجاح بحساب {{APP_NAME}}." + "redirect.instruction": "الآن هو الوقت المناسب لفتح {{app_name}} وإغلاق هذه الصفحة بأمان.", + "redirect.openApp": "افتح {{app_name}}", + "redirect.successMessage": "تم الاتصال بنجاح بحساب {{app_name}}." } diff --git a/locales/external/ar-IQ.json b/locales/external/ar-IQ.json index 18a102b590..4c791fa6c7 100644 --- a/locales/external/ar-IQ.json +++ b/locales/external/ar-IQ.json @@ -22,7 +22,7 @@ "login.redirecting": "إعادة التوجيه", "login.welcomeTo": "مرحبًا بك في", "redirect.continueInBrowser": "المتابعة في المتصفح", - "redirect.instruction": "الآن هو الوقت المناسب لفتح {{APP_NAME}} وإغلاق هذه الصفحة بأمان.", - "redirect.openApp": "افتح {{APP_NAME}}", - "redirect.successMessage": "تم الاتصال بنجاح بحساب {{APP_NAME}}." + "redirect.instruction": "الآن هو الوقت المناسب لفتح {{app_name}} وإغلاق هذه الصفحة بأمان.", + "redirect.openApp": "افتح {{app_name}}", + "redirect.successMessage": "تم الاتصال بنجاح بحساب {{app_name}}." } diff --git a/locales/external/ar-MA.json b/locales/external/ar-MA.json index 449de97690..91c84092d5 100644 --- a/locales/external/ar-MA.json +++ b/locales/external/ar-MA.json @@ -22,7 +22,7 @@ "login.redirecting": "إعادة التوجيه", "login.welcomeTo": "مرحبًا بك في ", "redirect.continueInBrowser": "المتابعة في المتصفح", - "redirect.instruction": "حان الوقت الآن لفتح {{APP_NAME}} وإغلاق هذه الصفحة بأمان.", - "redirect.openApp": "افتح {{APP_NAME}}", - "redirect.successMessage": "لقد تم الاتصال بنجاح بحسابك على {{APP_NAME}}." + "redirect.instruction": "حان الوقت الآن لفتح {{app_name}} وإغلاق هذه الصفحة بأمان.", + "redirect.openApp": "افتح {{app_name}}", + "redirect.successMessage": "لقد تم الاتصال بنجاح بحسابك على {{app_name}}." } diff --git a/locales/external/ar-SA.json b/locales/external/ar-SA.json index ee03a1bf76..70da60eecd 100644 --- a/locales/external/ar-SA.json +++ b/locales/external/ar-SA.json @@ -22,7 +22,7 @@ "login.redirecting": "إعادة التوجيه", "login.welcomeTo": "مرحبًا بك في", "redirect.continueInBrowser": "المتابعة في المتصفح", - "redirect.instruction": "الآن حان الوقت لفتح {{APP_NAME}} وإغلاق هذه الصفحة بأمان.", - "redirect.openApp": "فتح {{APP_NAME}}", - "redirect.successMessage": "تم الاتصال بحساب {{APP_NAME}} بنجاح." + "redirect.instruction": "الآن حان الوقت لفتح {{app_name}} وإغلاق هذه الصفحة بأمان.", + "redirect.openApp": "فتح {{app_name}}", + "redirect.successMessage": "تم الاتصال بحساب {{app_name}} بنجاح." } diff --git a/locales/external/ar-TN.json b/locales/external/ar-TN.json index dd04662acc..676265115b 100644 --- a/locales/external/ar-TN.json +++ b/locales/external/ar-TN.json @@ -25,7 +25,7 @@ "login.redirecting": "جاري إعادة التوجيه", "login.welcomeTo": "مرحباً بك في ", "redirect.continueInBrowser": "المتابعة في المتصفح", - "redirect.instruction": "الآن هو الوقت المناسب لفتح {{APP_NAME}} وإغلاق هذه الصفحة بأمان.", - "redirect.openApp": "افتح {{APP_NAME}}", - "redirect.successMessage": "تم الاتصال بحساب {{APP_NAME}} بنجاح." + "redirect.instruction": "الآن هو الوقت المناسب لفتح {{app_name}} وإغلاق هذه الصفحة بأمان.", + "redirect.openApp": "افتح {{app_name}}", + "redirect.successMessage": "تم الاتصال بحساب {{app_name}} بنجاح." } diff --git a/locales/external/ar-kw.json b/locales/external/ar-kw.json index 612578237d..03fab12989 100644 --- a/locales/external/ar-kw.json +++ b/locales/external/ar-kw.json @@ -25,7 +25,7 @@ "login.redirecting": "إعادة التوجيه", "login.welcomeTo": "مرحبًا بك في", "redirect.continueInBrowser": "المتابعة في المتصفح", - "redirect.instruction": "الآن هو الوقت المناسب لفتح {{APP_NAME}} وإغلاق هذه الصفحة بأمان.", - "redirect.openApp": "افتح {{APP_NAME}}", - "redirect.successMessage": "تم الاتصال بنجاح بحساب {{APP_NAME}}." + "redirect.instruction": "الآن هو الوقت المناسب لفتح {{app_name}} وإغلاق هذه الصفحة بأمان.", + "redirect.openApp": "افتح {{app_name}}", + "redirect.successMessage": "تم الاتصال بنجاح بحساب {{app_name}}." } diff --git a/locales/external/de.json b/locales/external/de.json index ac3a56175b..bf6348233c 100644 --- a/locales/external/de.json +++ b/locales/external/de.json @@ -22,7 +22,7 @@ "login.redirecting": "Redirecting", "login.welcomeTo": "Welcome to ", "redirect.continueInBrowser": "Continue in browser", - "redirect.instruction": "It is time to open {{APP_NAME}} and safely close this page.", - "redirect.openApp": "Open {{APP_NAME}}", - "redirect.successMessage": "You have successfully connected to {{APP_NAME}} account." + "redirect.instruction": "It is time to open {{app_name}} and safely close this page.", + "redirect.openApp": "Open {{app_name}}", + "redirect.successMessage": "You have successfully connected to {{app_name}} account." } diff --git a/locales/external/en.json b/locales/external/en.json index 6640b46383..b0a4619fdc 100644 --- a/locales/external/en.json +++ b/locales/external/en.json @@ -33,7 +33,7 @@ "login.signOut": "Sign out", "login.welcomeTo": "Welcome to ", "redirect.continueInBrowser": "Continue in Browser", - "redirect.instruction": "Now is the time to open {{APP_NAME}} and safely close this page.", - "redirect.openApp": "Open {{APP_NAME}}", - "redirect.successMessage": "You have successfully connected to {{APP_NAME}} Account." + "redirect.instruction": "Now is the time to open {{app_name}} and safely close this page.", + "redirect.openApp": "Open {{app_name}}", + "redirect.successMessage": "You have successfully connected to {{app_name}} Account." } diff --git a/locales/external/es.json b/locales/external/es.json index 344256c3f0..24a6199265 100644 --- a/locales/external/es.json +++ b/locales/external/es.json @@ -22,7 +22,7 @@ "login.redirecting": "Redirigiendo", "login.welcomeTo": "Bienvenido a ", "redirect.continueInBrowser": "Continuar en el navegador", - "redirect.instruction": "Es hora de abrir {{APP_NAME}} y cerrar esta página de forma segura.", - "redirect.openApp": "Abrir {{APP_NAME}}", - "redirect.successMessage": "Te has conectado exitosamente a la cuenta de {{APP_NAME}}." + "redirect.instruction": "Es hora de abrir {{app_name}} y cerrar esta página de forma segura.", + "redirect.openApp": "Abrir {{app_name}}", + "redirect.successMessage": "Te has conectado exitosamente a la cuenta de {{app_name}}." } diff --git a/locales/external/fi.json b/locales/external/fi.json index 25844d1067..7f42f26369 100644 --- a/locales/external/fi.json +++ b/locales/external/fi.json @@ -22,7 +22,7 @@ "login.redirecting": "Uudelleenohjataan", "login.welcomeTo": "Tervetuloa ", "redirect.continueInBrowser": "Jatka selaimessa", - "redirect.instruction": "Nyt on aika avata {{APP_NAME}} ja sulkea tämä sivu turvallisesti.", - "redirect.openApp": "Avaa {{APP_NAME}}", - "redirect.successMessage": "Olet onnistuneesti yhdistänyt {{APP_NAME}}-tilisi." + "redirect.instruction": "Nyt on aika avata {{app_name}} ja sulkea tämä sivu turvallisesti.", + "redirect.openApp": "Avaa {{app_name}}", + "redirect.successMessage": "Olet onnistuneesti yhdistänyt {{app_name}}-tilisi." } diff --git a/locales/external/fr.json b/locales/external/fr.json index 0cca5d9b87..6581c06e45 100644 --- a/locales/external/fr.json +++ b/locales/external/fr.json @@ -24,7 +24,7 @@ "login.redirecting": "Redirection", "login.welcomeTo": "Bienvenue sur", "redirect.continueInBrowser": "Continuer dans le navigateur", - "redirect.instruction": "Il est maintenant temps d'ouvrir {{APP_NAME}} et de fermer cette page en toute sécurité.", - "redirect.openApp": "Ouvrir {{APP_NAME}}", - "redirect.successMessage": "Vous vous êtes connecté avec succès à votre compte {{APP_NAME}}." + "redirect.instruction": "Il est maintenant temps d'ouvrir {{app_name}} et de fermer cette page en toute sécurité.", + "redirect.openApp": "Ouvrir {{app_name}}", + "redirect.successMessage": "Vous vous êtes connecté avec succès à votre compte {{app_name}}." } diff --git a/locales/external/it.json b/locales/external/it.json index d720e6133e..806f878085 100644 --- a/locales/external/it.json +++ b/locales/external/it.json @@ -22,7 +22,7 @@ "login.redirecting": "Reindirizzamento in corso", "login.welcomeTo": "Benvenuto su", "redirect.continueInBrowser": "Continua nel Browser", - "redirect.instruction": "Ora è il momento di aprire {{APP_NAME}} e chiudere in sicurezza questa pagina.", - "redirect.openApp": "Apri {{APP_NAME}}", - "redirect.successMessage": "Ti sei connesso con successo all'account {{APP_NAME}}." + "redirect.instruction": "Ora è il momento di aprire {{app_name}} e chiudere in sicurezza questa pagina.", + "redirect.openApp": "Apri {{app_name}}", + "redirect.successMessage": "Ti sei connesso con successo all'account {{app_name}}." } diff --git a/locales/external/ja.json b/locales/external/ja.json index 839639fca0..45a321e1b1 100644 --- a/locales/external/ja.json +++ b/locales/external/ja.json @@ -24,7 +24,7 @@ "login.redirecting": "リダイレクト中", "login.welcomeTo": "ようこそ ", "redirect.continueInBrowser": "ブラウザで続行", - "redirect.instruction": "今が{{APP_NAME}}を開き、このページを安全に閉じる時です。", - "redirect.openApp": "{{APP_NAME}}を開く", - "redirect.successMessage": "{{APP_NAME}}アカウントに正常に接続されました。" + "redirect.instruction": "今が{{app_name}}を開き、このページを安全に閉じる時です。", + "redirect.openApp": "{{app_name}}を開く", + "redirect.successMessage": "{{app_name}}アカウントに正常に接続されました。" } diff --git a/locales/external/ko.json b/locales/external/ko.json index fd499fa630..b930ed7a88 100644 --- a/locales/external/ko.json +++ b/locales/external/ko.json @@ -29,7 +29,7 @@ "login.signOut": "로그아웃", "login.welcomeTo": "환영합니다", "redirect.continueInBrowser": "브라우저에서 계속", - "redirect.instruction": "{{APP_NAME}}을 (를) 열고 이 페이지를 안전하게 닫을 시간입니다.", - "redirect.openApp": "{{APP_NAME}} 열기", - "redirect.successMessage": "{{APP_NAME}} 계정에 성공적으로 연결되었습니다." + "redirect.instruction": "{{app_name}}을 (를) 열고 이 페이지를 안전하게 닫을 시간입니다.", + "redirect.openApp": "{{app_name}} 열기", + "redirect.successMessage": "{{app_name}} 계정에 성공적으로 연결되었습니다." } diff --git a/locales/external/pt.json b/locales/external/pt.json index 7f600bb936..15ade82c55 100644 --- a/locales/external/pt.json +++ b/locales/external/pt.json @@ -24,7 +24,7 @@ "login.redirecting": "A redirecionar", "login.welcomeTo": "Bem-vindo ao ", "redirect.continueInBrowser": "Continuar no Navegador", - "redirect.instruction": "Agora é o momento de abrir {{APP_NAME}} e fechar esta página com segurança.", - "redirect.openApp": "Abrir {{APP_NAME}}", - "redirect.successMessage": "Conectou-se com sucesso à conta {{APP_NAME}}." + "redirect.instruction": "Agora é o momento de abrir {{app_name}} e fechar esta página com segurança.", + "redirect.openApp": "Abrir {{app_name}}", + "redirect.successMessage": "Conectou-se com sucesso à conta {{app_name}}." } diff --git a/locales/external/ru.json b/locales/external/ru.json index 803f551dab..b5070efbe1 100644 --- a/locales/external/ru.json +++ b/locales/external/ru.json @@ -22,7 +22,7 @@ "login.redirecting": "Перенаправление", "login.welcomeTo": "Добро пожаловать в ", "redirect.continueInBrowser": "Продолжить в браузере", - "redirect.instruction": "Сейчас самое время открыть {{APP_NAME}} и безопасно закрыть эту страницу.", - "redirect.openApp": "Открыть {{APP_NAME}}", - "redirect.successMessage": "Вы успешно подключились к аккаунту {{APP_NAME}}." + "redirect.instruction": "Сейчас самое время открыть {{app_name}} и безопасно закрыть эту страницу.", + "redirect.openApp": "Открыть {{app_name}}", + "redirect.successMessage": "Вы успешно подключились к аккаунту {{app_name}}." } diff --git a/locales/external/tr.json b/locales/external/tr.json index e6c9ee379f..bd0d673c4f 100644 --- a/locales/external/tr.json +++ b/locales/external/tr.json @@ -29,7 +29,7 @@ "login.signOut": "Çıkış yap", "login.welcomeTo": "Hoş geldiniz ", "redirect.continueInBrowser": "Tarayıcıda Devam Et", - "redirect.instruction": "Şimdi {{APP_NAME}} uygulamasını açma ve bu sayfayı güvenle kapatma zamanı.", - "redirect.openApp": "{{APP_NAME}} Uygulamasını Aç", - "redirect.successMessage": "{{APP_NAME}} Hesabına başarıyla bağlandınız." + "redirect.instruction": "Şimdi {{app_name}} uygulamasını açma ve bu sayfayı güvenle kapatma zamanı.", + "redirect.openApp": "{{app_name}} Uygulamasını Aç", + "redirect.successMessage": "{{app_name}} Hesabına başarıyla bağlandınız." } diff --git a/locales/external/zh-CN.json b/locales/external/zh-CN.json index 5d044e1a23..567d90f1f6 100644 --- a/locales/external/zh-CN.json +++ b/locales/external/zh-CN.json @@ -33,7 +33,7 @@ "login.signOut": "登出", "login.welcomeTo": "欢迎来到 ", "redirect.continueInBrowser": "在浏览器中继续", - "redirect.instruction": "现在可以打开 {{APP_NAME}} 并关闭此页面", - "redirect.openApp": "打开 {{APP_NAME}}", - "redirect.successMessage": "已成功连接到 {{APP_NAME}} 账户。" + "redirect.instruction": "现在可以打开 {{app_name}} 并关闭此页面", + "redirect.openApp": "打开 {{app_name}}", + "redirect.successMessage": "已成功连接到 {{app_name}} 账户。" } diff --git a/locales/external/zh-HK.json b/locales/external/zh-HK.json index ecfe130a51..23a9f22a63 100644 --- a/locales/external/zh-HK.json +++ b/locales/external/zh-HK.json @@ -33,7 +33,7 @@ "login.signOut": "登出", "login.welcomeTo": "歡迎來到", "redirect.continueInBrowser": "在瀏覽器中繼續", - "redirect.instruction": "現在是時候打開 {{APP_NAME}} 並安全地關閉此頁面。", - "redirect.openApp": "打開 {{APP_NAME}}", - "redirect.successMessage": "你已成功連接到 {{APP_NAME}} 帳戶。" + "redirect.instruction": "現在是時候打開 {{app_name}} 並安全地關閉此頁面。", + "redirect.openApp": "打開 {{app_name}}", + "redirect.successMessage": "你已成功連接到 {{app_name}} 帳戶。" } diff --git a/locales/external/zh-TW.json b/locales/external/zh-TW.json index 98c133399f..9af38f4868 100644 --- a/locales/external/zh-TW.json +++ b/locales/external/zh-TW.json @@ -33,7 +33,7 @@ "login.signOut": "登出", "login.welcomeTo": "歡迎來到 ", "redirect.continueInBrowser": "在瀏覽器中繼續", - "redirect.instruction": "現在是時候打開 {{APP_NAME}} 並安全地關閉此頁面。", - "redirect.openApp": "開啟 {{APP_NAME}}", - "redirect.successMessage": "您已成功連接至 {{APP_NAME}} 帳戶。" + "redirect.instruction": "現在是時候打開 {{app_name}} 並安全地關閉此頁面。", + "redirect.openApp": "開啟 {{app_name}}", + "redirect.successMessage": "您已成功連接至 {{app_name}} 帳戶。" } diff --git a/tailwind.config.ts b/tailwind.config.ts index 80a25a4f60..1e4f5f6694 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -46,6 +46,9 @@ export default resolveConfig({ switch: "var(--cursor-switch)", card: "var(--cursor-card)", }, + width: { + "feed-col": "var(--fo-feed-col-w)", + }, colors: { border: "hsl(var(--border) / )", background: "hsl(var(--background) / )",