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

app/appearance/langs/en_US.json

@@ -850,7 +850,7 @@
   "refreshUser": "User information refreshed",
   "insertBottom": "Open Below the Tab",
   "insertRight": "Open Right the Tab",
-  "account1": "Click to subscribe",
+  "account1": "Become a paid member",
   "account2": "End-to-end encrypted data sync and backup",
   "account3": "Trial Subscription",
   "account5": "Cloud assets hosting",

app/appearance/langs/es_ES.json

@@ -850,7 +850,7 @@
   "refreshUser": "Información del usuario actualizada",
   "insertBottom": "Abrir debajo de la pestaña",
   "insertRight": "Abrir a la derecha la pestaña",
-  "account1": "Haga clic para suscribirse",
+  "account1": "Conviértete en miembro pago",
   "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",

app/appearance/langs/fr_FR.json

@@ -850,7 +850,7 @@
   "refreshUser": "Les informations sur l'utilisateur ont été actualisées",
   "insertBottom": "Ouvrir en bas de l'onglet",
   "insertRight": "Ouvrir en droit de l'onglet",
-  "account1": "Cliquez pour vous abonner",
+  "account1": "Devenez membre payant",
   "account2": "Synchronisation et sauvegarde des données cryptées de bout en bout",
   "account3": "Abonnement d'essai",
   "account5": "Hébergement d'actifs cloud",

app/appearance/langs/zh_CHT.json

@@ -850,7 +850,7 @@
   "refreshUser": "使用者資訊更新完畢",
   "insertBottom": "在分頁下側打開",
   "insertRight": "在分頁右側打開",
-  "account1": "點擊前往訂閱",
+  "account1": "成為付費會員",
   "account2": "端到端加密資料同步和備份",
   "account3": "試用訂閱",
   "account5": "雲端圖床服務",

app/appearance/langs/zh_CN.json

@@ -850,7 +850,7 @@
   "refreshUser": "用户信息刷新完毕",
   "insertBottom": "在页签下侧打开",
   "insertRight": "在页签右侧打开",
-  "account1": "点击前往订阅",
+  "account1": "成为付费会员",
   "account2": "端到端加密数据同步和备份",
   "account3": "试用订阅",
   "account5": "云端图床服务",

app/src/config/account.ts

@@ -10,7 +10,7 @@ import {processSync} from "../dialog/processSystem";
 import {needSubscribe} from "../util/needSubscribe";
 import {syncGuide} from "../sync/syncGuide";
 import {hideElements} from "../protyle/ui/hideElements";
-import {getCloudURL} from "./util/about";
+import {getCloudURL, getIndexURL} from "./util/about";
 
 const genSVGBG = () => {
     let html = "";
@@ -30,7 +30,7 @@ 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">
+<a class="b3-button b3-button--big" href="${getIndexURL("pricing.html")}" target="_blank">
     <svg><use xlink:href="#iconVIP"></use></svg>${window.siyuan.languages.account1}
 </a>
 <div class="fn__hr--b"></div>

app/src/config/util/about.ts

@@ -35,3 +35,8 @@ export const getCloudURL = (key: string) => {
     const origin = window.siyuan.config.cloudRegion === 0 ? "https://ld246.com" : "https://liuyun.io";
     return `${origin}/${key}`;
 };
+
+export const getIndexURL = (key: string) => {
+    const lang = 'zh_CN' === window.siyuan.config.lang ? "" : "/en";
+    return 'https://b3log.org/siyuan' + `${lang}/${key}`;
+}