From c7f2bd2576c5ab34ade03e75c95b531258bfcb70 Mon Sep 17 00:00:00 2001
From: wxzhang <wxzhang@126.com>
Date: Mon, 21 Mar 2022 16:11:05 +0800
Subject: [PATCH] update

---
 packages/runtime/index.js | 16 ++++++++++------
 packages/tools/.env       |  2 --
 packages/tools/index.js   | 11 ++++++++++-
 3 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 100644 packages/tools/.env

diff --git a/packages/runtime/index.js b/packages/runtime/index.js
index 286df8e..48fd935 100644
--- a/packages/runtime/index.js
+++ b/packages/runtime/index.js
@@ -518,7 +518,7 @@ function translate(message) {
                     }
                 } 
                 // 以$开头的视为复数变量
-                if(name.startsWith("$")) pluralVars.push(name)
+                if(name.startsWith("$") && typeof(vars[name])==="number")  pluralVars.push(name)
             })
             vars = [arguments[1]]
         }else if(arguments.length >= 2){
@@ -531,8 +531,12 @@ function translate(message) {
                 return arg   
             })
             
-        }  
-         // 2. 取得翻译文本模板字符串
+        }
+        
+        
+       
+
+        // 3. 取得翻译文本模板字符串
         if(activeLanguage === scope.defaultLanguage){
             // 2.1 从默认语言中取得翻译文本模板字符串
             // 如果当前语言就是默认语言，不需要查询加载，只需要做插值变换即可
@@ -547,10 +551,9 @@ function translate(message) {
             // JSON.stringify在进行转换时会将\t\n\r转换为\\t\\n\\r,这样在进行匹配时就出错 
             let msgId = isMessageId(content) ? content :  scope.idMap[escape(content)]  
             content = scope.messages[msgId] || content
-            content = unescape(content)
+            content = Array.isArray(content) ? content.map(v=>unescape(v)) : unescape(content)
         }
-        
-        // 3. 处理复数
+         // 2. 处理复数
         // 经过上面的处理，content可能是字符串或者数组
         // content = "原始文本内容" || 复数形式["原始文本内容","原始文本内容"....]
         // 如果是数组说明要启用复数机制，需要根据插值变量中的某个变量来判断复数形式
@@ -564,6 +567,7 @@ function translate(message) {
                 content = content[0]
             }
         } 
+        
         // 进行插值处理
         if(vars.length==0){
             return content
diff --git a/packages/tools/.env b/packages/tools/.env
deleted file mode 100644
index 1cbee58..0000000
--- a/packages/tools/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-# 命令行工具使用的语言
-LANGUAGE=en
\ No newline at end of file
diff --git a/packages/tools/index.js b/packages/tools/index.js
index 407a960..235aec9 100644
--- a/packages/tools/index.js
+++ b/packages/tools/index.js
@@ -18,7 +18,10 @@ program
     .option('-m, --moduleType [type]', t('生成的js模块类型,取值auto,esm,cjs'),"auto")   
     .option('-lngs, --languages <languages...>', t('支持的语言列表'), ['cn','en']) 
     .hook("preAction",async function(location){
-        
+        const lang= process.env.LANGUAGE
+        if(lang){
+            await scope.change(lang)      
+        }
     })
     .action((location,options) => { 
         if(!location) {
@@ -48,6 +51,12 @@ program
     .option('-u, --updateMode', t('本次提取内容与已存在内容的数据合并策略,默认取值sync=同步,overwrite=覆盖,merge=合并'), 'sync')  
     .option('-f, --filetypes', t('要扫描的文件类型'), 'js,vue,html,jsx,ts')  
     .argument('[location]', t('工程项目所在目录'),"./")
+    .hook("preAction",async function(location){
+        const lang= process.env.LANGUAGE
+        if(lang){
+            await scope.change(lang)      
+        }
+    })
     .action(async (location,options) => {
         if(!location) {
             location = process.cwd()