From 3b004d396621db21ec7c72d64bab9512cc971c44 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 26 Jun 2023 10:02:22 +0800 Subject: [PATCH 1/4] :art: Update text --- app/src/config/account.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/config/account.ts b/app/src/config/account.ts index 105318170..de1d53046 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -16,7 +16,7 @@ export const account = { element: undefined as Element, genHTML: (onlyPayHTML = false) => { const payHTML = ` - ${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account1 : "Become lifetime VIP"} + ${window.siyuan.languages.account1}
From 683a423489de69fc719a1a2ccfc72bd03f9a95a1 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 26 Jun 2023 10:12:16 +0800 Subject: [PATCH 2/4] :art: Update text --- app/appearance/langs/en_US.json | 5 +---- app/appearance/langs/es_ES.json | 5 +---- app/appearance/langs/fr_FR.json | 5 +---- app/appearance/langs/zh_CHT.json | 5 +---- app/appearance/langs/zh_CN.json | 5 +---- app/src/config/account.ts | 6 ------ 6 files changed, 5 insertions(+), 26 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index e17c3527f..a8cb856b9 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -668,13 +668,10 @@ "insertBottom": "Open Below the Tab", "insertRight": "Open Right the Tab", "account1": "Click to subscribe", - "account2": "
End-to-end encrypted data sync
End-to-end encrypted data backup
Cloud assets serving
", + "account2": "
End-to-end encrypted data sync
End-to-end encrypted data backup
", "account3": "Trial Subscription", "account5": "Cloud assets hosting", "account6": "Remaining before subscription expires", - "account7": "More advanced features", - "account8": "
\uD83C\uDFEB Education discount 6.4% off
", - "account9": "
\uD83D\uDD25 6.4% discount for the first year of a two-person group", "account10": "Annual subscription", "account11": "Until the end of the early bird discount", "account12": "Life companion", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 6a018e0c5..218e1844e 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -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": "
Sincronización de datos cifrada de extremo a extremo
Copia de seguridad de datos cifrada de extremo a extremo
Activos en la nube que sirven
", + "account2": "
Sincronización de datos cifrada de extremo a extremo
Copia de seguridad de datos cifrada 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": "Más funciones avanzadas", - "account8": "
\uD83C\uDFEB Descuento educativo 6,4 %
", - "account9": "
\uD83D\uDD25 6,4 % de descuento durante el primer año de un grupo de dos personas
", "account10": "Suscripción anual", "account11": "Hasta que finalice el descuento por pronto pago", "account12": "Compañero de vida", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 35e0d09f7..7ddeb6738 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -668,13 +668,10 @@ "insertBottom": "Ouvrir en bas de l'onglet", "insertRight": "Ouvrir en droit de l'onglet", "account1": "Cliquez pour vous abonner", - "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
", + "account2": "
Synchronisation des données chiffrées de bout en bout
Sauvegarde des données chiffrées de bout en bout
", "account3": "Abonnement d'essai", "account5": "Hébergement d'actifs cloud", "account6": "Restant avant l'expiration de l'abonnement", - "account7": "Fonctions plus avancées", - "account8": "
\uD83C\uDFEB Réduction éducation de 6,4 %
", - "account9": "
\uD83D\uDD25 6,4 % de réduction pour la première année d'un groupe de deux personnes ", "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 7480c4982..e4191d632 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -668,13 +668,10 @@ "insertBottom": "在分頁下側打開", "insertRight": "在分頁右側打開", "account1": "點擊前往訂閱", - "account2": "
端到端加密數據同步
端到端加密數據備份
資源文件圖床
定時微信提醒
收集箱
", + "account2": "
端到端加密數據同步
端到端加密數據備份
", "account3": "試用訂閱", "account5": "雲端圖床服務", "account6": "距訂閱過期還剩", - "account7": "更多進階特性", - "account8": "
\uD83C\uDFEB 教育優惠 6.4 折
", - "account9": "
\uD83D\uDD25 兩人團首年 6.4 折
", "account10": "年付訂閱", "account11": "早鳥優惠活動結束還剩", "account12": "相伴一生", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 2e535c5c1..ff7661661 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -668,13 +668,10 @@ "insertBottom": "在页签下侧打开", "insertRight": "在页签右侧打开", "account1": "点击前往订阅", - "account2": "
端到端加密数据同步
端到端加密数据备份
资源文件图床
定时微信提醒
收集箱
", + "account2": "
端到端加密数据同步
端到端加密数据备份
", "account3": "试用订阅", "account5": "云端图床服务", "account6": "距订阅过期还剩", - "account7": "更多高级特性", - "account8": "
\uD83C\uDFEB 教育优惠 6.4 折
", - "account9": "
\uD83D\uDD25 两人团首年 6.4 折
", "account10": "年付订阅", "account11": "早鸟优惠活动结束还剩", "account12": "相伴一生", diff --git a/app/src/config/account.ts b/app/src/config/account.ts index de1d53046..3070fd452 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -19,12 +19,8 @@ export const account = { ${window.siyuan.languages.account1}
-
-${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account8 : ""} -${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account9 : ""}
${window.siyuan.languages.account2} -
${window.siyuan.languages.account7}
@@ -68,8 +64,6 @@ ${window.siyuan.languages.account2} subscriptionHTML = `
${window.siyuan.languages.account3}
${renewHTML}
-${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account8 : ""} -${window.siyuan.config.cloudRegion === 0 ? window.siyuan.languages.account9 : ""} `; } else { subscriptionHTML = `
${window.siyuan.languages.account10}
${renewHTML}`; From 7309aa7b688701ba718af31c002d6157071280f8 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 26 Jun 2023 10:14:55 +0800 Subject: [PATCH 3/4] :art: Update text --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- app/src/config/account.ts | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index a8cb856b9..548cee3c2 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -668,7 +668,7 @@ "insertBottom": "Open Below the Tab", "insertRight": "Open Right the Tab", "account1": "Click to subscribe", - "account2": "
End-to-end encrypted data sync
End-to-end encrypted data backup
", + "account2": "End-to-end encrypted data sync and backup", "account3": "Trial Subscription", "account5": "Cloud assets hosting", "account6": "Remaining before subscription expires", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 218e1844e..aefad0a17 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -668,7 +668,7 @@ "insertBottom": "Abrir debajo de la pestaña", "insertRight": "Abrir a la derecha la pestaña", "account1": "Haga clic para suscribirse", - "account2": "
Sincronización de datos cifrada de extremo a extremo
Copia de seguridad de datos cifrada de extremo a extremo
", + "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", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 7ddeb6738..338f9d13d 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -668,7 +668,7 @@ "insertBottom": "Ouvrir en bas de l'onglet", "insertRight": "Ouvrir en droit de l'onglet", "account1": "Cliquez pour vous abonner", - "account2": "
Synchronisation des données chiffrées de bout en bout
Sauvegarde des données chiffrées de bout en bout
", + "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", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index e4191d632..b33d360ec 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -668,7 +668,7 @@ "insertBottom": "在分頁下側打開", "insertRight": "在分頁右側打開", "account1": "點擊前往訂閱", - "account2": "
端到端加密數據同步
端到端加密數據備份
", + "account2": "端到端加密數據同步和備份", "account3": "試用訂閱", "account5": "雲端圖床服務", "account6": "距訂閱過期還剩", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index ff7661661..abe2e0cfd 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -668,7 +668,7 @@ "insertBottom": "在页签下侧打开", "insertRight": "在页签右侧打开", "account1": "点击前往订阅", - "account2": "
端到端加密数据同步
端到端加密数据备份
", + "account2": "端到端加密数据同步和备份", "account3": "试用订阅", "account5": "云端图床服务", "account6": "距订阅过期还剩", diff --git a/app/src/config/account.ts b/app/src/config/account.ts index 3070fd452..cc6b123d9 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -19,8 +19,7 @@ export const account = { ${window.siyuan.languages.account1}
-
-${window.siyuan.languages.account2} +
${window.siyuan.languages.account2}
From 3ddfeeb8230f366493b9f7f8f9515a514bfdf364 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 26 Jun 2023 10:38:19 +0800 Subject: [PATCH 4/4] :art: Update text --- app/src/config/account.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/config/account.ts b/app/src/config/account.ts index cc6b123d9..b0acc6871 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -15,12 +15,12 @@ import {getCloudURL} from "./util/about"; export const account = { element: undefined as Element, genHTML: (onlyPayHTML = false) => { - const payHTML = ` + const payHTML = `
${window.siyuan.languages.account2}
+
+ ${window.siyuan.languages.account1}
-
${window.siyuan.languages.account2}
-
${window.siyuan.languages.freeSub}