feat: add more words i18n

apps/renderer/src/modules/entry-column/components/DateItem.tsx

@@ -11,6 +11,7 @@ import {
  useRef,
  useState,
 } from "react"
+import { Trans } from "react-i18next"
 import { useDebounceCallback } from "usehooks-ts"
 
 import { SafeFragment } from "~/components/common/Fragment"
@@ -133,14 +134,21 @@ const DateItemInner: FC<{
  <ActionButton
  tooltip={
  <span>
- Mark
- <span> </span>
- {useMemo(
- () => cloneElement(RelativeElement, { layoutId: tooltipId.current }),
- [RelativeElement],
- )}
- <span> </span>
- as read
+ <Trans
+ i18nKey="mark_all_read_button.mark_as_read"
+ components={{
+ which: (
+ <>
+ <span> </span>
+ {useMemo(
+ () => cloneElement(RelativeElement, { layoutId: tooltipId.current }),
+ [RelativeElement],
+ )}
+ <span> </span>
+ </>
+ ),
+ }}
+ />
  </span>
  }
  onClick={() => {
@@ -163,9 +171,12 @@ const DateItemInner: FC<{
 
  {confirmMark ? (
  <div className="animate-mask-in" key="a">
- Mark
- <span> </span>
- {RelativeElement} as read?
+ <Trans
+ i18nKey="mark_all_read_button.confirm_mark_all"
+ components={{
+ which: <>{RelativeElement}</>,
+ }}
+ />
  </div>
  ) : (
  RelativeElement

apps/renderer/src/modules/entry-column/components/mark-all-button.tsx

@@ -66,10 +66,10 @@ export const MarkAllReadWithOverlay = forwardRef<
  <i className="i-mgc-check-circle-cute-re" />
  <span className="text-sm font-bold">
  <Trans
- i18nKey="mark_all_read_button.mark_as_read"
- // should be fixed by using `as const` but it's not working
- // @ts-expect-error https://www.i18next.com/overview/typescript#type-error-template-literal
- values={{ which: commonT(`words.which.${which}`) }}
+ i18nKey="mark_all_read_button.confirm_mark_all"
+ components={{
+  which: commonT(`words.which.${which}` as any),
+ }}
  />
  </span>
  </span>
@@ -132,10 +132,8 @@ export const MarkAllReadWithOverlay = forwardRef<
  <>
  <Trans
  i18nKey="mark_all_read_button.mark_as_read"
- values={{
- // @ts-expect-error https://www.i18next.com/overview/typescript#type-error-template-literal
- // should be fixed by using `as const` but it's not working
- which: commonT(`words.which.${which}`),
+ components={{
+ which: commonT(`words.which.${which}` as any),
  }}
  />
  {shortcut && (
@@ -220,9 +218,14 @@ export const FlatMarkAllReadButton: FC<MarkAllButtonProps> = (props) => {
  )}
  </AnimatePresence>
  <span className={cn(status === "confirm" ? "opacity-0" : "opacity-100", "duration-200")}>
- {t("mark_all_read_button.mark_as_read", {
- which: typeof which === "string" ? t.common(`words.which.${which}` as any) : which,
- })}
+ <Trans
+ i18nKey="mark_all_read_button.mark_as_read"
+ components={{
+ which: (
+ <>{typeof which === "string" ? t.common(`words.which.${which}` as any) : which}</>
+ ),
+ }}
+ />
  </span>
  <span
  className={cn(

apps/renderer/src/modules/feed-column/index.tsx

@@ -197,10 +197,7 @@ export function FeedColumn({ children, className }: PropsWithChildren<{ classNam
  <div className="relative flex size-full overflow-hidden" ref={carouselRef}>
  <SwipeWrapper active={active}>
  {views.map((item, index) => (
- <section
- key={item.name}
- className="h-full w-[var(--fo-feed-col-w)] shrink-0 snap-center"
- >
+ <section key={item.name} className="h-full w-feed-col shrink-0 snap-center">
  <FeedList className="flex size-full flex-col text-sm" view={index} />
  </section>
  ))}

locales/app/ar-DZ.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "فيديوهات",
  "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.",
  "mark_all_read_button.confirm": "تأكيد",
- "mark_all_read_button.confirm_mark_all": "هل تريد تحديد {{which}} كمقروء؟",
+ "mark_all_read_button.confirm_mark_all": "هل تريد تحديد <which /> كمقروء؟",
  "mark_all_read_button.confirm_mark_all_info": "تأكيد تحديد الكل كمقروء؟",
  "mark_all_read_button.mark_all_as_read": "تحديد الكل كمقروء",
- "mark_all_read_button.mark_as_read": "تحديد {{which}} كمقروء",
+ "mark_all_read_button.mark_as_read": "تحديد <which /> كمقروء",
  "mark_all_read_button.undo": "تراجع",
  "player.back_10s": "للخلف 10 ثوانٍ",
  "player.close": "إغلاق",

locales/app/ar-IQ.json

@@ -109,10 +109,10 @@
  "feed_view_type.videos": "فيديوهات",
  "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.",
  "mark_all_read_button.confirm": "تأكيد",
- "mark_all_read_button.confirm_mark_all": "تحديد {{which}} كمقروء؟",
+ "mark_all_read_button.confirm_mark_all": "تحديد <which /> كمقروء؟",
  "mark_all_read_button.confirm_mark_all_info": "تأكيد تحديد الكل كمقروء؟",
  "mark_all_read_button.mark_all_as_read": "تحديد الكل كمقروء",
- "mark_all_read_button.mark_as_read": "تحديد {{which}} كمقروء",
+ "mark_all_read_button.mark_as_read": "تحديد <which /> كمقروء",
  "mark_all_read_button.undo": "تراجع",
  "player.back_10s": "العودة 10 ثوانٍ",
  "player.close": "إغلاق",

locales/app/ar-KW.json

@@ -109,10 +109,10 @@
  "feed_view_type.videos": "فيديوهات",
  "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.",
  "mark_all_read_button.confirm": "تأكيد",
- "mark_all_read_button.confirm_mark_all": "وضع علامة {{which}} كمقروء؟",
+ "mark_all_read_button.confirm_mark_all": "وضع علامة <which /> كمقروء؟",
  "mark_all_read_button.confirm_mark_all_info": "تأكيد وضع علامة الجميع كمقروء؟",
  "mark_all_read_button.mark_all_as_read": "وضع علامة الكل كمقروء",
- "mark_all_read_button.mark_as_read": "وضع علامة {{which}} كمقروء",
+ "mark_all_read_button.mark_as_read": "وضع علامة <which /> كمقروء",
  "mark_all_read_button.undo": "التراجع",
  "player.back_10s": "للخلف 10 ثوانٍ",
  "player.close": "إغلاق",

locales/app/ar-MA.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "فيديوهات",
  "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.",
  "mark_all_read_button.confirm": "تأكيد",
- "mark_all_read_button.confirm_mark_all": "وضع علامة على {{which}} كمقروء؟",
+ "mark_all_read_button.confirm_mark_all": "وضع علامة على <which /> كمقروء؟",
  "mark_all_read_button.confirm_mark_all_info": "تأكيد وضع علامة على الكل كمقروء؟",
  "mark_all_read_button.mark_all_as_read": "وضع علامة على الكل كمقروء",
- "mark_all_read_button.mark_as_read": "وضع علامة على {{which}} كمقروء",
+ "mark_all_read_button.mark_as_read": "وضع علامة على <which /> كمقروء",
  "mark_all_read_button.undo": "تراجع",
  "player.back_10s": "العودة 10 ثوانٍ",
  "player.close": "إغلاق",

locales/app/ar-SA.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "فيديوهات",
  "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.",
  "mark_all_read_button.confirm": "تأكيد",
- "mark_all_read_button.confirm_mark_all": "تمييز {{which}} كمقروء؟",
+ "mark_all_read_button.confirm_mark_all": "تمييز <which /> كمقروء؟",
  "mark_all_read_button.confirm_mark_all_info": "هل ترغب في تأكيد تمييز الكل كمقروء؟",
  "mark_all_read_button.mark_all_as_read": "تمييز الكل كمقروء",
- "mark_all_read_button.mark_as_read": "تمييز {{which}} كمقروء",
+ "mark_all_read_button.mark_as_read": "تمييز <which /> كمقروء",
  "mark_all_read_button.undo": "تراجع",
  "player.back_10s": "العودة 10 ثوانٍ",
  "player.close": "إغلاق",

locales/app/ar-TN.json

@@ -109,10 +109,10 @@
  "feed_view_type.videos": "مقاطع فيديو",
  "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.",
  "mark_all_read_button.confirm": "تأكيد",
- "mark_all_read_button.confirm_mark_all": "وضع علامة {{which}} كمقروء؟",
+ "mark_all_read_button.confirm_mark_all": "وضع علامة <which /> كمقروء؟",
  "mark_all_read_button.confirm_mark_all_info": "تأكيد وضع الجميع كمقروء؟",
  "mark_all_read_button.mark_all_as_read": "وضع علامة على الكل كمقروء",
- "mark_all_read_button.mark_as_read": "وضع علامة {{which}} كمقروء",
+ "mark_all_read_button.mark_as_read": "وضع علامة <which /> كمقروء",
  "mark_all_read_button.undo": "تراجع",
  "player.back_10s": "العودة 10 ثوانٍ",
  "player.close": "إغلاق",

locales/app/de.json

@@ -109,10 +109,10 @@
  "feed_view_type.videos": "Videos",
  "mark_all_read_button.auto_confirm_info": "Wird nach 3 Sekunden automatisch bestätigt.",
  "mark_all_read_button.confirm": "Bestätigen",
- "mark_all_read_button.confirm_mark_all": "{{which}} als gelesen markieren?",
+ "mark_all_read_button.confirm_mark_all": "<which /> als gelesen markieren?",
  "mark_all_read_button.confirm_mark_all_info": "Möchten Sie alle als gelesen markieren?",
  "mark_all_read_button.mark_all_as_read": "Alles als gelesen markieren",
- "mark_all_read_button.mark_as_read": "{{which}} als gelesen markieren",
+ "mark_all_read_button.mark_as_read": "<which /> als gelesen markieren",
  "mark_all_read_button.undo": "Rückgängig",
  "player.back_10s": "10s zurück",
  "player.close": "Schließen",

locales/app/en.json

@@ -153,10 +153,10 @@
  "feed_view_type.videos": "Videos",
  "mark_all_read_button.auto_confirm_info": "Will be confirmed automatically after 3s.",
  "mark_all_read_button.confirm": "Confirm",
- "mark_all_read_button.confirm_mark_all": "Mark {{which}} as read?",
+ "mark_all_read_button.confirm_mark_all": "Mark <which /> as read?",
  "mark_all_read_button.confirm_mark_all_info": "Confirm mark all as read?",
  "mark_all_read_button.mark_all_as_read": "Mark all as read",
- "mark_all_read_button.mark_as_read": "Mark {{which}} as read",
+ "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",
@@ -231,6 +231,7 @@
  "sync_indicator.disabled": "Due to security reasons, sync is disabled.",
  "sync_indicator.offline": "Offline",
  "sync_indicator.synced": "Synced with server",
+ "test": "Mark <which /> as readdddd",
  "tip_modal.amount": "Amount",
  "tip_modal.claim_feed": "Claim this feed",
  "tip_modal.create_wallet": "Create For Free",
@@ -255,6 +256,7 @@
  "user_profile.loading": "Loading",
  "user_profile.share": "Share",
  "user_profile.toggle_item_style": "Toggle Item Style",
+ "uu": "Mark <which /> as readdddd?",
  "words.achievement": "Achievements",
  "words.add": "Add",
  "words.browser": "Browser",

locales/app/es.json

@@ -70,10 +70,10 @@
  "feed_view_type.videos": "Videos",
  "mark_all_read_button.auto_confirm_info": "Confirmación automática después de 3 segundos.",
  "mark_all_read_button.confirm": "Confirmar",
- "mark_all_read_button.confirm_mark_all": "¿Marcar {{which}} como leído?",
+ "mark_all_read_button.confirm_mark_all": "¿Marcar <which /> como leído?",
  "mark_all_read_button.confirm_mark_all_info": "¿Confirmar marcar todo como leído?",
  "mark_all_read_button.mark_all_as_read": "Marcar todo como leído",
- "mark_all_read_button.mark_as_read": "Marcar {{which}} como leído",
+ "mark_all_read_button.mark_as_read": "Marcar <which /> como leído",
  "mark_all_read_button.undo": "Deshacer",
  "search.empty.no_results": "No se encontraron resultados.",
  "search.group.entries": "Entradas",

locales/app/fi.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "Videot",
  "mark_all_read_button.auto_confirm_info": "Vahvistetaan automaattisesti 3 sekunnin kuluttua.",
  "mark_all_read_button.confirm": "Vahvista",
- "mark_all_read_button.confirm_mark_all": "Merkitäänkö {{which}} luetuksi?",
+ "mark_all_read_button.confirm_mark_all": "Merkitäänkö <which /> luetuksi?",
  "mark_all_read_button.confirm_mark_all_info": "Vahvista kaikki merkinnät luetuiksi?",
  "mark_all_read_button.mark_all_as_read": "Merkitse kaikki luetuiksi",
- "mark_all_read_button.mark_as_read": "Merkitse {{which}} luetuksi",
+ "mark_all_read_button.mark_as_read": "Merkitse <which /> luetuksi",
  "mark_all_read_button.undo": "Kumoa",
  "player.back_10s": "Takaisin 10 sekuntia",
  "player.close": "Sulje",

locales/app/fr.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "Vidéos",
  "mark_all_read_button.auto_confirm_info": "Sera confirmé automatiquement après 3s.",
  "mark_all_read_button.confirm": "Confirmer",
- "mark_all_read_button.confirm_mark_all": "Marquer {{which}} comme lu ?",
+ "mark_all_read_button.confirm_mark_all": "Marquer <which /> comme lu ?",
  "mark_all_read_button.confirm_mark_all_info": "Confirmez que vous voulez tout marquer comme lu ?",
  "mark_all_read_button.mark_all_as_read": "Tout marquer comme lu",
- "mark_all_read_button.mark_as_read": "Marquer {{which}} comme lu",
+ "mark_all_read_button.mark_as_read": "Marquer <which /> comme lu",
  "mark_all_read_button.undo": "Annuler",
  "player.back_10s": "Retour de 10s",
  "player.close": "Fermer",

locales/app/it.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "Video",
  "mark_all_read_button.auto_confirm_info": "Sarà confermato automaticamente dopo 3s.",
  "mark_all_read_button.confirm": "Conferma",
- "mark_all_read_button.confirm_mark_all": "Segna {{which}} come letto?",
+ "mark_all_read_button.confirm_mark_all": "Segna <which /> come letto?",
  "mark_all_read_button.confirm_mark_all_info": "Confermi di segnare tutto come letto?",
  "mark_all_read_button.mark_all_as_read": "Segna tutto come letto",
- "mark_all_read_button.mark_as_read": "Segna {{which}} come letto",
+ "mark_all_read_button.mark_as_read": "Segna <which /> come letto",
  "mark_all_read_button.undo": "Annulla",
  "player.back_10s": "Indietro di 10s",
  "player.close": "Chiudi",

locales/app/ja.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "動画",
  "mark_all_read_button.auto_confirm_info": "3 秒後に自動的に確認されます。",
  "mark_all_read_button.confirm": "確認",
- "mark_all_read_button.confirm_mark_all": "{{which}}を既読にしますか？",
+ "mark_all_read_button.confirm_mark_all": "<which />を既読にしますか？",
  "mark_all_read_button.confirm_mark_all_info": "すべてを既読にしますか？",
  "mark_all_read_button.mark_all_as_read": "すべてを既読にする",
- "mark_all_read_button.mark_as_read": "{{which}}を既読にする",
+ "mark_all_read_button.mark_as_read": "<which />を既読にする",
  "mark_all_read_button.undo": "元に戻す",
  "player.back_10s": "10 秒戻る",
  "player.close": "閉じる",

locales/app/ko.json

@@ -126,10 +126,10 @@
  "feed_view_type.videos": "비디오",
  "mark_all_read_button.auto_confirm_info": "3 초 후 자동으로 확인됩니다.",
  "mark_all_read_button.confirm": "확인",
- "mark_all_read_button.confirm_mark_all": "{{which}}을 (를) 모두 읽음으로 표시하시겠습니까?",
+ "mark_all_read_button.confirm_mark_all": "<which />을 (를) 모두 읽음으로 표시하시겠습니까?",
  "mark_all_read_button.confirm_mark_all_info": "모두 읽음으로 표시하시겠습니까?",
  "mark_all_read_button.mark_all_as_read": "모두 읽음으로 표시",
- "mark_all_read_button.mark_as_read": "{{which}}을 (를) 읽음으로 표시",
+ "mark_all_read_button.mark_as_read": "<which />을 (를) 읽음으로 표시",
  "mark_all_read_button.undo": "실행 취소",
  "notify.unfollow_feed": "<FeedItem />이 (가) 언팔로우 되었습니다.",
  "player.back_10s": "10 초 뒤로",

locales/app/pt.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "動画",
  "mark_all_read_button.auto_confirm_info": "3 秒後に自動的に確認されます。",
  "mark_all_read_button.confirm": "確認",
- "mark_all_read_button.confirm_mark_all": "{{which}}を既読にしますか？",
+ "mark_all_read_button.confirm_mark_all": "<which />を既読にしますか？",
  "mark_all_read_button.confirm_mark_all_info": "すべてを既読にしますか？",
  "mark_all_read_button.mark_all_as_read": "すべてを既読にする",
- "mark_all_read_button.mark_as_read": "{{which}}を既読にする",
+ "mark_all_read_button.mark_as_read": "<which />を既読にする",
  "mark_all_read_button.undo": "元に戻す",
  "player.back_10s": "10 秒戻る",
  "player.close": "閉じる",

locales/app/ru.json

@@ -105,10 +105,10 @@
  "feed_view_type.videos": "Видео",
  "mark_all_read_button.auto_confirm_info": "Будет автоматически подтверждено через 3 секунды.",
  "mark_all_read_button.confirm": "Подтвердить",
- "mark_all_read_button.confirm_mark_all": "Отметить {{which}} как прочитанное?",
+ "mark_all_read_button.confirm_mark_all": "Отметить <which /> как прочитанное?",
  "mark_all_read_button.confirm_mark_all_info": "Подтвердить отметку всего как прочитанное?",
  "mark_all_read_button.mark_all_as_read": "Отметить все как прочитанное",
- "mark_all_read_button.mark_as_read": "Отметить {{which}} как прочитанное",
+ "mark_all_read_button.mark_as_read": "Отметить <which /> как прочитанное",
  "mark_all_read_button.undo": "Отменить",
  "player.back_10s": "Назад на 10 сек",
  "player.close": "Закрыть",

locales/app/tr.json

@@ -126,10 +126,10 @@
  "feed_view_type.videos": "Videolar",
  "mark_all_read_button.auto_confirm_info": "3 saniye sonra otomatik olarak onaylanacak.",
  "mark_all_read_button.confirm": "Onayla",
- "mark_all_read_button.confirm_mark_all": "{{which}} okundu olarak işaretlensin mi?",
+ "mark_all_read_button.confirm_mark_all": "<which /> okundu olarak işaretlensin mi?",
  "mark_all_read_button.confirm_mark_all_info": "Tümünü okundu olarak işaretlemeyi onaylıyor musunuz?",
  "mark_all_read_button.mark_all_as_read": "Tümünü okundu olarak işaretle",
- "mark_all_read_button.mark_as_read": "{{which}} okundu olarak işaretle",
+ "mark_all_read_button.mark_as_read": "<which /> okundu olarak işaretle",
  "mark_all_read_button.undo": "Geri al",
  "notify.unfollow_feed": "<FeedItem /> takibi bırakıldı.",
  "player.back_10s": "10 saniye geri",

locales/app/zh-CN.json

@@ -153,10 +153,10 @@
  "feed_view_type.videos": "视频",
  "mark_all_read_button.auto_confirm_info": "3 秒后自动确认",
  "mark_all_read_button.confirm": "确认",
- "mark_all_read_button.confirm_mark_all": "将{{which}}标记为已读？",
+ "mark_all_read_button.confirm_mark_all": "将 <which /> 标记为已读？",
  "mark_all_read_button.confirm_mark_all_info": "确认将全部标记为已读？",
  "mark_all_read_button.mark_all_as_read": "全部标记为已读",
- "mark_all_read_button.mark_as_read": "标记{{which}}为已读",
+ "mark_all_read_button.mark_as_read": "标记 <which />为已读",
  "mark_all_read_button.undo": "撤销",
  "notify.unSupportDisplay": "某些网站无法在此显示，请下载桌面应用查看",
  "notify.unSupportWidth": "{{app_name}} 目前尚不支持移动设备",