Skip to content

Commit

Permalink
fix: 优化国际化语言配置
Browse files Browse the repository at this point in the history
  • Loading branch information
@beezen
beezen committed Jan 11, 2024
1 parent 634a785 commit cf0796e
Show file tree
Hide file tree
Showing 24 changed files with 930 additions and 516 deletions.
29 changes: 22 additions & 7 deletions __tests__/utils/index.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
import { line, desensitize, compareVersion } from "../../src/utils";
import { getConfig, getLangMessage, getRegistryConfig, isEnabled } from "../../src/common";
import {
line,
desensitize,
compareVersion,
printLog,
getPackageManager
} from "../../src/utils/index";
import { getConfig, getRegistryConfig, isEnabled, initLanguage } from "../../src/common";

describe("utils", () => {
it("getConfig", () => {
const { nucm, npm, nrm } = getConfig();

expect(nucm).toBeDefined();
expect(npm).toBeDefined();
expect(nrm).toBeDefined();
});

it("getLangMessage", () => {
const lang = require("../../src/lang/index.js").default;
expect(getLangMessage("MSG_showVersion", "cn")).toBe(lang["cn"]["MSG_showVersion"]);
expect(getLangMessage("MSG_showVersion", "en")).toBe(lang["en"]["MSG_showVersion"]);
it("printLog", () => {
initLanguage(); // 初始化 i18next
const langCn = require("../../src/lang/default/zh/base.json");
const langEn = require("../../src/lang/default/en/base.json");
expect(printLog("MSG_showVersion", { isPrint: false, lng: "cn" })).toBe(
langCn["MSG_showVersion"]
);
expect(printLog("MSG_showVersion", { isPrint: false, lng: "en" })).toBe(
langEn["MSG_showVersion"]
);
});

it("getPackageManager", () => {
expect(getPackageManager()).toBe("yarn");
});

it("line", () => {
Expand Down
166 changes: 88 additions & 78 deletions coverage/clover.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<coverage generated="1704765480213" clover="3.2.0">
<project timestamp="1704765480213" name="All files">
<metrics statements="126" coveredstatements="112" conditionals="68" coveredconditionals="50" methods="19" coveredmethods="18" elements="213" coveredelements="180" complexity="0" loc="126" ncloc="126" packages="4" files="5" classes="5"/>
<coverage generated="1704934972000" clover="3.2.0">
<project timestamp="1704934972000" name="All files">
<metrics statements="136" coveredstatements="125" conditionals="75" coveredconditionals="58" methods="20" coveredmethods="20" elements="231" coveredelements="203" complexity="0" loc="136" ncloc="136" packages="4" files="5" classes="5"/>
<package name="actions">
<metrics statements="55" coveredstatements="50" conditionals="27" coveredconditionals="18" methods="8" coveredmethods="8"/>
<file name="base.js" path="/Users/beezen/mine/github/nucm/src/actions/base.js">
Expand All @@ -10,18 +10,18 @@
<line num="10" count="2" type="stmt"/>
<line num="11" count="2" type="stmt"/>
<line num="12" count="2" type="cond" truecount="0" falsecount="1"/>
<line num="13" count="3" type="stmt"/>
<line num="15" count="8" type="cond" truecount="1" falsecount="1"/>
<line num="18" count="8" type="cond" truecount="2" falsecount="0"/>
<line num="19" count="3" type="stmt"/>
<line num="21" count="5" type="stmt"/>
<line num="13" count="4" type="stmt"/>
<line num="15" count="10" type="cond" truecount="1" falsecount="1"/>
<line num="18" count="10" type="cond" truecount="2" falsecount="0"/>
<line num="19" count="4" type="stmt"/>
<line num="21" count="6" type="stmt"/>
<line num="25" count="2" type="stmt"/>
<line num="26" count="2" type="stmt"/>
<line num="29" count="2" type="cond" truecount="2" falsecount="0"/>
<line num="30" count="1" type="stmt"/>
<line num="31" count="1" type="stmt"/>
<line num="34" count="2" type="cond" truecount="2" falsecount="0"/>
<line num="37" count="2" type="stmt"/>
<line num="34" count="3" type="cond" truecount="2" falsecount="0"/>
<line num="37" count="3" type="stmt"/>
<line num="40" count="1" type="stmt"/>
<line num="42" count="1" type="stmt"/>
<line num="43" count="1" type="stmt"/>
Expand Down Expand Up @@ -64,95 +64,105 @@
</file>
</package>
<package name="common">
<metrics statements="48" coveredstatements="43" conditionals="31" coveredconditionals="24" methods="7" coveredmethods="7"/>
<metrics statements="49" coveredstatements="44" conditionals="29" coveredconditionals="22" methods="7" coveredmethods="7"/>
<file name="env.js" path="/Users/beezen/mine/github/nucm/src/common/env.js">
<metrics statements="2" coveredstatements="2" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
<line num="1" count="2" type="stmt"/>
<line num="9" count="2" type="stmt"/>
</file>
<file name="index.js" path="/Users/beezen/mine/github/nucm/src/common/index.js">
<metrics statements="46" coveredstatements="41" conditionals="31" coveredconditionals="24" methods="7" coveredmethods="7"/>
<line num="11" count="2" type="stmt"/>
<line num="12" count="2" type="stmt"/>
<metrics statements="47" coveredstatements="42" conditionals="29" coveredconditionals="22" methods="7" coveredmethods="7"/>
<line num="13" count="2" type="stmt"/>
<line num="14" count="2" type="stmt"/>
<line num="22" count="8" type="cond" truecount="3" falsecount="1"/>
<line num="23" count="8" type="stmt"/>
<line num="28" count="8" type="stmt"/>
<line num="33" count="8" type="stmt"/>
<line num="34" count="8" type="stmt"/>
<line num="15" count="2" type="stmt"/>
<line num="16" count="2" type="stmt"/>
<line num="24" count="8" type="cond" truecount="3" falsecount="1"/>
<line num="25" count="8" type="stmt"/>
<line num="30" count="8" type="stmt"/>
<line num="35" count="8" type="stmt"/>
<line num="36" count="8" type="cond" truecount="1" falsecount="1"/>
<line num="36" count="8" type="stmt"/>
<line num="37" count="8" type="stmt"/>
<line num="38" count="8" type="cond" truecount="1" falsecount="1"/>
<line num="39" count="8" type="stmt"/>
<line num="51" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="52" count="0" type="stmt"/>
<line num="53" count="0" type="stmt"/>
<line num="55" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="56" count="0" type="stmt"/>
<line num="62" count="0" type="stmt"/>
<line num="63" count="0" type="stmt"/>
<line num="65" count="1" type="stmt"/>
<line num="74" count="11" type="cond" truecount="3" falsecount="0"/>
<line num="75" count="11" type="stmt"/>
<line num="84" count="5" type="stmt"/>
<line num="85" count="5" type="cond" truecount="2" falsecount="0"/>
<line num="41" count="8" type="stmt"/>
<line num="53" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="54" count="0" type="stmt"/>
<line num="55" count="0" type="stmt"/>
<line num="57" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="58" count="0" type="stmt"/>
<line num="64" count="0" type="stmt"/>
<line num="65" count="0" type="stmt"/>
<line num="67" count="1" type="stmt"/>
<line num="76" count="5" type="stmt"/>
<line num="77" count="5" type="cond" truecount="2" falsecount="0"/>
<line num="78" count="4" type="stmt"/>
<line num="79" count="4" type="stmt"/>
<line num="80" count="4" type="stmt"/>
<line num="83" count="4" type="stmt"/>
<line num="84" count="4" type="cond" truecount="3" falsecount="1"/>
<line num="86" count="4" type="stmt"/>
<line num="87" count="4" type="stmt"/>
<line num="88" count="4" type="stmt"/>
<line num="91" count="4" type="stmt"/>
<line num="92" count="4" type="cond" truecount="3" falsecount="1"/>
<line num="94" count="4" type="stmt"/>
<line num="97" count="4" type="stmt"/>
<line num="98" count="48" type="stmt"/>
<line num="99" count="48" type="cond" truecount="2" falsecount="0"/>
<line num="100" count="4" type="stmt"/>
<line num="103" count="4" type="stmt"/>
<line num="115" count="3" type="cond" truecount="2" falsecount="0"/>
<line num="116" count="1" type="stmt"/>
<line num="117" count="1" type="stmt"/>
<line num="119" count="2" type="stmt"/>
<line num="127" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="89" count="4" type="stmt"/>
<line num="90" count="48" type="stmt"/>
<line num="91" count="48" type="cond" truecount="2" falsecount="0"/>
<line num="92" count="4" type="stmt"/>
<line num="95" count="4" type="stmt"/>
<line num="107" count="3" type="cond" truecount="2" falsecount="0"/>
<line num="108" count="1" type="stmt"/>
<line num="112" count="1" type="stmt"/>
<line num="114" count="2" type="stmt"/>
<line num="122" count="1" type="stmt"/>
<line num="123" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="124" count="1" type="stmt"/>
<line num="125" count="1" type="stmt"/>
<line num="126" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="128" count="1" type="stmt"/>
<line num="129" count="1" type="stmt"/>
<line num="130" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="132" count="1" type="stmt"/>
<line num="137" count="1" type="cond" truecount="2" falsecount="0"/>
<line num="133" count="1" type="stmt"/>
<line num="134" count="1" type="cond" truecount="2" falsecount="0"/>
<line num="142" count="2" type="stmt"/>
</file>
</package>
<package name="lang">
<metrics statements="0" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
<file name="index.js" path="/Users/beezen/mine/github/nucm/src/lang/index.js">
<metrics statements="0" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
<package name="lang.default">
<metrics statements="1" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
<file name="index.js" path="/Users/beezen/mine/github/nucm/src/lang/default/index.js">
<metrics statements="1" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
<line num="4" count="2" type="stmt"/>
</file>
</package>
<package name="utils">
<metrics statements="23" coveredstatements="19" conditionals="10" coveredconditionals="8" methods="4" coveredmethods="3"/>
<metrics statements="31" coveredstatements="30" conditionals="19" coveredconditionals="18" methods="5" coveredmethods="5"/>
<file name="index.js" path="/Users/beezen/mine/github/nucm/src/utils/index.js">
<metrics statements="23" coveredstatements="19" conditionals="10" coveredconditionals="8" methods="4" coveredmethods="3"/>
<line num="9" count="11" type="stmt"/>
<line num="18" count="11" type="cond" truecount="2" falsecount="0"/>
<line num="19" count="10" type="cond" truecount="2" falsecount="0"/>
<line num="20" count="8" type="stmt"/>
<line num="30" count="7" type="stmt"/>
<line num="31" count="7" type="stmt"/>
<metrics statements="31" coveredstatements="30" conditionals="19" coveredconditionals="18" methods="5" coveredmethods="5"/>
<line num="11" count="13" type="stmt"/>
<line num="20" count="13" type="cond" truecount="2" falsecount="0"/>
<line num="21" count="12" type="cond" truecount="2" falsecount="0"/>
<line num="22" count="6" type="stmt"/>
<line num="32" count="7" type="stmt"/>
<line num="33" count="7" type="stmt"/>
<line num="34" count="7" type="stmt"/>
<line num="35" count="1" type="stmt"/>
<line num="37" count="7" type="stmt"/>
<line num="38" count="3" type="stmt"/>
<line num="41" count="7" type="stmt"/>
<line num="42" count="16" type="stmt"/>
<line num="43" count="16" type="stmt"/>
<line num="45" count="16" type="cond" truecount="2" falsecount="0"/>
<line num="46" count="3" type="stmt"/>
<line num="47" count="13" type="cond" truecount="2" falsecount="0"/>
<line num="48" count="2" type="stmt"/>
<line num="51" count="2" type="stmt"/>
<line num="57" count="0" type="stmt"/>
<line num="58" count="0" type="cond" truecount="0" falsecount="2"/>
<line num="59" count="0" type="stmt"/>
<line num="61" count="0" type="stmt"/>
<line num="36" count="7" type="stmt"/>
<line num="37" count="1" type="stmt"/>
<line num="39" count="7" type="stmt"/>
<line num="40" count="3" type="stmt"/>
<line num="43" count="7" type="stmt"/>
<line num="44" count="16" type="stmt"/>
<line num="45" count="16" type="stmt"/>
<line num="47" count="16" type="cond" truecount="2" falsecount="0"/>
<line num="48" count="3" type="stmt"/>
<line num="49" count="13" type="cond" truecount="2" falsecount="0"/>
<line num="50" count="2" type="stmt"/>
<line num="53" count="2" type="stmt"/>
<line num="59" count="1" type="stmt"/>
<line num="60" count="1" type="cond" truecount="1" falsecount="1"/>
<line num="61" count="1" type="stmt"/>
<line num="63" count="0" type="stmt"/>
<line num="76" count="14" type="cond" truecount="2" falsecount="0"/>
<line num="77" count="14" type="stmt"/>
<line num="82" count="14" type="cond" truecount="2" falsecount="0"/>
<line num="83" count="14" type="stmt"/>
<line num="84" count="14" type="cond" truecount="2" falsecount="0"/>
<line num="85" count="14" type="cond" truecount="2" falsecount="0"/>
<line num="86" count="5" type="stmt"/>
<line num="88" count="9" type="stmt"/>
</file>
</package>
</project>
Expand Down

0 comments on commit cf0796e

Please sign in to comment.