diff --git a/apps/desktop/locales/settings/en.json b/apps/desktop/locales/settings/en.json index e15a57e22..dbd64770b 100644 --- a/apps/desktop/locales/settings/en.json +++ b/apps/desktop/locales/settings/en.json @@ -309,7 +309,6 @@ "profile.handle.description": "Your unique identifier.", "profile.handle.label": "Handle", "profile.link_social.authentication": "Authentication", - "profile.link_social.description": "You can currently only connect social accounts with the same email.", "profile.link_social.link": "Link", "profile.link_social.unlink.success": "Social account unlinked.", "profile.name.description": "Your public display name.", diff --git a/apps/desktop/locales/settings/ja.json b/apps/desktop/locales/settings/ja.json index f991c861b..13e32e373 100644 --- a/apps/desktop/locales/settings/ja.json +++ b/apps/desktop/locales/settings/ja.json @@ -277,7 +277,6 @@ "profile.handle.description": "あなた個人の識別子です", "profile.handle.label": "ハンドル", "profile.link_social.authentication": "認証", - "profile.link_social.description": "現在同じメールを使用しているソーシャルアカウントがか接続できます。", "profile.link_social.link": "リンク", "profile.link_social.unlink.success": "ソーシャルアカウントのリンクを解除しました。", "profile.name.description": "公開表示名", diff --git a/apps/desktop/locales/settings/ko.json b/apps/desktop/locales/settings/ko.json index a216d3a77..a2cf6ffbf 100644 --- a/apps/desktop/locales/settings/ko.json +++ b/apps/desktop/locales/settings/ko.json @@ -282,7 +282,6 @@ "profile.handle.description": "고유 식별자.", "profile.handle.label": "핸들", "profile.link_social.authentication": "인증", - "profile.link_social.description": "현재는 동일한 이메일을 가진 소셜 계정만 연결할 수 있습니다.", "profile.link_social.link": "연결", "profile.link_social.unlink.success": "소셜 계정 연결이 해제되었습니다.", "profile.name.description": "공개 표시 이름.", diff --git a/apps/desktop/locales/settings/ru.json b/apps/desktop/locales/settings/ru.json index cf1d5cbd7..3f2ae0c0e 100644 --- a/apps/desktop/locales/settings/ru.json +++ b/apps/desktop/locales/settings/ru.json @@ -276,7 +276,6 @@ "profile.handle.description": "Ваш уникальный идентификатор.", "profile.handle.label": "Идентификатор", "profile.link_social.authentication": "Аутентификация", - "profile.link_social.description": "Вы можете подключить социальные аккаунты только с тем же email.", "profile.link_social.link": "Подключить", "profile.link_social.unlink.success": "Социальный аккаунт отсоединен.", "profile.name.description": "Ваше публичное отображаемое имя.", diff --git a/apps/desktop/locales/settings/zh-CN.json b/apps/desktop/locales/settings/zh-CN.json index a7058e094..30199c938 100644 --- a/apps/desktop/locales/settings/zh-CN.json +++ b/apps/desktop/locales/settings/zh-CN.json @@ -300,7 +300,6 @@ "profile.handle.description": "你的唯一标识。", "profile.handle.label": "唯一标识", "profile.link_social.authentication": "身份验证", - "profile.link_social.description": "目前只能连接具有相同邮件地址的社交帐户。", "profile.link_social.link": "连接", "profile.link_social.unlink.success": "已解除社交账户连接。", "profile.name.description": "你的公开显示名称。", diff --git a/apps/desktop/locales/settings/zh-HK.json b/apps/desktop/locales/settings/zh-HK.json index 5874d3472..98d471b9d 100644 --- a/apps/desktop/locales/settings/zh-HK.json +++ b/apps/desktop/locales/settings/zh-HK.json @@ -297,7 +297,6 @@ "profile.handle.description": "你的唯一識別符", "profile.handle.label": "識別符", "profile.link_social.authentication": "身份驗證", - "profile.link_social.description": "目前只能連結使用相同電子郵件的社交帳戶", "profile.link_social.link": "連結", "profile.link_social.unlink.success": "社交帳戶已解除連結", "profile.name.description": "你的公開顯示名稱", diff --git a/apps/desktop/locales/settings/zh-TW.json b/apps/desktop/locales/settings/zh-TW.json index e348ac5e6..374430c92 100644 --- a/apps/desktop/locales/settings/zh-TW.json +++ b/apps/desktop/locales/settings/zh-TW.json @@ -282,7 +282,6 @@ "profile.handle.description": "你的獨一無二名稱。", "profile.handle.label": "名稱", "profile.link_social.authentication": "驗證", - "profile.link_social.description": "您目前只能連結具有相同電子信箱的社群帳號。", "profile.link_social.link": "連結", "profile.link_social.unlink.success": "已中斷社群帳號連結。", "profile.name.description": "你的公開顯示名稱。", diff --git a/apps/desktop/src/renderer/src/modules/profile/account-management.tsx b/apps/desktop/src/renderer/src/modules/profile/account-management.tsx index 110c6cb61..0443e1650 100644 --- a/apps/desktop/src/renderer/src/modules/profile/account-management.tsx +++ b/apps/desktop/src/renderer/src/modules/profile/account-management.tsx @@ -74,7 +74,6 @@ export function AccountManagement() { ))} -

{t("profile.link_social.description")}

) } diff --git a/apps/mobile/src/modules/settings/routes/Account.tsx b/apps/mobile/src/modules/settings/routes/Account.tsx index 359eb5079..af8a5395d 100644 --- a/apps/mobile/src/modules/settings/routes/Account.tsx +++ b/apps/mobile/src/modules/settings/routes/Account.tsx @@ -14,7 +14,6 @@ import { GroupedInsetListNavigationLink, GroupedInsetListNavigationLinkIcon, GroupedInsetListSectionHeader, - GroupedOutlineDescription, GroupedPlainButtonCell, } from "@/src/components/ui/grouped/GroupedList" import { getDbPath } from "@/src/database" @@ -227,7 +226,6 @@ const AuthenticationSection = () => { ) : null} - ) } diff --git a/packages/shared/src/hono.ts b/packages/shared/src/hono.ts index 5a33f4cdd..55b61fe5a 100644 --- a/packages/shared/src/hono.ts +++ b/packages/shared/src/hono.ts @@ -12442,6 +12442,7 @@ declare const auth: { accountLinking: { enabled: true; trustedProviders: ("github" | "apple" | "google")[]; + allowDifferentEmails: true; }; }; socialProviders: {