From 30680d7959d950cdf4822c2a58926ab34c434156 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 2 Jun 2022 10:41:29 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/4186 --- app/appearance/langs/en_US.json | 3 +-- app/appearance/langs/fr_FR.json | 4 +--- app/appearance/langs/zh_CHT.json | 4 +--- app/appearance/langs/zh_CN.json | 3 +-- app/src/config/account.ts | 9 ++++++--- app/src/types/index.d.ts | 2 ++ 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 3a3890b9a..7e8c88e31 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -458,11 +458,10 @@ "account3Tip": "Local backup will overwrite cloud backup. Do you want to upload?", "account1": "Click to pay", "account3": "Upload", + "account2": "
End-to-end encrypted data synchronization
End-to-end encrypted data backup
Cloud assets serving
", "account4": "Renewal price remains unchanged for life", - "account5": "Cloud Assets serving", "account6": "Remaining before subscription expires", "account7": "More advanced features", - "account8": "End-to-End encryption sync", "account10": "Annual subscription", "account11": "Until the end of the early bird discount", "account12": "Life companion", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index c5ec70573..66bd76c5a 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -457,12 +457,10 @@ "downloadCloudTip": "Après le téléchargement, la sauvegarde dans le Cloud sera utilisée pour écraser la sauvegarde locale. Voulez-vous télécharger ?", "account3Tip": "Va-t-il écraser la sauvegarde cloud avec la sauvegarde locale, télécharger ?", "account1": "Cliquez pour payer", - "account2": "Sauvegarde par cryptage de bout en bout", + "account2": "
Synchronisation des données chiffrées de bout en bout
Sauvegarde des données chiffrées de bout en bout
Servant les ressources cloud
", "account4": "Le prix du renouvellement reste inchangé à vie", - "account5": "Les Assets du Cloud au service", "account6": "Restant avant l'expiration de l'abonnement", "account7": "Fonctions plus avancées", - "account8": "Synchro du cryptage de bout en bout", "account10": "Abonnement annuel", "account11": "Jusqu'à la fin de la réduction pour les early bird", "account12": "Compagnon de vie", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index f5041ca0a..f1ff86642 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -457,12 +457,10 @@ "downloadCloudTip": "下載後將使用雲端備份覆蓋本地備份，是否下載？", "account3Tip": "將使用本地備份覆蓋雲端備份，是否上傳？", "account1": "點擊前往支付", - "account2": "端到端加密備份", + "account2": "
端到端加密數據同步
端到端加密數據備份
資源文件圖床
定時微信提醒
收集箱
", "account4": "續訂價格終身不變", - "account5": "雲端圖庫服務", "account6": "距訂閱過期還剩", "account7": "更多進階特性", - "account8": "端到端加密同步", "account10": "年付訂閱", "account11": "早鳥優惠活動結束還剩", "account12": "相伴一生", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index f345d7520..6ce2c0113 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -457,12 +457,11 @@ "downloadCloudTip": "下载后将使用云端备份覆盖本地备份，是否下载？", "account3Tip": "将使用本地备份覆盖云端备份，是否上传？", "account1": "点击前往支付", - "account2": "端到端加密备份", + "account2": "
端到端加密数据同步
端到端加密数据备份
资源文件图床
定时微信提醒
收集箱
", "account4": "续订价格终身不变", "account5": "云端图床服务", "account6": "距订阅过期还剩", "account7": "更多高级特性", - "account8": "端到端加密同步", "account10": "年付订阅", "account11": "早鸟优惠活动结束还剩", "account12": "相伴一生", diff --git a/app/src/config/account.ts b/app/src/config/account.ts index e8b0681ea..c32157cb0 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -26,10 +26,13 @@ export const account = {
-
${window.siyuan.languages.account2}
-
${window.siyuan.languages.account8}
-
${window.siyuan.languages.account5}
+${window.siyuan.languages.account2}
${window.siyuan.languages.account7}
+
+ + + ${window.siyuan.languages.sponsor} +
`; if (window.siyuan.user) { let userTitlesHTML = ""; diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index d0d1df7bd..bccb0c32c 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -97,6 +97,8 @@ interface ISiyuan { userNickname: string userPaymentSum: string userSiYuanProExpireTime: number // -1 终身会员；0 普通用户；> 0 过期时间 + userSiYuanSubscriptionPlan: number // 0 年付订阅/终生；1 教育优惠；2 订阅试用 + userSiYuanSubscriptionType: number // 0 年付；1 终生；2 月付 userToken: string userTitles: { name: string, icon: string, desc: string }[] },