From 02dbce30e6a7935b3322689f9ec9403aac45c10b Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 2 Jun 2022 22:49:18 +0800 Subject: [PATCH] =?UTF-8?q?:memo:=20=E8=AF=95=E7=94=A8=E6=96=87=E6=A1=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/icons/ant/icon.json | 2 +- app/appearance/icons/material/icon.json | 2 +- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/fr_FR.json | 1 + app/appearance/langs/zh_CHT.json | 1 + app/appearance/langs/zh_CN.json | 1 + app/src/config/account.ts | 13 +++++++++++-- app/src/config/search.ts | 2 +- 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/appearance/icons/ant/icon.json b/app/appearance/icons/ant/icon.json index f0f04ddc7..67b41ed9b 100644 --- a/app/appearance/icons/ant/icon.json +++ b/app/appearance/icons/ant/icon.json @@ -2,5 +2,5 @@ "name": "ant", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.0.5" + "version": "1.0.6" } diff --git a/app/appearance/icons/material/icon.json b/app/appearance/icons/material/icon.json index 3271e9070..28c32ea3b 100644 --- a/app/appearance/icons/material/icon.json +++ b/app/appearance/icons/material/icon.json @@ -2,5 +2,5 @@ "name": "material", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.0.5" + "version": "1.0.6" } diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index b28fa5eb9..ff974f03e 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -458,8 +458,8 @@ "downloadCloudTip": "After downloading, the cloud backup will be used to overwrite the local backup. Do you want to download?", "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
", + "account3": "Trial Subscription", "account4": "Renewal price remains unchanged for life", "account6": "Remaining before subscription expires", "account7": "More advanced features", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 15bc12717..d20406309 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -459,6 +459,7 @@ "account3Tip": "Va-t-il écraser la sauvegarde cloud avec la sauvegarde locale, télécharger ?", "account1": "Cliquez pour payer", "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
", + "account3": "Abonnement d'essai", "account4": "Le prix du renouvellement reste inchangé à vie", "account6": "Restant avant l'expiration de l'abonnement", "account7": "Fonctions plus avancées", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 76d9fc240..7445fbb8e 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -459,6 +459,7 @@ "account3Tip": "將使用本地備份覆蓋雲端備份，是否上傳？", "account1": "點擊前往支付", "account2": "
端到端加密數據同步
端到端加密數據備份
資源文件圖床
定時微信提醒
收集箱
", + "account3": "試用訂閱", "account4": "續訂價格終身不變", "account6": "距訂閱過期還剩", "account7": "更多進階特性", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index ae0a18f96..76d7a2b3d 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -459,6 +459,7 @@ "account3Tip": "将使用本地备份覆盖云端备份，是否上传？", "account1": "点击前往支付", "account2": "
端到端加密数据同步
端到端加密数据备份
资源文件图床
定时微信提醒
收集箱
", + "account3": "试用订阅", "account4": "续订价格终身不变", "account5": "云端图床服务", "account6": "距订阅过期还剩", diff --git a/app/src/config/account.ts b/app/src/config/account.ts index 77ada4b1c..9c0d4d7da 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -54,8 +54,13 @@ ${window.siyuan.languages.account2} activeSubscriptionHTML = ""; subscriptionHTML = `
${Constants.SIYUAN_IMAGE_VIP}${window.siyuan.languages.account12}
`; } else if (window.siyuan.user.userSiYuanProExpireTime > 0) { - subscriptionHTML = `
${window.siyuan.languages.account10}
+ if (window.siyuan.user.userSiYuanSubscriptionPlan === 2) { + subscriptionHTML = `
${window.siyuan.languages.account3}
${window.siyuan.languages.account6} ${Math.floor((window.siyuan.user.userSiYuanProExpireTime - new Date().getTime()) / 1000 / 60 / 60 / 24)} ${window.siyuan.languages.day} ${window.siyuan.languages.clickMeToRenew}
`; + } else { + subscriptionHTML = `
${window.siyuan.languages.account10}
+
${window.siyuan.languages.account6} ${Math.floor((window.siyuan.user.userSiYuanProExpireTime - new Date().getTime()) / 1000 / 60 / 60 / 24)} ${window.siyuan.languages.day} ${window.siyuan.languages.clickMeToRenew}
`; + } } return `