RSSNext
diff --git a/‎apps/desktop/src/renderer/src/lib/translate.ts
Copy file name to clipboard
+20-8Lines changed: 20 additions & 8 deletions b/‎apps/desktop/src/renderer/src/lib/translate.ts
Copy file name to clipboard
+20-8Lines changed: 20 additions & 8 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions b/‎apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/entry-column/translation.tsx
Copy file name to clipboard
+19-1Lines changed: 19 additions & 1 deletion b/‎apps/desktop/src/renderer/src/modules/entry-column/translation.tsx
Copy file name to clipboard
+19-1Lines changed: 19 additions & 1 deletion
diff --git a/‎apps/desktop/src/renderer/src/modules/entry-content/components/EntryTitle.tsx
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎apps/desktop/src/renderer/src/modules/entry-content/components/EntryTitle.tsx
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/settings/tabs/general.tsx
Copy file name to clipboard
+39-7Lines changed: 39 additions & 7 deletions b/‎apps/desktop/src/renderer/src/modules/settings/tabs/general.tsx
Copy file name to clipboard
+39-7Lines changed: 39 additions & 7 deletions
diff --git a/‎apps/mobile/drizzle/0021_wakeful_onslaught.sql
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions b/‎apps/mobile/drizzle/0021_wakeful_onslaught.sql
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
@@ -2,17 +2,14 @@ import { parseHtml } from "@follow/components/ui/markdown/parse-html.js"
 import { views } from "@follow/constants"
 import type { SupportedActionLanguage } from "@follow/shared"
 import { ACTION_LANGUAGE_MAP } from "@follow/shared"
+import { duplicateIfLengthLessThan } from "@follow/utils/utils"
 import { franc } from "franc-min"
 
 import { getReadabilityContent } from "~/atoms/readability"
 import type { FlatEntryModel } from "~/store/entry"
 
 import { apiClient } from "./api-fetch"
 
-function duplicateIfLengthLessThan(text: string, length: number) {
-  return text.length < length ? text.repeat(Math.ceil(length / text.length)) : text
-}
-
 export const checkLanguage = ({
   content,
   language,
@@ -57,12 +54,12 @@ export async function translate({
     fields = [...fields, ...extraFields]
   }
 
+  const readabilityContent = getReadabilityContent()[entry.entries.id]?.content
   fields = fields.filter((field) => {
     if (language && field === "readabilityContent") {
-      const content = getReadabilityContent()[entry.entries.id]?.content
-      if (!content) return false
+      if (!readabilityContent) return false
       const isLanguageMatch = checkLanguage({
-        content,
+        content: readabilityContent,
         language,
       })
       return !isLanguageMatch
@@ -91,5 +88,20 @@ export async function translate({
       part,
     },
   })
-  return res.data
+
+  const data: {
+    description?: string
+    title?: string
+    content?: string
+    readabilityContent?: string
+  } = {}
+
+  fields.forEach((field) => {
+    const content = field === "readabilityContent" ? readabilityContent : entry.entries[field]
+    if (content !== res.data?.[field]) {
+      data[field] = res.data?.[field]
+    }
+  })
+
+  return data
 }
@@ -4,6 +4,7 @@ import { clsx, cn, formatEstimatedMins, formatTimeToSeconds, isSafari } from "@f
 import { useMemo } from "react"
 
 import { AudioPlayer, useAudioPlayerAtomSelector } from "~/atoms/player"
+import { useGeneralSettingKey } from "~/atoms/settings/general"
 import { useRealInWideMode, useUISettingKey } from "~/atoms/settings/ui"
 import { RelativeTime } from "~/components/ui/datetime"
 import { Media } from "~/components/ui/media"
@@ -54,15 +55,16 @@ export function ListItem({
   const thumbnailRatio = useUISettingKey("thumbnailRatio")
   const rid = `list-item-${entryId}`
 
+  const bilingual = useGeneralSettingKey("translationMode") === "bilingual"
   const lineClamp = useMemo(() => {
     const envIsSafari = isSafari()
     let lineClampTitle = settingWideMode ? 1 : 2
     let lineClampDescription = settingWideMode ? 1 : 2
 
-    if (translation?.title && !simple) {
+    if (translation?.title && !simple && bilingual) {
       lineClampTitle += 1
     }
-    if (translation?.description && !simple) {
+    if (translation?.description && !simple && bilingual) {
       lineClampDescription += 1
     }
 
@@ -77,7 +79,7 @@ export function ListItem({
       title: envIsSafari ? `line-clamp-[${lineClampTitle}]` : "",
       description: envIsSafari ? `line-clamp-[${lineClampDescription}]` : "",
     }
-  }, [settingWideMode, simple, translation?.description, translation?.title])
+  }, [settingWideMode, simple, translation?.description, translation?.title, bilingual])
 
   const audioAttachment = useMemo(() => {
     return entry?.entries?.attachments?.find((a) => a.mime_type?.startsWith("audio") && a.url)
 
@@ -1,14 +1,18 @@
 import { cn } from "@follow/utils/utils"
 import { useMemo } from "react"
 
+import { useGeneralSettingKey } from "~/atoms/settings/general"
 import { HTML } from "~/components/ui/markdown/HTML"
 
 export const EntryTranslation: Component<{
   source?: string | null
   target?: string
   isHTML?: boolean
   inline?: boolean
-}> = ({ source, target, className, isHTML, inline = true }) => {
+  bilingual?: boolean
+}> = ({ source, target, className, isHTML, inline = true, bilingual }) => {
+  const bilingualFinal = useGeneralSettingKey("translationMode") === "bilingual" || bilingual
+
   const nextTarget = useMemo(() => {
     if (!target || source === target) {
       return ""
@@ -20,6 +24,20 @@ export const EntryTranslation: Component<{
     return null
   }
 
+  if (!bilingualFinal) {
+    return (
+      <div>
+        {isHTML ? (
+          <HTML as="div" className={cn("prose dark:prose-invert", className)} noMedia>
+            {nextTarget || source}
+          </HTML>
+        ) : (
+          <div className={className}>{nextTarget || source}</div>
+        )}
+      </div>
+    )
+  }
+
   const SourceTag = inline ? "span" : "p"
 
   return (
 
@@ -78,6 +78,7 @@ export const EntryTitle = ({ entryId, compact }: EntryLinkProps) => {
               target={translation.data?.title}
               className="text-text inline-block select-text hyphens-auto duration-200"
               inline={false}
+              bilingual
             />
           </a>
         </div>
 
@@ -7,7 +7,7 @@ import { IN_ELECTRON } from "@follow/shared/constants"
 import { cn } from "@follow/utils/utils"
 import { useQuery } from "@tanstack/react-query"
 import { useAtom } from "jotai"
-import { useCallback, useEffect } from "react"
+import { useEffect } from "react"
 import { useTranslation } from "react-i18next"
 import { useLocation, useRevalidator } from "react-router"
 
@@ -40,6 +40,12 @@ const { defineSettingItem: _defineSettingItem, SettingBuilder } = createSetting(
   useGeneralSettingValue,
   setGeneralSetting,
 )
+
+const saveLoginSetting = (checked: boolean) => {
+  tipcClient?.setLoginItemSettings(checked)
+  setGeneralSetting("appLaunchOnStartup", checked)
+}
+
 export const SettingGeneral = () => {
   const { t } = useTranslation("settings")
   useEffect(() => {
@@ -48,12 +54,6 @@ export const SettingGeneral = () => {
     })
   }, [])
 
-  const saveLoginSetting = useCallback((checked: boolean) => {
-    tipcClient?.setLoginItemSettings(checked)
-
-    setGeneralSetting("appLaunchOnStartup", checked)
-  }, [])
-
   const defineSettingItem = useWrapEnhancedSettingItem(
     _defineSettingItem,
     WrapEnhancedSettingTab.General,
@@ -99,6 +99,7 @@ export const SettingGeneral = () => {
             label: t("general.action.translation"),
             disabled: isTrialUser,
           }),
+          TranslationModeSelector,
           ActionLanguageSelector,
 
           {
@@ -280,6 +281,37 @@ export const LanguageSelector = ({
   )
 }
 
+const TranslationModeSelector = () => {
+  const { t } = useTranslation("settings")
+  const translationMode = useGeneralSettingKey("translationMode")
+  const role = useUserRole()
+  if (role === UserRole.Trial) {
+    return null
+  }
+
+  return (
+    <SettingItemGroup>
+      <div className="flex items-center justify-between">
+        <span className="shrink-0 text-sm font-medium">{t("general.translation_mode.label")}</span>
+        <ResponsiveSelect
+          size="sm"
+          triggerClassName="w-48"
+          defaultValue={translationMode}
+          value={translationMode}
+          onValueChange={(value) => {
+            setGeneralSetting("translationMode", value as "bilingual" | "translation-only")
+          }}
+          items={[
+            { label: t("general.translation_mode.bilingual"), value: "bilingual" },
+            { label: t("general.translation_mode.translation-only"), value: "translation-only" },
+          ]}
+        />
+      </div>
+      <SettingDescription>{t("general.translation_mode.description")}</SettingDescription>
+    </SettingItemGroup>
+  )
+}
+
 const ActionLanguageSelector = () => {
   const { t } = useTranslation("settings")
   const actionLanguage = useGeneralSettingKey("actionLanguage")
 
@@ -0,0 +1,16 @@
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_translations` (
+	`entry_id` text PRIMARY KEY NOT NULL,
+	`language` text NOT NULL,
+	`title` text,
+	`description` text,
+	`content` text,
+	`readability_content` text,
+	`created_at` text NOT NULL
+);
+--> statement-breakpoint
+INSERT INTO `__new_translations`("entry_id", "language", "title", "description", "content", "readability_content", "created_at") SELECT "entry_id", "language", "title", "description", "content", "readability_content", "created_at" FROM `translations`;--> statement-breakpoint
+DROP TABLE `translations`;--> statement-breakpoint
+ALTER TABLE `__new_translations` RENAME TO `translations`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
+CREATE UNIQUE INDEX `translation-unique-index` ON `translations` (`entry_id`,`language`);