efront 4.23.9 → 4.24.0

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,231 @@
+- zh-CN: 密钥管理
+  en:    Key Management
+
+- zh-CN: 任务
+  en:    task
+
+- zh-CN: 执行
+  en:    execute
+
+- zh-CN: 正在执行..
+  en:    Executing
+
+- zh-CN: 完成！
+  en:    Done!
+
+- zh-CN: 任务管理
+  en:    task management
+
+- zh-CN: 同步
+  en:    synchronous
+
+- zh-CN: 同步完成！
+  en:    Synchronization completed!
+
+- zh-CN: 同步任务
+  en:    Synchronize tasks
+
+- zh-CN: 当前
+  en:    current
+
+- zh-CN: 短链接
+  en:    Short Link
+
+- zh-CN: 访问
+  en:    visit
+
+- zh-CN: 自动刷新
+  en:    auto refresh
+
+- zh-CN: 新建连接
+  en:    make new connection
+
+- zh-CN: 房间
+  en:    room
+
+- zh-CN: 会话
+  en:    conversation
+
+- zh-CN: 连接
+  en:    connect
+
+- zh-CN: 未知
+  en:    unknown
+
+- zh-CN: 字典
+  en:    dictionary
+
+- zh-CN: 接口管理
+  en:    Interfaces
+
+- zh-CN: DHT服务器管理
+  en:    DHT Server Management
+
+- zh-CN: 从文件读取
+  en:    Read from file
+
+- zh-CN: 当前浏览器无法读取文件
+  en:    The current browser is unable to read the file
+
+- zh-CN: 读取文件失败！
+  en:    Failed to read file!
+
+- zh-CN: 请在支持window.crypto.subtle的浏览器上使用此页面的功能
+  en:    Please use the functionality of this page on browsers that support window.crypto.subtle
+
+- zh-CN: 检查账户
+  en:    Check account
+
+- zh-CN: 从证书列表同步
+  en:    Synchronize from certificate list
+
+- zh-CN: 暂无订单
+  en:    No orders at the moment
+
+- zh-CN: 删除订单
+  en:    Delete Order
+
+- zh-CN: 刷新
+  en:    Refresh
+
+- zh-CN: 提交审核
+  en:    Submit for review
+
+- zh-CN: 请求证书
+  en:    Request certificate
+
+- zh-CN: 查看证书
+  en:    View Certificate
+
+- zh-CN: 上传到服务器
+  en:    Upload to server
+
+- zh-CN: 订单异常
+  en:    Order exception
+
+- zh-CN: 执行更新
+  en:    Perform updates
+
+- zh-CN: 替换证书
+  en:    Replace Certificate
+
+- zh-CN: 保存计划
+  en:    Save Plan
+
+- zh-CN: 无法在当前浏览器操作！
+  en:    Cannot operate in the current browser!
+
+- zh-CN: 无法在当前浏览器操作!
+  en:    Cannot operate in the current browser!
+
+- zh-CN: 您确定要这么做吗？
+  en:    Are you sure you want to do this?
+
+- zh-CN: 当前操作需要您再次确认
+  en:    The current operation requires your confirmation again
+
+- zh-CN: 操作
+  en:    operate
+
+- zh-CN: 暂不支持跨服务器操作！
+  en:    Cross server operations are not currently supported!
+
+- zh-CN: 确认取消
+  en:    Confirm Cancel
+
+- zh-CN: 服务器版本
+  en:    Server version
+
+- zh-CN: nodejs版本
+  en:    Node.js version
+
+- zh-CN: 操作系统
+  en:    operating system
+
+- zh-CN: 处理器
+  en:    processor
+
+- zh-CN: 清理服务器缓存
+  en:    Clean up server cache
+
+- zh-CN: 重启服务器
+  en:    Restart the server
+
+- zh-CN: 重启
+  en:    Restart
+
+- zh-CN: 内存
+  en:    Memory
+
+- zh-CN: 可用
+  en:    available
+
+- zh-CN: 总内存
+  en:    total memory
+
+- zh-CN: 搜索或添加
+  en:    Search or add
+
+- zh-CN: 删除
+  en:    delete
+
+- zh-CN: 管理
+  en:    manage
+
+- zh-CN: 选项 $1 已存在！
+  en:    Option $1 already exists!
+
+- zh-CN: 切换语言
+  en:    switch language
+
+- zh-CN: 中文简体
+  en:    Simplified Chinese
+
+- zh-CN: 中文繁体
+  en:    traditional Chinese
+
+- zh-CN: 英文
+  en:    English
+
+- zh-CN: 葡萄牙语
+  en:    Portuguese
+
+- zh-CN: 波兰语
+  en:    Polish
+
+- zh-CN: 测试
+  en:    test
+
+- zh-CN: 全部测试
+  en:    All Tests
+
+- zh-CN: 添加可用链接
+  en:    Add available links
+
+- zh-CN: 配置
+  en:    configuration
+
+- zh-CN: 添加动作
+  en:    Add action
+
+- zh-CN: 编辑数据
+  en:    Edit Data
+
+- zh-CN: 请求方法错误
+  en:    Request method error
+
+- zh-CN: 商品数量过多，无法完成交易！
+  en:    "Too many products, unable to complete transaction!"
+
+- zh-CN: 商品信息已变更，请刷新页面后重新购买！
+  en:    The product information has been changed. Please refresh the page and make a new purchase!
+
+- zh-CN: 商品金额过大，交易无法进行
+  en:    "The amount of the product is too large, and the transaction cannot proceed"
+
+- zh-CN: 商品总价值过大，交易无法进行
+  en:    "The total value of the product is too high, and the transaction cannot proceed"
+
 - zh-CN: $1仅在开发环境存在，供开发者调试查看，$2
   en:    "$1 only exists in the development environment for developers to debug and view, $2"
 
@@ -2319,3 +2547,12 @@
 
 - zh-CN: 这是一个空白项目
   en:    This is a blank project
+
+- zh-CN: menu.yml
+  en:    menu-en.yml
+
+- zh-CN: menu.yml
+  en:    menu-en.yml
+
+- zh-CN: menu.yml
+  en:    menu-en.yml

package/apps/pivot/#/345/233/275/351/231/205/345/214/226.yml

@@ -0,0 +1,2 @@
+- zh-CN: menu.yml
+  en:    menu-en.yml

package/apps/pivot/auth/login.html

@@ -9,4 +9,5 @@
 </div>
 <div message>
     ${i18n`${i18n`登录`}之前需要使用${`&nbsp;<b>efront password</b>&nbsp;`}命令在${i18n`服务器`}上设置${i18n`密码`}`}
-</div>
+</div>
+<i18n-chooser></i18n-chooser>

package/apps/pivot/auth/login.js

@@ -13,6 +13,7 @@ function main(host) {
         move.bindPosition(page, [.5, .5]);
     });
     renderWithDefaults(page, {
+        i18nChooser,
         fields, data: {
             host: host ? parseURL(host).host : data.getInstance("base").host || location.host,
         }, pending: false

package/apps/pivot/auth/login.less

@@ -22,6 +22,7 @@
     font-size: 12px;
 }
 
+
 .button {
     padding: 0px 40px;
 }

package/apps/pivot/cert/edit.js

@@ -1 +1 @@
-pedit.bind(null, "证书", "cert");
+pedit.bind(null, i18n`证书`, "cert");

package/apps/pivot/cert/list.js

@@ -1,4 +1,4 @@
-plist.bind(null, '接口管理', "cert", refilm`
+plist.bind(null, i18n`接口管理`, "cert", refilm`
 *域名/hostname input/253
 公钥/private text
 私钥/public text

package/apps/pivot/cert/main.xht

@@ -76,7 +76,7 @@
 </form>
 <script>
     var enabled = acme2.enabled;
-    if (!enabled) return ["请在支持window.crypto.subtle的浏览器上使用此页面的功能"];
+    if (!enabled) return [i18n`请在支持window.crypto.subtle的浏览器上使用此页面的功能`];
     var form = view;
     var activeIndex = 0;
     var nosubmit = e => e.preventDefault();
@@ -147,7 +147,7 @@
                 }}
             *邮箱/email email
             /termsOfServiceAgreed/同意 checker ${{
-                    async"《服务条款》"(data) {
+                    async"Let’s Encrypt Subscriber Agreement"(data) {
                         var termsOfService = await acme2.getTermsOfService();
                         if (termsOfService) window.open(termsOfService, "_blank", "popup,noopener,noreferer")
                     },
@@ -157,7 +157,7 @@
                 return formdata.kid ? i18n`已创建账户` : '';
             },
             options: {
-                async 检查账户(actived) {
+                async [i18n`检查账户`](actived) {
                     var params = submit(actived.fields, formdata);
                     await saveUnique(params);
                     formdata.kid = await acme2.getAccount(params);
@@ -165,7 +165,7 @@
                 },
             },
             actions: {
-                async 创建账户(actived) {
+                async [i18n`创建账户`](actived) {
                     if (formdata.kid) {
                         if (!await confirm(i18n`您已创建账户，请确认是否重新创建？`)) return;
                     }
@@ -186,13 +186,13 @@
             *当前服务器的域名/domain/每行一个，不支持泛域名 text
             `,
             options: {
-                async 从证书列表同步() {
+                async [i18n`从证书列表同步`]() {
                     var a = await plist.load('cert', 'hostname');
                     formdata.domain = a.map(a => a.hostname).join('\r\n');
                 }
             },
             actions: {
-                async 创建订单(actived) {
+                async [i18n`创建订单`](actived) {
                     var params = submit(actived.fields, formdata);
                     await acme2.newOrder(params);
                     await saveUnique();

package/apps/pivot/cert/orders.xht

@@ -57,23 +57,23 @@
 </style>
 <xmenu -src="o of orders" @active="openOrder(o)"></xmenu>
 <div -if="!order">
-    暂无订单
+    ${i18n`暂无订单`}
 </div>
 <form -elseif="order.oid" onsubmit="event.preventDefault()">
     <div body>
         <field -repeat="f in fields" _src="[f,order]"></field>
     </div>
     <div foot>
-        <button -if="order?.removable" class="danger" confirm @click="dropOrder(order)">删除订单</button>
-        <button -if="order.status==='processing'" @click="openOrder(order)">刷新</button>
-        <button -if="order.status==='pending'" @click="auditOrder(order)">提交审核</button>
-        <button -if="order.status==='ready'" @click="finalize(order)">请求证书</button>
-        <button -if="order.status==='valid'" @click="see(order)">查看证书</button>
-        <button -if="order.shouldupload" @click="upload(order)">上传到服务器</button>
+        <button -if="order?.removable" class="danger" confirm @click="dropOrder(order)">${i18n`删除订单`}</button>
+        <button -if="order.status==='processing'" @click="openOrder(order)">${i18n`刷新`}</button>
+        <button -if="order.status==='pending'" @click="auditOrder(order)">${i18n`提交审核`}</button>
+        <button -if="order.status==='ready'" @click="finalize(order)">${i18n`请求证书`}</button>
+        <button -if="order.status==='valid'" @click="see(order)">${i18n`查看证书`}</button>
+        <button -if="order.shouldupload" @click="upload(order)">${i18n`上传到服务器`}</button>
     </div>
 </form>
 <div -else>
-    订单异常
+    ${i18n`订单异常`}
 </div>
 <script>
     var fields = refilm`

package/apps/pivot/cert/update.xht

@@ -3,9 +3,9 @@
         <field -repeat="f in fields" -src="[f,acme2]"></field>
     </div>
     <div foot>
-        <a confirm @click="autoUpdate()">执行更新</a>
-        <a @click="updateCert()">替换证书</a>
-        <button @click="saveSchadule()">保存计划</button>
+        <a confirm @click="autoUpdate()">${i18n`执行更新`}</a>
+        <a @click="updateCert()">${i18n`替换证书`}</a>
+        <button @click="saveSchadule()">${i18n`保存计划`}</button>
     </div>
 </form>
 <script>

package/apps/pivot/db/config.xht

@@ -48,7 +48,7 @@
                 <div a.name?></div>
             </div>
         </padding>
-        <a insert @click="editAction(null)">添加动作</a>
+        <a insert @click="editAction(null)">${i18n`添加动作`}</a>
     </lattice>
 </div>
 <div foot>

package/apps/pivot/db/edit.xht

@@ -34,8 +34,8 @@
     }
 </style>
 <div head>
-    编辑数据 - <span -bind="db.name"></span>
-    <a @click="add">添加</a>
+    ${i18n`编辑数据`} - <span -bind="db.name"></span>
+    <a @click="add">${i18n`添加`}</a>
 </div>
 
 <lattice body -src="m in items">

package/apps/pivot/db/list.xht

@@ -25,13 +25,13 @@
     }
 </style>
 <lattice body a-src="db in dbs">
-    <div insert><a @click="adddb">添加</a></div>
+    <div insert><a @click="adddb">${i18n`添加`}</a></div>
     <padding db>
         <div>
             <h2> ⩸ </h2>
             <h2 -bind="db.name"></h2>
-            <a @click="go('/db/edit',db)">查看</a>
-            <a @click="go('/db/config',db)">配置</a>
+            <a @click="go('/db/edit',db)">${i18n`查看`}</a>
+            <a @click="go('/db/config',db)">${i18n`配置`}</a>
             <drop @click.singly.stop="deldb(db)"></drop>
         </div>
     </padding>
@@ -53,7 +53,7 @@
         await load();
     };
     var deldb = async function (db) {
-        var a = await prompt(i18n`输入名称以确认删除`, ["删除#danger", '取消'], a => a === db.name, {
+        var a = await prompt(i18n`输入名称以确认删除`, [i18n`删除` + "#danger", i18n`取消`], a => a === db.name, {
             async submit(v) {
                 await data.from('dbdel', { id: v });
             }

package/apps/pivot/dht/list.js

@@ -12,11 +12,11 @@ var fields = refilm`名称/name
 return plist.bind({
     fields,
     type: 'nodes',
-    title: "DHT服务器管理",
+    title: i18n`DHT服务器管理`,
     buttons: [{
-        name: "从文件读取", async do() {
+        name: i18n`从文件读取`, async do() {
             var FileReader = window.FileReader;
-            if (!FileReader) return alert('当前浏览器无法读取文件', 'warn')
+            if (!FileReader) return alert(i18n`当前浏览器无法读取文件`, 'warn')
             var f = await chooseFile(".torrent", true);
             var pg = await popup("/dht/rent");
             var scope = $scoped.get(pg);
@@ -34,7 +34,7 @@ return plist.bind({
                     ok();
                 };
                 r.onerror = function () {
-                    alert("读取文件失败！", 'error');
+                    alert(i18n`读取文件失败！`, 'error');
                     oh();
                 };
                 r.readAsArrayBuffer(f);

package/apps/pivot/dict/edit.js

@@ -1 +1 @@
-pedit.bind(null, "字典", "dict");
+pedit.bind(null, i18n`字典`, "dict");

package/apps/pivot/dict/list.js

@@ -5,7 +5,7 @@ var types = refilm`
 model.setModels({
     dict: frame$dict.bind(null, types),
 });
-return plist.bind(null, '接口管理', "dict", refilm`
+return plist.bind(null, i18n`接口管理`, "dict", refilm`
 *字典ID/key 100
 字典名/name 100
 字典数据/options dict

package/apps/pivot/home/welcome.html

@@ -2,34 +2,37 @@
 </block>
 <block>
     <padding>
-        服务器版本&nbsp;&nbsp;<span -text="String(version)"></span>
+        ${i18n`服务器版本`}&nbsp;&nbsp;<span -text="String(version)"></span>
     </padding>
     <padding>
-        nodejs版本&nbsp;&nbsp;<span -text="String(nodeVersion)"></span>
+        ${i18n`nodejs版本`}&nbsp;&nbsp;<span -text="String(nodeVersion)"></span>
     </padding>
     <padding>
-        操作系统&nbsp;&nbsp;<span -text="String(platform)"></span>
+        ${i18n`操作系统`}&nbsp;&nbsp;<span -text="String(platform)"></span>
     </padding>
     <padding>
-        处理器&nbsp;&nbsp;<span -text="String(arch)"></span>
+        ${i18n`处理器`}
+        &nbsp;&nbsp;<span -text="String(arch)"></span>
     </padding>
 </block>
 <block>
     <padding>
-        清理服务器缓存 <btn @click="run('clear-cache',this)">清理</btn>
+        ${i18n`清理服务器缓存`}
+        <btn @click="run('clear-cache',this)">${i18n`清理`}</btn>
     </padding>
     <padding>
-        重启服务器 <btn @click="run('rehost',this)" confirm type="danger">重启</btn>
+        ${i18n`重启服务器`}
+        <btn @click="run('rehost',this)" confirm type="danger">${i18n`重启`}</btn>
     </padding>
 </block>
 <block>
     <padding>
-        启动时间&nbsp;&nbsp;<span -text="filterTime(hrtime)"></span>
+        ${i18n`启动时间`}&nbsp;&nbsp;<span -text="filterTime(hrtime)"></span>
     </padding>
     <padding>
-        内存 <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>
+        ${i18n`内存`} <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>
         <span style="color: #999;">
-            可用<span -bind="size(memery[0])"></span> / 总内存<span -bind="size(memery[1])"></span>
+            ${i18n`可用`} <span -bind="size(memery[0])"></span> / ${i18n`总内存`}<span -bind="size(memery[1])"></span>
         </span>
     </padding>
 </block>

package/apps/pivot/home/welcome.js

@@ -8,9 +8,9 @@ function main() {
         filterTime,
         memeryUsed: 0,
         memery: [0, 1],
-        platform: '未知',
-        arch: '未知',
-        nodeVersion: "未知",
+        platform: i18n`未知`,
+        arch: i18n`未知`,
+        nodeVersion: i18n`未知`,
         size,
         progbar,
         async run(id) {

package/apps/pivot/link/index.js

@@ -2,10 +2,13 @@ function index() {
     var page = document.createElement('link-index');
     page.innerHTML = template;
     renderWithDefaults(page, {
-        menus: "房间 /link/room, 会话 /link/list".split(/\s*,\s*/).map(a => {
-            var [name, path] = a.split(/\s+/);
-            return { name, path };
-        }),
+        menus: [{
+            name: i18n`房间`,
+            path: '/link/room'
+        }, {
+            name: i18n`会话`,
+            path: '/link/list'
+        }],
         saveIndex(index) {
             data.setInstance('link-index', index);
         },

package/apps/pivot/link/list.html

@@ -16,10 +16,10 @@
 </style>
 <div head>
     <span>
-        自动刷新
+        ${i18n`自动刷新`}
     </span>
     <swap -model="autoreload"></swap>
-    <btn @click="chat()">新建连接</btn>
+    <btn @click="chat()">${i18n`新建连接`}</btn>
 </div>
 <div class="clusters">
     <a -repeat="(c,i) in clusters" ng-class="{current:i===index.index}" @click="active(i,c)">

package/apps/pivot/link/room.js

@@ -1,7 +1,7 @@
-plist.bind(null, '房间', "room", refilm`
+plist.bind(null, i18n`房间`, "room", refilm`
 *房间名/name 100
 / $ ${[{
-        name: "连接",
+        name: i18n`连接`,
         async do(o) {
             var linkid = await data.from("room", { id: encode62.packencode(o.name) });
             popup("/link/chat", { linkid, name: o.name });

package/apps/pivot/main.js

@@ -1,3 +1,5 @@
+frame$route.update(await data.fromURL(i18n`menu.yml`));
+i18n.setReloader(zimoli.reload);
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
 var login_queue = [], reject_queue = [];

package/apps/pivot/menu-en.yml

@@ -0,0 +1,16 @@
+Home Page: /home/welcome
+WEB:
+  Path Redirects: /proxy/list
+  File Manager: /wow/root
+  Data Manager: /db/list
+  Living Link: /link/index
+  # Dictionary: /dict/list
+  Cert Manager: /cert/main
+  Shared Path: /share/list
+Service:
+  Key Manager: /token/list
+  Task Manager: /task/list
+Logs:
+  Visit Count: /log/count
+  Boot Log: /log/boot
+# Shop: /shop/home

package/apps/pivot/proxy/edit.js

@@ -1 +1 @@
-pedit.bind(null, "短链接", "proxy");
+pedit.bind(null, i18n`短链接`, "proxy");

package/apps/pivot/proxy/list.js

@@ -1,6 +1,6 @@
 var actions = [
     {
-        name: "访问",
+        name: i18n`访问`,
         do(o) {
             var url = o.url;
             if (!/\//.test(url)) url = "//" + url;
@@ -16,4 +16,4 @@ var fields = refilm`
 动作/action select/100 [跳转,转发]
 状态/status select/100 [启用,禁用]
 / $ ${actions}`;
-return plist.bind(null, '短链接', "proxy", fields, "/proxy/edit");
+return plist.bind(null, i18n`短链接`, "proxy", fields, "/proxy/edit");

package/apps/pivot/share/edit.html

@@ -1,10 +1,10 @@
-<div head>修改</div>
+<div head>${i18n`修改`}</div>
 <div body>
     <form>
         <field -repeat="f in fields" -src="[f,data]"></field>
     </form>
 </div>
 <div foot>
-    <btn white @click="close()">取消</btn>
-    <button @click="save()"> 保存 </button>
+    <btn white @click="close()">${i18n`取消`}</btn>
+    <button @click="save()"> ${i18n`保存`} </button>
 </div>

package/apps/pivot/share/list.js

@@ -5,7 +5,7 @@ function main() {
     var options = [
         {
             name(e) {
-                return this.confirm === e ? "确认取消" : "取消"
+                return this.confirm === e ? i18n`确认取消` : i18n`取消`
             },
             type: 'danger',
             confirm: false,
@@ -32,7 +32,7 @@ function main() {
             });
         },
         fields: fields.concat({
-            name: "操作",
+            name: i18n`操作`,
             width: 200,
             type: 'button',
             options,
@@ -42,7 +42,7 @@ function main() {
     scope.load();
     contextmenu(page, [
         {
-            name: "添加",
+            name: i18n`添加`,
             do(e) {
                 zimoli.prepare("/share/edit", function () {
                     var p = popup("/share/edit", { fields });

package/apps/pivot/task/edit.js

@@ -1 +1 @@
-pedit.bind(null, "任务", "task");
+pedit.bind(null, i18n`任务`, "task");