From 213a4bce2c22eba336981e57c3a2ebd321de63da Mon Sep 17 00:00:00 2001 From: Jerry Wong Date: Sat, 28 Sep 2024 18:36:56 +0800 Subject: [PATCH] feat(i18n): conditional display of 'browser' or 'new tab' (#692) --- apps/renderer/src/hooks/biz/useEntryActions.tsx | 4 +++- apps/renderer/src/hooks/biz/useFeedActions.tsx | 5 ++++- locales/app/en.json | 10 ++++++---- locales/app/zh-CN.json | 10 ++++++---- locales/app/zh-HK.json | 12 +++++++----- locales/app/zh-TW.json | 10 ++++++---- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/apps/renderer/src/hooks/biz/useEntryActions.tsx b/apps/renderer/src/hooks/biz/useEntryActions.tsx index 0a87dac69..ad1eda01c 100644 --- a/apps/renderer/src/hooks/biz/useEntryActions.tsx +++ b/apps/renderer/src/hooks/biz/useEntryActions.tsx @@ -339,7 +339,9 @@ export const useEntryActions = ({ }, { key: "openInBrowser", - name: t("entry_actions.open_in_browser"), + name: t("entry_actions.open_in_browser", { + which: t(window.electron ? "words.browser" : "words.newTab"), + }), shortcut: shortcuts.entry.openInBrowser.key, className: "i-mgc-world-2-cute-re", hide: !populatedEntry.entries.url, diff --git a/apps/renderer/src/hooks/biz/useFeedActions.tsx b/apps/renderer/src/hooks/biz/useFeedActions.tsx index 40fe01425..b66ab8e9d 100644 --- a/apps/renderer/src/hooks/biz/useFeedActions.tsx +++ b/apps/renderer/src/hooks/biz/useFeedActions.tsx @@ -155,6 +155,7 @@ export const useFeedActions = ({ isList ? "sidebar.feed_actions.open_list_in_browser" : "sidebar.feed_actions.open_feed_in_browser", + { which: t(window.electron ? "words.browser" : "words.newTab") }, ), disabled: isEntryList, shortcut: "O", @@ -170,7 +171,9 @@ export const useFeedActions = ({ ? [ { type: "text" as const, - label: t("sidebar.feed_actions.open_site_in_browser"), + label: t("sidebar.feed_actions.open_site_in_browser", { + which: t(window.electron ? "words.browser" : "words.newTab"), + }), shortcut: "Meta+O", disabled: isEntryList, click: () => { diff --git a/locales/app/en.json b/locales/app/en.json index d6e1b0a67..b9b289aa0 100644 --- a/locales/app/en.json +++ b/locales/app/en.json @@ -35,7 +35,7 @@ "entry_actions.link_copied": "Link copied to clipboard.", "entry_actions.mark_as_read": "Mark as read", "entry_actions.mark_as_unread": "Mark as unread", - "entry_actions.open_in_browser": "Open in browser", + "entry_actions.open_in_browser": "Open in {{which}}", "entry_actions.save_media_to_eagle": "Save media to Eagle", "entry_actions.save_to_instapaper": "Save to Instapaper", "entry_actions.save_to_readwise": "Save to Readwise", @@ -177,9 +177,9 @@ "sidebar.feed_actions.mark_all_as_read": "Mark all as read", "sidebar.feed_actions.navigate_to_feed": "Navigate to feed", "sidebar.feed_actions.navigate_to_list": "Navigate to list", - "sidebar.feed_actions.open_feed_in_browser": "Open feed in browser", - "sidebar.feed_actions.open_list_in_browser": "Open list in browser", - "sidebar.feed_actions.open_site_in_browser": "Open site in browser", + "sidebar.feed_actions.open_feed_in_browser": "Open feed in {{which}}", + "sidebar.feed_actions.open_list_in_browser": "Open list in {{which}}", + "sidebar.feed_actions.open_site_in_browser": "Open site in {{which}}", "sidebar.feed_actions.unfollow": "Unfollow", "sidebar.feed_actions.unfollow_feed": "Unfollow feed", "sidebar.feed_column.context_menu.add_feeds_to_list": "Add feeds to list", @@ -220,6 +220,7 @@ "user_profile.toggle_item_style": "Toggle Item Style", "words.achievement": "Achievements", "words.add": "Add", + "words.browser": "Browser", "words.confirm": "Confirm", "words.discover": "Discover", "words.email": "Email", @@ -231,6 +232,7 @@ "words.load_archived_entries": "Load archived entries", "words.login": "Login", "words.mint": "Mint", + "words.newTab": "New Tab", "words.power": "Power", "words.rss": "RSS", "words.rss3": "RSS3", diff --git a/locales/app/zh-CN.json b/locales/app/zh-CN.json index 2e20769fc..60c090c08 100644 --- a/locales/app/zh-CN.json +++ b/locales/app/zh-CN.json @@ -35,7 +35,7 @@ "entry_actions.link_copied": "链接已复制到剪贴板", "entry_actions.mark_as_read": "标记为已读", "entry_actions.mark_as_unread": "标记为未读", - "entry_actions.open_in_browser": "在浏览器打开", + "entry_actions.open_in_browser": "在{{which}}打开", "entry_actions.save_media_to_eagle": "保存到 Eagle", "entry_actions.save_to_instapaper": "保存到 Instapaper", "entry_actions.save_to_readwise": "保存到 Readwise", @@ -177,9 +177,9 @@ "sidebar.feed_actions.mark_all_as_read": "全部标记为已读", "sidebar.feed_actions.navigate_to_feed": "跳转至", "sidebar.feed_actions.navigate_to_list": "跳转至列表", - "sidebar.feed_actions.open_feed_in_browser": "在浏览器打开订阅源", - "sidebar.feed_actions.open_list_in_browser": "在浏览器打开列表", - "sidebar.feed_actions.open_site_in_browser": "在浏览器打开网站", + "sidebar.feed_actions.open_feed_in_browser": "在{{which}}打开订阅源", + "sidebar.feed_actions.open_list_in_browser": "在{{which}}打开列表", + "sidebar.feed_actions.open_site_in_browser": "在{{which}}打开网站", "sidebar.feed_actions.unfollow": "取消订阅", "sidebar.feed_actions.unfollow_feed": "取消订阅", "sidebar.feed_column.context_menu.add_feeds_to_list": "添加订阅源到列表", @@ -220,6 +220,7 @@ "user_profile.toggle_item_style": "切换列表样式", "words.achievement": "成就", "words.add": "添加", + "words.browser": "浏览器", "words.confirm": "确认", "words.discover": "发现", "words.email": "邮箱", @@ -231,6 +232,7 @@ "words.load_archived_entries": "加载已归档条目", "words.login": "登录", "words.mint": "Mint", + "words.newTab": "新标签页", "words.power": "Power", "words.rss": "RSS", "words.rss3": "RSS3", diff --git a/locales/app/zh-HK.json b/locales/app/zh-HK.json index 2b7263e73..165b66f6f 100644 --- a/locales/app/zh-HK.json +++ b/locales/app/zh-HK.json @@ -35,7 +35,7 @@ "entry_actions.link_copied": "連結已複製到剪貼簿。", "entry_actions.mark_as_read": "標記為已讀", "entry_actions.mark_as_unread": "標記為未讀", - "entry_actions.open_in_browser": "在瀏覽器中開啟", + "entry_actions.open_in_browser": "在{{which}}中開啟", "entry_actions.save_media_to_eagle": "保存媒體至 Eagle", "entry_actions.save_to_instapaper": "保存至 Instapaper", "entry_actions.save_to_readwise": "保存至 Readwise", @@ -177,9 +177,9 @@ "sidebar.feed_actions.mark_all_as_read": "全部標記為已讀", "sidebar.feed_actions.navigate_to_feed": "導航到訂閱源", "sidebar.feed_actions.navigate_to_list": "導航到清單", - "sidebar.feed_actions.open_feed_in_browser": "在瀏覽器中打開訂閱源", - "sidebar.feed_actions.open_list_in_browser": "在瀏覽器中打開清單", - "sidebar.feed_actions.open_site_in_browser": "在瀏覽器中打開網站", + "sidebar.feed_actions.open_feed_in_browser": "在{{which}}中打開訂閱源", + "sidebar.feed_actions.open_list_in_browser": "在{{which}}中打開清單", + "sidebar.feed_actions.open_site_in_browser": "在{{which}}中打開網站", "sidebar.feed_actions.unfollow": "取消關注", "sidebar.feed_actions.unfollow_feed": "取消關注訂閱源", "sidebar.feed_column.context_menu.change_to_other_view": "切換到其他視圖", @@ -219,6 +219,7 @@ "user_profile.toggle_item_style": "切換條目樣式", "words.achievement": "成就", "words.add": "新增", + "words.browser": "瀏覽器", "words.confirm": "確認", "words.discover": "探索", "words.email": "電子郵件", @@ -230,6 +231,7 @@ "words.load_archived_entries": "加載已存檔的條目", "words.login": "登入", "words.mint": "Mint", + "words.newTab": "新分頁", "words.power": "Power", "words.rss": "RSS", "words.rss3": "RSS3", @@ -240,5 +242,5 @@ "words.unread": "未讀", "words.user": "用戶", "words.which.all": "所有", - "words.zero_items": "零項目" + "words.zero_items": "沒有項目" } diff --git a/locales/app/zh-TW.json b/locales/app/zh-TW.json index 3a85271d0..a87d67c3d 100644 --- a/locales/app/zh-TW.json +++ b/locales/app/zh-TW.json @@ -35,7 +35,7 @@ "entry_actions.link_copied": "連結已複製到剪貼簿。", "entry_actions.mark_as_read": "標記為已讀", "entry_actions.mark_as_unread": "標記為未讀", - "entry_actions.open_in_browser": "在瀏覽器中打開", + "entry_actions.open_in_browser": "在{{which}}中打開", "entry_actions.save_media_to_eagle": "儲存媒體至 Eagle", "entry_actions.save_to_instapaper": "儲存到 Instapaper", "entry_actions.save_to_readwise": "儲存到 Readwise", @@ -175,9 +175,9 @@ "sidebar.feed_actions.list_owned_by_you": "該列表歸你所有", "sidebar.feed_actions.mark_all_as_read": "全部標記為已讀", "sidebar.feed_actions.navigate_to_feed": "導航到摘要", - "sidebar.feed_actions.open_feed_in_browser": "使用瀏覽器打開這個摘要", - "sidebar.feed_actions.open_list_in_browser": "在瀏覽器開啟列表", - "sidebar.feed_actions.open_site_in_browser": "使用瀏覽器打開這個網站", + "sidebar.feed_actions.open_feed_in_browser": "使用{{which}}打開這個摘要", + "sidebar.feed_actions.open_list_in_browser": "在{{which}}開啟列表", + "sidebar.feed_actions.open_site_in_browser": "使用{{which}}打開這個網站", "sidebar.feed_actions.unfollow": "取消關注", "sidebar.feed_actions.unfollow_feed": "取消關注摘要", "sidebar.feed_column.context_menu.change_to_other_view": "切換到其他視圖", @@ -217,6 +217,7 @@ "user_profile.toggle_item_style": "切換項目樣式", "words.achievement": "成就", "words.add": "新增", + "words.browser": "瀏覽器", "words.confirm": "確認", "words.discover": "發現", "words.email": "Email", @@ -227,6 +228,7 @@ "words.lists": "列表", "words.load_archived_entries": "載入已封存項目", "words.login": "登入", + "words.newTab": "新分頁", "words.power": "Power", "words.rss": "RSS", "words.rss3": "RSS3",