efront 3.36.0 → 3.36.1

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

@@ -0,0 +1,137 @@
+- zh-CN:    服务器异常$1
+  en:    Server Exception $1
+
+- zh-CN:    $1之前需要使用$2命令在$3上设置$4
+  en:    Before $1, you need to use the $2 command to set $4 on $3
+
+- zh-CN:    请输入服务器密码
+  en:    Please enter the server password
+
+- zh-CN:    登录
+  en:    Sign in
+
+- zh-CN:    文本超长，无法翻译
+  en:    The text is too long to be translated
+
+- zh-CN:    没有权限！
+  en:    No permission!
+
+- zh-CN:    未找到指定的资源
+  en:    The specified resource was not found
+
+- zh-CN:    原始名称
+  en:    Original Name
+
+- zh-CN:    输入新名称
+  en:    Enter a new name
+
+- zh-CN:    请过一段时间再试
+  en:    Please try again later
+
+- zh-CN:    服务器取消了您的请求
+  en:    The server canceled your request
+
+- zh-CN:    文件
+  en:    file
+
+- zh-CN:    键名
+  en:    Key Name
+
+- zh-CN:    显示名
+  en:    Display Name
+
+- zh-CN:    密钥
+  en:    secret key
+
+- zh-CN:    备注
+  en:    remarks
+
+- zh-CN:    任务ID
+  en:    Task ID
+
+- zh-CN:    任务名
+  en:    Task Name
+
+- zh-CN:    是否启用
+  en:    Enabled or not
+
+- zh-CN:    任务代码
+  en:    Task Code
+
+- zh-CN:    标识
+  en:    identification
+
+- zh-CN:    应用名
+  en:    App Name
+
+- zh-CN:    路径
+  en:    route
+
+- zh-CN:    代理路径
+  en:    Proxy Path
+
+- zh-CN:    二维码
+  en:    QR code
+
+- zh-CN:    真实路径
+  en:    Real path
+
+- zh-CN:    动作
+  en:    action
+
+- zh-CN:    状态
+  en:    state
+
+- zh-CN:    地址
+  en:    address
+
+- zh-CN:    地理位置
+  en:    geographical position
+
+- zh-CN:    启动时间
+  en:    Start time
+
+- zh-CN:    端口
+  en:    port
+
+- zh-CN:    版本
+  en:    edition
+
+- zh-CN:    进程
+  en:    process
+
+- zh-CN:    访问量
+  en:    Visits
+
+- zh-CN:    房间名
+  en:    Room name
+
+- zh-CN:    数值
+  en:    numerical value
+
+- zh-CN:    文本
+  en:    text
+
+- zh-CN:    字典ID
+  en:    Dictionary ID
+
+- zh-CN:    字典名
+  en:    Dictionary name
+
+- zh-CN:    字典数据
+  en:    Dictionary data
+
+- zh-CN:    名称
+  en:    name
+
+- zh-CN:    服务器
+  en:    The server
+
+- zh-CN:    服务器地址
+  en:    server address
+
+- zh-CN:    密码
+  en:    password
+
+- zh-CN:    这是一个空白项目
+  en:    This is a blank project

package/apps/pivot/auth/login.html

@@ -1,12 +1,12 @@
 <div head>
-    请输入服务器密码
+    ${i18n`请输入服务器密码`}
 </div>
 <div body>
     <field ng-repeat="f in fields" ng-src="[f,data]"></field>
 </div>
 <div foot>
-    <button pending.="pending" type="submit">登录</button>
+    <button pending.="pending" type="submit">${i18n`登录`}</button>
 </div>
 <div message>
-    登录之前需要使用&nbsp;<b>efront password</b>&nbsp;命令在服务器上设置密码
+    ${i18n`${i18n`登录`}之前需要使用${`&nbsp;<b>efront password</b>&nbsp;`}命令在${i18n`服务器`}上设置${i18n`密码`}`}
 </div>

package/coms/basic/i18n.js

@@ -12,9 +12,11 @@ var getLanguageIndexFromName = function (language) {
     if (isFinite(language)) return language;
     if (language in languageMap) return languageMap[language];
     language = String(language).toLowerCase();
-    for (var k in languageMap) {
-        for (var kk of k.toLowerCase().split("-")) {
-            if (language.indexOf(kk) >= 0) return languageMap[k];
+    for (var l of language.split(",").slice(0, 12)) {
+        for (var k in languageMap) {
+            for (var kk of k.toLowerCase().split("-")) {
+                if (l.indexOf(kk) >= 0) return languageMap[k];
+            }
         }
     }
     return languageIndex;

package/coms/basic/refilm_decode.js

@@ -386,7 +386,7 @@ function parse(piece) {
         } else if (/^[\/]/.test(type)) {
             type = type.slice(1);
         }
-        if (typeof options === "string" && !/^\$#\d+$/.test(options)) {
+        if (typeof options === "string" && !/^[\$#]+\d+$/.test(options)) {
             console.log(options)
             options = is(options);
             var needUnfold = /^\[|\]$/.test(options);

package/coms/compile/translate.js

@@ -4,7 +4,7 @@ var strings = require("../basic/strings");
 var program = null;
 var patchTranslate = function (c) {
     if (c.length) {
-        c.translate = c.map((o, i) => o.type === PIECE ? strings.decode(`\`${o.text}\``) : ` $#${i + 1 >> 1} `).join('');
+        c.translate = c.map((o, i) => o.type === PIECE ? strings.decode(`\`${o.text}\``) : `$${i + 1 >> 1}`).join('');
     }
     else {
         if (/^['"`]/.test(c.text) && c.text.length > 2) {
@@ -66,7 +66,12 @@ function getI18nPrefixedText(code, dist = []) {
 
 function translate([imap, supports], code) {
     var texts = getI18nPrefixedText(code);
+    texts.sort((a, b) => {
+        if (a.start > b.start && a.end < b.end) return -1;
+        return 0;
+    });
     var getm = function (tt) {
+        tt = tt.trim();
         if (!imap[tt]) {
             console.warn(`<yellow>国际化翻译缺失：</yellow>${tt}`);
             imap[tt] = supports.map(_ => tt);
@@ -83,9 +88,9 @@ function translate([imap, supports], code) {
                 p.leave = ")";
             }
             var tt = t.translate;
-            replace(t, ...scanner2(`(${getm(tt)})`.replace(/\$#(\d+)/g, (_, i) => {
+            replace(t, ...scanner2(`(${getm(tt)})`.replace(/[\$#]+(\d+)/g, (_, i) => {
                 var a = (i << 1) - 1;
-                if (a in t) return createString(t[a]);
+                if (a in t) return `\${${createString(t[a])}}`;
                 return _;
             })));
         }
@@ -101,7 +106,7 @@ function translate([imap, supports], code) {
             t.queue.splice(i, e + 1 - i, ...scanner2("[" + t.fields.map(f => {
                 return "{" + Object.keys(f).map(k => {
                     var v = f[k];
-                    if (/\$#\d+/.test(v)) v = v.replace(/\$#(\d+)/g, (_, i) => {
+                    if (/[\$#]\d+/.test(v)) v = v.replace(/[\$#]+(\d+)/g, (_, i) => {
                         var a = (i << 1) - 1;
                         if (a in t) return createString(t[a]);
                         return _;

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -34,8 +34,8 @@
         background: #069 !important;
     }
 
-    span,
-    a {
+    p span,
+    p a {
         vertical-align: middle;
     }
 </style>
@@ -333,7 +333,7 @@
                 data = compile$wraphtml(htmltext) + ";\r\n" + scripts.join("\r\n");
             }
             else if (/\.html?$/i.test(e.name)) {
-                data = compile$wraphtml(htmltext);
+                data = compile$wraphtml(data);
             }
             var code = compile$scanner2(String(data));
             return compile$translate.getI18nPrefixed(code);
@@ -519,32 +519,30 @@
         for (var e of pretrans) {
             var data = await readText(e);
             data = parseYML(data);
-            for (var d of data) {
-                for (var k in d) {
+            loop: for (var d of data) {
+                var liang = 0, fanyi = {};
+                for (var { lang: k, id } of supports) {
+                    if (!d[k]) continue;
+                    if (preMap[d[k]]) continue loop;
                     preMap[d[k]] = d;
+                    liang++;
+                    fanyi[id] = d[k];
                 }
+                result.push({ text: d[supports[0].lang], fanyi, liang });
             }
         }
+        var untrans = [];
         Object.keys(textMap).map(k => {
             var texts = textMap[k];
             var count = texts["#count"];
             delete texts["#count"];
             var files = Object.keys(texts);
-            var liang = 0;
-            if (k in preMap) {
-                var fanyi = {};
-                detailScope.supports.forEach(s => {
-                    var v = preMap[k][s.lang]
-                    if (v) {
-                        fanyi[s.id] = v;
-                        liang++;
-                    }
-                })
-            }
-            result.push({ text: k, occurs: texts, files: files.join(',\r\n'), count, fanyi, liang });
+            k = k.trim();
+            if (k in preMap) return;
+            untrans.push({ text: k, occurs: texts, files: files.join(',\r\n'), count });
         });
 
-        已找到的字符串 = result;
+        已找到的字符串 = untrans.concat(result);
         runFilter();
     }
     var exportCSV = async function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.36.0",
+    "version": "3.36.1",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {