0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-06-26 10:48:08 +08:00
commit b3d3048924
6 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/appearance/langs/en_US.json
View file

@ -668,13 +668,10 @@
"insertBottom": "Open Below the Tab",
"insertRight": "Open Right the Tab",
"account1": "Click to subscribe",
"account2": "<div>End-to-end encrypted data sync</div><div>End-to-end encrypted data backup</div><div>Cloud assets serving</div>",
"account2": "End-to-end encrypted data sync and backup",
"account3": "Trial Subscription",
"account5": "Cloud assets hosting",
"account6": "Remaining before subscription expires",
"account7": "<a href=\"https://b3log.org/siyuan/en/pricing.html\" target=\"_blank\">More advanced features</a>",
"account8": "<div>\uD83C\uDFEB <a target='_black' href='https://ld246.com/article/1618844886264'>Education discount 6.4% off</a></div>",
"account9": "<div>\uD83D\uDD25 <a target='_black' href='https://ld246.com/subscribe/siyuan/batch'>6.4% discount for the first year of a two-person group</a></ div>",
"account10": "Annual subscription",
"account11": "Until the end of the early bird discount",
"account12": "Life companion",

5
app/appearance/langs/es_ES.json
View file

@ -668,13 +668,10 @@
"insertBottom": "Abrir debajo de la pestaña",
"insertRight": "Abrir a la derecha la pestaña",
"account1": "Haga clic para suscribirse",
"account2": "<div>Sincronización de datos cifrada de extremo a extremo</div><div>Copia de seguridad de datos cifrada de extremo a extremo</div><div>Activos en la nube que sirven</div>",
"account2": "Copia de seguridad y sincronización de datos cifrados de extremo a extremo",
"account3": "Suscripción de prueba",
"account5": "Alojamiento de activos en la nube",
"account6": "Restante antes de que caduque la suscripción",
"account7": "<a href=\"https://b3log.org/siyuan/en/pricing.html\" target=\"_blank\">Más funciones avanzadas</a>",
"account8": "<div>\uD83C\uDFEB <a target='_black' href='https://ld246.com/article/1618844886264'>Descuento educativo 6,4 %</a></div>",
"account9": "<div>\uD83D\uDD25 <a target='_black' href='https://ld246.com/subscribe/siyuan/batch'>6,4 % de descuento durante el primer año de un grupo de dos personas </a></div>",
"account10": "Suscripción anual",
"account11": "Hasta que finalice el descuento por pronto pago",
"account12": "Compañero de vida",

5
app/appearance/langs/fr_FR.json
View file

@ -668,13 +668,10 @@
"insertBottom": "Ouvrir en bas de l'onglet",
"insertRight": "Ouvrir en droit de l'onglet",
"account1": "Cliquez pour vous abonner",
"account2": "<div>Synchronisation des données chiffrées de bout en bout</div><div>Sauvegarde des données chiffrées de bout en bout</div><div>Servant les ressources cloud</div>",
"account2": "Synchronisation et sauvegarde des données cryptées de bout en bout",
"account3": "Abonnement d'essai",
"account5": "Hébergement d'actifs cloud",
"account6": "Restant avant l'expiration de l'abonnement",
"account7": "<a href=\"https://b3log.org/siyuan/en/pricing.html\" target=\"_blank\">Fonctions plus avancées</a>",
"account8": "<div>\uD83C\uDFEB <a target='_black' href='https://ld246.com/article/1618844886264'>Réduction éducation de 6,4 %</a></div>",
"account9": "<div>\uD83D\uDD25 <a target='_black' href='https://ld246.com/subscribe/siyuan/batch'>6,4 % de réduction pour la première année d'un groupe de deux personnes </a></ div>",
"account10": "Abonnement annuel",
"account11": "Jusqu'à la fin de la réduction pour les early bird",
"account12": "Compagnon de vie",

5
app/appearance/langs/zh_CHT.json
View file

@ -668,13 +668,10 @@
"insertBottom": "在分頁下側打開",
"insertRight": "在分頁右側打開",
"account1": "點擊前往訂閱",
"account2": "<div>端到端加密數據同步</div><div>端到端加密數據備份</div><div>資源文件圖床</div><div>定時微信提醒</div><div>收集箱</div>",
"account2": "端到端加密數據同步和備份",
"account3": "試用訂閱",
"account5": "雲端圖床服務",
"account6": "距訂閱過期還剩",
"account7": "<a href=\"https://b3log.org/siyuan/pricing.html\" target=\"_blank\">更多進階特性</a>",
"account8": "<div>\uD83C\uDFEB <a target='_black' href='https://ld246.com/article/1618844886264'>教育優惠 6.4 折</a></div>",
"account9": "<div>\uD83D\uDD25 <a target='_black' href='https://ld246.com/subscribe/siyuan/batch'>兩人團首年 6.4 折</a></div>",
"account10": "年付訂閱",
"account11": "早鳥優惠活動結束還剩",
"account12": "相伴一生",

5
app/appearance/langs/zh_CN.json
View file

@ -668,13 +668,10 @@
"insertBottom": "在页签下侧打开",
"insertRight": "在页签右侧打开",
"account1": "点击前往订阅",
"account2": "<div>端到端加密数据同步</div><div>端到端加密数据备份</div><div>资源文件图床</div><div>定时微信提醒</div><div>收集箱</div>",
"account2": "端到端加密数据同步和备份",
"account3": "试用订阅",
"account5": "云端图床服务",
"account6": "距订阅过期还剩",
"account7": "<a href=\"https://b3log.org/siyuan/pricing.html\" target=\"_blank\">更多高级特性</a>",
"account8": "<div>\uD83C\uDFEB <a target='_black' href='https://ld246.com/article/1618844886264'>教育优惠 6.4 折</a></div>",
"account9": "<div>\uD83D\uDD25 <a target='_black' href='https://ld246.com/subscribe/siyuan/batch'>两人团首年 6.4 折</a></div>",
"account10": "年付订阅",
"account11": "早鸟优惠活动结束还剩",
"account12": "相伴一生",

15
app/src/config/account.ts
View file

@ -15,17 +15,12 @@ import {getCloudURL} from "./util/about";
export const account = {
element: undefined as Element,
genHTML: (onlyPayHTML = false) => {
const payHTML = `<a class="b3-button b3-button--big" href="${getCloudURL("subscribe/siyuan")}" target="_blank">
<svg><use xlink:href="#iconVIP"></use></svg>${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account1 : "Become lifetime VIP"}
const payHTML = `<div>${window.siyuan.languages.account2}</div>
<div class="fn__hr--b"></div>
<a class="b3-button b3-button--big" href="${getCloudURL("subscribe/siyuan")}" target="_blank">
<svg><use xlink:href="#iconVIP"></use></svg>${window.siyuan.languages.account1}
</a>
<div class="fn__hr--b"></div>
<div class="fn__hr--b"></div>
${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account8 : ""}
${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account9 : ""}
<div class="fn__hr"></div>
${window.siyuan.languages.account2}
<div>${window.siyuan.languages.account7}</div>
<div class="fn__hr--b"></div>
<span class="b3-chip b3-chip--primary b3-chip--hover${(window.siyuan.user && window.siyuan.user.userSiYuanSubscriptionStatus === 2) ? " fn__none" : ""}" id="trialSub">
<svg class="ft__secondary"><use xlink:href="#iconVIP"></use></svg>
${window.siyuan.languages.freeSub}
@ -68,8 +63,6 @@ ${window.siyuan.languages.account2}
subscriptionHTML = `<div class="b3-chip b3-chip--primary"><svg><use xlink:href="#iconVIP"></use></svg>${window.siyuan.languages.account3}</div>
${renewHTML}
<div class="fn__hr--b"></div>
${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account8 : ""}
${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account9 : ""}
`;
} else {
subscriptionHTML = `<div class="b3-chip b3-chip--primary"><svg class="ft__secondary"><use xlink:href="#iconVIP"></use></svg>${window.siyuan.languages.account10}</div>${renewHTML}`;