From 612dff8b8c1810b4ab5c153bbab60d2cf3a82461 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 21 Jun 2023 12:30:48 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/8584 --- app/appearance/langs/en_US.json | 12 +++---- app/appearance/langs/es_ES.json | 12 +++---- app/appearance/langs/fr_FR.json | 12 +++---- app/appearance/langs/zh_CHT.json | 6 ++-- app/appearance/langs/zh_CN.json | 2 +- app/electron/error.html | 5 +-- .../20200923234731-h3zkwm2.sy | 4 +-- app/src/config/account.ts | 35 ++++++++++--------- 8 files changed, 45 insertions(+), 43 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 4475453b1..38f88dc96 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -670,9 +670,9 @@ "account3": "Trial Subscription", "account5": "Cloud assets hosting", "account6": "Remaining before subscription expires", - "account7": "More advanced features", - "account8": "", - "account9": "", + "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", @@ -687,7 +687,7 @@ "captcha": "Captcha", "register": "Create New Account", "login": "Login", - "accountTip": "I have read and agree SiYuan Privacy Policy", + "accountTip": "I have read and agree SiYuan Privacy Policy", "forgetPassword": "Forget Password", "accountName": "Username/Email", "account": "Account", @@ -830,7 +830,7 @@ "theme": "Theme", "language": "Language", "about": "About", - "about1": "Copyright (c) 2020-present • Yunnan Liandi Technology Co., Ltd. • Privacy Policy • User Agreement
The core developers of SiYuan are D and V, and the community development contributors can be seen here
", + "about1": "Copyright (c) 2020-present • Yunnan Liandi Technology Co., Ltd. • Privacy Policy • User Agreement
The core developers of SiYuan are D and V, and the community development contributors can be seen here
", "about2": "Use on browser", "about3": "Please use the Chrome browser and keep it in the same network as the computer, port ${port}(In addition to the random port, the first started workspace will also automatically listen to 6806 as a fixed port, so that it is convenient for the browser to clip extensions or other external programs to call the kernel interface), the addresses that may be connected are as follows: ", "about4": "Open browser", @@ -1151,7 +1151,7 @@ "181": "The document has been shared to Liandi, click to view", "182": "Sharing document, please wait...", "183": "Validating index document tree [%d/%d %s]", - "184": "Powered by SiYuan", + "184": "Powered by SiYuan", "185": "Index verification complete", "186": "Locking cloud sync directory", "187": "Unlocking cloud sync directory", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index ca239ade9..4847a44df 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -670,9 +670,9 @@ "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": "", - "account9": "", + "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", @@ -687,7 +687,7 @@ "captcha": "Captcha", "register": "Crear una nueva cuenta", "login": "Iniciar sesión", - "accountTip": "He leído y estoy de acuerdo con la Política de privacidad de SiYuan", + "accountTip": "He leído y estoy de acuerdo con la Política de privacidad de SiYuan", "forgetPassword": "Olvidar la contraseña", "accountName": "Nombre de usuario/correo electrónico", "account": "Cuenta", @@ -830,7 +830,7 @@ "theme": "Tema", "language": "Idioma", "about": "Acerca de", - "about1": "Copyright (c) 2020-presente • Yunnan Liandi Technology Co., Ltd. • Política de privacidad • Acuerdo de usuario
Los principales desarrolladores de SiYuan son D y V, y los contribuyentes al desarrollo de la comunidad pueden verse aquí
", + "about1": "Copyright (c) 2020-presente • Yunnan Liandi Technology Co., Ltd. • Política de privacidad • Acuerdo de usuario
Los principales desarrolladores de SiYuan son D y V, y los contribuyentes al desarrollo de la comunidad pueden verse aquí
", "about2": "Uso en el navegador", "about3": "Por favor, utilice el navegador Chrome y manténgalo en la misma red que el ordenador, puerto ${port}(Además del puerto aleatorio, el primer espacio de trabajo iniciado también escuchará automáticamente 6806 como un puerto fijo, por lo que es conveniente que el navegador recorte extensiones u otros programas externos para llamar a la interfaz del kernel), las direcciones que se pueden conectar son las siguientes: ", "about4": "Abrir el navegador", @@ -1151,7 +1151,7 @@ "181": "El documento ha sido compartido con Liandi, haga clic para ver", "182": "Compartiendo documento, por favor espere...", "183": "Validando el árbol del documento de índice [%d/%d %s]", - "184": "Con la tecnología de SiYuan", + "184": "Con la tecnología de SiYuan", "185": "Verificación de índice completada", "186": "Bloqueando el directorio de sincronización de la nube", "187": "Desbloqueando el directorio de sincronización en la nube", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 76ffdae1e..55e60e60f 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -670,9 +670,9 @@ "account3": "Abonnement d'essai", "account5": "Hébergement d'actifs cloud", "account6": "Restant avant l'expiration de l'abonnement", - "account7": "Fonctions plus avancées", - "account8": "", - "account9": "", + "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", @@ -687,7 +687,7 @@ "captcha": "Code de vérification", "register": "Créer un nouveau compte", "login": "Login", - "accountTip": "J'ai lu et accepté Politique de confidentialité de SiYuan", + "accountTip": "J'ai lu et accepté Politique de confidentialité de SiYuan", "forgetPassword": "Mot de passe oublié", "accountName": "Nom d'utilisateur/Email", "account": "Compte", @@ -830,7 +830,7 @@ "theme": "Thème", "language": "Langue", "about": "À propos de", - "about1": "Copyright (c) 2020-présent • Yunnan Liandi Technology Co., Ltd. • Politique de confidentialité • Accord de l'utilisateur
Les principaux développeurs de SiYuan sont D et V, et les contributeurs au développement de la communauté peuvent être vus ici
", + "about1": "Copyright (c) 2020-présent • Yunnan Liandi Technology Co., Ltd. • Politique de confidentialité • Accord de l'utilisateur
Les principaux développeurs de SiYuan sont D et V, et les contributeurs au développement de la communauté peuvent être vus ici
", "about2": "Utiliser sur le navigateur", "about3": "Veuillez utiliser le navigateur Chrome et le garder sur le même réseau que l'ordinateur, port ${port}(En plus du port aléatoire, le premier espace de travail démarré écoutera également automatiquement 6806 en tant que port fixe, de sorte qu'il est pratique pour le navigateur de couper des extensions ou d'autres programmes externes pour appeler l'interface du noyau), les adresses pouvant être connectées sont les suivantes: ", "about4": "Ouvrir le navigateur", @@ -1151,7 +1151,7 @@ "181": "Le document a été partagé avec Liandi, cliquez pour afficher", "182": "Partage du document, veuillez patienter...", "183": "Validation de l'arborescence du document d'index [%d/%d %s]", - "184": "Propulsé par SiYuan", + "184": "Propulsé par SiYuan", "185": "Vérification de l'index terminée", "186": "Verrouillage du répertoire de synchronisation cloud", "187": "Déverrouillage du répertoire de synchronisation cloud", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index a1d55a63b..96af9cfaa 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -670,9 +670,9 @@ "account3": "試用訂閱", "account5": "雲端圖床服務", "account6": "距訂閱過期還剩", - "account7": "更多進階特性", - "account8": "", - "account9": "", + "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 d735dc16c..f377f60b4 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -670,7 +670,7 @@ "account3": "试用订阅", "account5": "云端图床服务", "account6": "距订阅过期还剩", - "account7": "更多高级特性", + "account7": "更多高级特性", "account8": "
\uD83C\uDFEB 教育优惠 6.4 折
", "account9": "
\uD83D\uDD25 两人团首年 6.4 折
", "account10": "年付订阅", diff --git a/app/electron/error.html b/app/electron/error.html index 5ec25ccca..0f38ae72b 100644 --- a/app/electron/error.html +++ b/app/electron/error.html @@ -141,7 +141,8 @@
@@ -175,7 +176,7 @@ document.getElementById('title').innerHTML = decodeURIComponent(getSearch('title')) document.getElementById('content').innerHTML = decodeURIComponent(getSearch('content')) document.querySelectorAll('.version').forEach(item => { - item.textContent = `🔖 v${getSearch('v')}` + item.textContent = `v${getSearch('v')}` }) document.getElementById('close').addEventListener('click', () => { diff --git a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy index 9a56b97cb..e2def30ff 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy @@ -1835,7 +1835,7 @@ { "Type": "NodeTextMark", "TextMarkType": "a", - "TextMarkAHref": "https://b3log.org/siyuan/pricing.html", + "TextMarkAHref": "https://b3log.org/siyuan/en/pricing.html", "TextMarkTextContent": "Cloud Service" }, { @@ -1888,4 +1888,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/app/src/config/account.ts b/app/src/config/account.ts index 35b96ff7b..91bf59064 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -14,33 +14,29 @@ import {getCloudURL} from "./util/about"; export const account = { element: undefined as Element, - genHTML: () => { - let sponsor = "https://ld246.com/sponsor"; - if ("zh_CN" !== window.siyuan.config.lang) { - sponsor = ""; - } - let payHTML = ` + genHTML: (onlyPayHTML = false) => { + const payHTML = ` ${window.siyuan.languages.account1}
-${window.siyuan.languages.account8} -${window.siyuan.languages.account9} +${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}
+
${window.siyuan.languages.account7}
${window.siyuan.languages.freeSub}
-`; - if ("" !== sponsor) { - payHTML += ` + ${window.siyuan.languages.sponsor} `; + if (onlyPayHTML) { + return `
${payHTML}
` } if (window.siyuan.user) { let userTitlesHTML = ""; @@ -72,8 +68,8 @@ ${window.siyuan.languages.account2} subscriptionHTML = `
${window.siyuan.languages.account3}
${renewHTML}
-${window.siyuan.languages.account8} -${window.siyuan.languages.account9} +${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}`; @@ -142,8 +138,8 @@ ${window.siyuan.languages.account9}
@@ -327,8 +323,13 @@ ${window.siyuan.languages.account9} captchaImgElement.addEventListener("click", () => { captchaImgElement.setAttribute("src", `https://ld246.com/captcha/login?needCaptcha=${needCaptcha}&t=${new Date().getTime()}`); }); + + const cloudRegionElement = element.querySelector("#cloudRegion") as HTMLSelectElement; + cloudRegionElement.addEventListener("change", () => { + window.siyuan.config.cloudRegion = parseInt(cloudRegionElement.value); + element.querySelector(".config-account__center--text").innerHTML = account.genHTML(true); + }); loginBtnElement.addEventListener("click", () => { - window.siyuan.config.cloudRegion = parseInt((element.querySelector("#cloudRegion") as HTMLSelectElement).value) fetchPost("/api/account/login", { userName: userNameElement.value.replace(/(^\s*)|(\s*$)/g, ""), userPassword: md5(userPasswordElement.value),