aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/locale/LocaleProvider.tsx

@@ -1,204 +1,204 @@
-import { ConfigProvider } from "antd";
-import React, { ReactNode, createContext, useEffect, useState } from "react";
-import { useNavigatorLanguage } from "./useLocale";
-import { antdLangMp, getLangWithLangApiMp, getLangWithLangMp } from "./langMp";
-import { LocaleType } from "./langMp";
-import HcserviceV3 from "../tmpl/hcservice-v3";
-
-export const LocaleContext = createContext<{
-  locale: LocaleType;
-  langPkg: any;
-  availableLang: string[];
-  changeLocale: (locale: LocaleType) => void;
-  t: (...strs: string[]) => string;
-  translate: (...strs: string[]) => string;
-  getServiceLangStr?: ()=>string;
-}>({
-  locale: undefined,
-  availableLang: [],
-  langPkg: {},
-  changeLocale: () => {},
-  t: (...str) => str.join(""),
-  translate: (str) => {
-    let res = [],
-      tres = "";
-
-    let matchStr = "",
-      enableMatch = false;
-
-    for (const char of str) {
-      if (char === "$") {
-        enableMatch = true;
-        res.push(tres);
-        tres = "";
-      } else if (enableMatch && char === "{") {
-        continue;
-      } else if (enableMatch && char === "}") {
-        res.push(matchStr);
-        enableMatch = false;
-        matchStr = "";
-      } else if (enableMatch) matchStr += char;
-      else tres += char;
-    }
-
-    res.push(tres);
-    return res.join("");
-  }
-});
-
-const getLocaleWithServer = async (lang: string, serverKey?: string) => {
-  const langStr = getLangWithLangApiMp(lang);
-  if (langStr === "zh") return;
-
-  const { value, status } = await HcserviceV3.getLocale(langStr, serverKey);
-
-  if (status === "success") {
-    return value;
-  }
-  return {};
-};
-
-export const LocaleProvider = ({
-  serverKey = "",
-  children,
-}: {
-  serverKey?: string | string[];
-  children: ReactNode;
-}) => {
-  const { navigatorLanguage } = useNavigatorLanguage();
-  const localeStorageLang: LocaleType = window.localStorage.getItem(
-    "locale"
-  ) as LocaleType;
-  const localeStorageLangPkg: object = JSON.parse(
-    window.localStorage.getItem("langPkg")
-  );
-
-  const [locale, setLocale] = useState<LocaleType>(
-    localeStorageLang ? localeStorageLang : getLangWithLangMp(navigatorLanguage)
-  );
-  const [langPkg, setLangPkg] = useState(
-    localeStorageLangPkg ? localeStorageLangPkg : {}
-  );
-  const [availableLang, setAvailableLang] = useState([]);
-
-  const changeLocale = async (locale: LocaleType) => {
-    setLocale(locale);
-  };
-
-  const getServiceLangStr =  () => {
-    const langStr = getLangWithLangApiMp(locale);
-    return langStr;
-  };
-
-  const getAllLocale = async (serverKey: string[]) => {
-    const newLangPkg = {
-      ...langPkg,
-    };
-    for (const key of serverKey) {
-      let res;
-      if (key === "") {
-        res = await getLocaleWithServer(locale);
-      } else {
-        res = await getLocaleWithServer(locale, key);
-      }
-
-      if (newLangPkg[locale] !== undefined)
-        Object.assign(newLangPkg[locale], res);
-      else newLangPkg[locale] = res;
-    }
-
-    window.localStorage.setItem("locale", locale);
-    setLangPkg(newLangPkg);
-  };
-
-  useEffect(() => {
-    if (!Array.isArray(serverKey)) serverKey = [...new Set(["", serverKey])];
-    getAllLocale([...new Set(["", ...serverKey])]);
-    // 获取所有可以配置的语言
-    HcserviceV3.getAllLang().then((res) => {
-      if (res.status === "success") {
-        setAvailableLang(
-          res.languages ? res.languages.map((i) => getLangWithLangMp(i)) : []
-        );
-      }
-    });
-  }, [locale]);
-
-  useEffect(() => {
-    window.localStorage.setItem("langPkg", JSON.stringify(langPkg));
-  }, [langPkg]);
-
-  const t = (...strs: string[]) => {
-    if (locale === "zh") return strs.join("");
-
-    let res = "",
-      flag = false;
-
-    for (const str of strs) {
-      const tStr =
-        langPkg[locale] === undefined ? undefined : langPkg[locale][str];
-      if (tStr === undefined) {
-        flag = true;
-        break;
-      } else {
-        res += tStr + " ";
-      }
-    }
-    return flag ? strs.join("") : res.slice(0, res.length - 1);
-  };
-
-  const translate = (str) => {
-    let res = [],
-      resMp = [],
-      flag = false,
-      tres = "";
-
-    let matchStr = "",
-      enableMatch = false;
-
-    for (const char of str) {
-      if (char === "$" && !enableMatch) {
-        enableMatch = true;
-        if (tres !== "") {
-          res.push(tres);
-          tres = "";
-          resMp.push(false);
-        }
-      } else if (enableMatch && char === "{") {
-        continue;
-      } else if (enableMatch && char === "}") {
-        const tStr =
-          langPkg[locale] === undefined ? undefined : langPkg[locale][matchStr];
-        if (tStr === undefined) {
-          flag = true;
-        }
-        res.push(matchStr);
-        resMp.push(true);
-        enableMatch = false;
-        matchStr = "";
-      } else if (enableMatch) matchStr += char;
-      else tres += char;
-    }
-
-    if (tres !== "") {
-      res.push(tres);
-      resMp.push(false);
-    }
-
-    if (flag) return res.join("");
-    let resStr = "";
-    for (let i = 0; i < res.length; i++) {
-      if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
-      else resStr += res[i];
-    }
-    return resStr;
-  };
-
-  return (
-    <LocaleContext.Provider
-      value={{ locale, availableLang, langPkg, changeLocale, t, translate ,getServiceLangStr}}
-    >
-      {children}
-    </LocaleContext.Provider>
-  );
-};
+import { ConfigProvider } from "antd";
+import React, { ReactNode, createContext, useEffect, useState } from "react";
+import { useNavigatorLanguage } from "./useLocale";
+import { antdLangMp, getLangWithLangApiMp, getLangWithLangMp } from "./langMp";
+import { LocaleType } from "./langMp";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+
+export const LocaleContext = createContext<{
+  locale: LocaleType;
+  langPkg: any;
+  availableLang: string[];
+  changeLocale: (locale: LocaleType) => void;
+  t: (...strs: string[]) => string;
+  translate: (...strs: string[]) => string;
+  getServiceLangStr?: ()=>string;
+}>({
+  locale: undefined,
+  availableLang: [],
+  langPkg: {},
+  changeLocale: () => {},
+  t: (...str) => str.join(""),
+  translate: (str) => {
+    let res = [],
+      tres = "";
+
+    let matchStr = "",
+      enableMatch = false;
+
+    for (const char of str) {
+      if (char === "$") {
+        enableMatch = true;
+        res.push(tres);
+        tres = "";
+      } else if (enableMatch && char === "{") {
+        continue;
+      } else if (enableMatch && char === "}") {
+        res.push(matchStr);
+        enableMatch = false;
+        matchStr = "";
+      } else if (enableMatch) matchStr += char;
+      else tres += char;
+    }
+
+    res.push(tres);
+    return res.join("");
+  }
+});
+
+const getLocaleWithServer = async (lang: string, serverKey?: string) => {
+  const langStr = getLangWithLangApiMp(lang);
+  if (langStr === "zh") return;
+
+  const { value, status } = await HcserviceV3.getLocale(langStr, serverKey);
+
+  if (status === "success") {
+    return value;
+  }
+  return {};
+};
+
+export const LocaleProvider = ({
+  serverKey = "",
+  children,
+}: {
+  serverKey?: string | string[];
+  children: ReactNode;
+}) => {
+  const { navigatorLanguage } = useNavigatorLanguage();
+  const localeStorageLang: LocaleType = window.localStorage.getItem(
+    "locale"
+  ) as LocaleType;
+  const localeStorageLangPkg: object = JSON.parse(
+    window.localStorage.getItem("langPkg")
+  );
+
+  const [locale, setLocale] = useState<LocaleType>(
+    localeStorageLang ? localeStorageLang : getLangWithLangMp(navigatorLanguage)
+  );
+  const [langPkg, setLangPkg] = useState(
+    localeStorageLangPkg ? localeStorageLangPkg : {}
+  );
+  const [availableLang, setAvailableLang] = useState([]);
+
+  const changeLocale = async (locale: LocaleType) => {
+    setLocale(locale);
+  };
+
+  const getServiceLangStr =  () => {
+    const langStr = getLangWithLangApiMp(locale);
+    return langStr;
+  };
+
+  const getAllLocale = async (serverKey: string[]) => {
+    const newLangPkg = {
+      ...langPkg,
+    };
+    for (const key of serverKey) {
+      let res;
+      if (key === "") {
+        res = await getLocaleWithServer(locale);
+      } else {
+        res = await getLocaleWithServer(locale, key);
+      }
+
+      if (newLangPkg[locale] !== undefined)
+        Object.assign(newLangPkg[locale], res);
+      else newLangPkg[locale] = res;
+    }
+
+    window.localStorage.setItem("locale", locale);
+    setLangPkg(newLangPkg);
+  };
+
+  useEffect(() => {
+    if (!Array.isArray(serverKey)) serverKey = [...new Set(["", serverKey])];
+    getAllLocale([...new Set(["", ...serverKey])]);
+    // 获取所有可以配置的语言
+    HcserviceV3.getAllLang().then((res) => {
+      if (res.status === "success") {
+        setAvailableLang(
+          res.languages ? res.languages.map((i) => getLangWithLangMp(i)) : []
+        );
+      }
+    });
+  }, [locale]);
+
+  useEffect(() => {
+    window.localStorage.setItem("langPkg", JSON.stringify(langPkg));
+  }, [langPkg]);
+
+  const t = (...strs: string[]) => {
+    if (locale === "zh") return strs.join("");
+
+    let res = "",
+      flag = false;
+
+    for (const str of strs) {
+      const tStr =
+        langPkg[locale] === undefined ? undefined : langPkg[locale][str];
+      if (tStr === undefined) {
+        flag = true;
+        break;
+      } else {
+        res += tStr + " ";
+      }
+    }
+    return flag ? strs.join("") : res.slice(0, res.length - 1);
+  };
+
+  const translate = (str) => {
+    let res = [],
+      resMp = [],
+      flag = false,
+      tres = "";
+
+    let matchStr = "",
+      enableMatch = false;
+
+    for (const char of str) {
+      if (char === "$" && !enableMatch) {
+        enableMatch = true;
+        if (tres !== "") {
+          res.push(tres);
+          tres = "";
+          resMp.push(false);
+        }
+      } else if (enableMatch && char === "{") {
+        continue;
+      } else if (enableMatch && char === "}") {
+        const tStr =
+          langPkg[locale] === undefined ? undefined : langPkg[locale][matchStr];
+        if (tStr === undefined) {
+          flag = true;
+        }
+        res.push(matchStr);
+        resMp.push(true);
+        enableMatch = false;
+        matchStr = "";
+      } else if (enableMatch) matchStr += char;
+      else tres += char;
+    }
+
+    if (tres !== "") {
+      res.push(tres);
+      resMp.push(false);
+    }
+
+    if (flag) return res.join("");
+    let resStr = "";
+    for (let i = 0; i < res.length; i++) {
+      if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
+      else resStr += res[i];
+    }
+    return resStr;
+  };
+
+  return (
+    <LocaleContext.Provider
+      value={{ locale, availableLang, langPkg, changeLocale, t, translate ,getServiceLangStr}}
+    >
+      {children}
+    </LocaleContext.Provider>
+  );
+};

package/src/aldehyde/locale/langMp.ts

@@ -1,45 +1,45 @@
-import frFr from "antd/locale/fr_FR";
-import zhCN from "antd/locale/zh_CN";
-import enUS from "antd/locale/en_US";
-import ptPT from 'antd/locale/pt_PT';
-import ruRU from 'antd/locale/ru_RU';
-
-export type LocaleType = "zh" | "en" | "fr" | "pt" | "ru";
-
-export const langMp = {
-  fr: ["fra", "fr-FR"],
-  zh: ["zh", "zh-CN"],
-  en: ["en"],
-  pt: ["pt"],
-  ru: ["ru"],
-};
-
-export const langApiMp = {
-  fra: ["fr", "fr-FR"],
-  zh: ["zh", "zh-CN"],
-  en: ["en"],
-  pt: ["pt"],
-  ru: ["ru"],
-};
-
-export const getLangWithLangMp: (lang: any) => LocaleType = (lang) => {
-  for (const [key, value] of Object.entries(langMp)) {
-    if (value.findIndex((i) => i === lang) > -1) return key as LocaleType;
-  }
-  return "zh" as LocaleType;
-};
-
-export const getLangWithLangApiMp = (lang) => {
-  for (const [key, value] of Object.entries(langApiMp)) {
-    if (value.findIndex((i) => i === lang) > -1) return key;
-  }
-  return "zh";
-};
-
-export const antdLangMp = {
-  zh: zhCN,
-  fr: frFr,
-  en: enUS,
-  pt: ptPT,
-  ru: ruRU
-};
+import frFr from "antd/locale/fr_FR";
+import zhCN from "antd/locale/zh_CN";
+import enUS from "antd/locale/en_US";
+import ptPT from 'antd/locale/pt_PT';
+import ruRU from 'antd/locale/ru_RU';
+
+export type LocaleType = "zh" | "en" | "fr" | "pt" | "ru";
+
+export const langMp = {
+  fr: ["fra", "fr-FR"],
+  zh: ["zh", "zh-CN"],
+  en: ["en"],
+  pt: ["pt"],
+  ru: ["ru"],
+};
+
+export const langApiMp = {
+  fra: ["fr", "fr-FR"],
+  zh: ["zh", "zh-CN"],
+  en: ["en"],
+  pt: ["pt"],
+  ru: ["ru"],
+};
+
+export const getLangWithLangMp: (lang: any) => LocaleType = (lang) => {
+  for (const [key, value] of Object.entries(langMp)) {
+    if (value.findIndex((i) => i === lang) > -1) return key as LocaleType;
+  }
+  return "zh" as LocaleType;
+};
+
+export const getLangWithLangApiMp = (lang) => {
+  for (const [key, value] of Object.entries(langApiMp)) {
+    if (value.findIndex((i) => i === lang) > -1) return key;
+  }
+  return "zh";
+};
+
+export const antdLangMp = {
+  zh: zhCN,
+  fr: frFr,
+  en: enUS,
+  pt: ptPT,
+  ru: ruRU
+};

package/src/aldehyde/locale/translate.ts

@@ -1,80 +1,80 @@
-const noLocaleTranslate = (str) => {
-  let res = [],
-    tres = "";
-
-  let matchStr = "",
-    enableMatch = false;
-
-  for (const char of str) {
-    if (char === "$" && !enableMatch) {
-      enableMatch = true;
-      res.push(tres);
-      tres = "";
-    } else if (enableMatch && char === "{") {
-      continue;
-    } else if (enableMatch && char === "}") {
-      res.push(matchStr);
-      enableMatch = false;
-      matchStr = "";
-    } else if (enableMatch) matchStr += char;
-    else tres += char;
-  }
-
-  res.push(tres);
-  return res.join("");
-};
-const translate = (str) => {
-  const locale = window.localStorage.getItem("locale");
-  const langPkg = JSON.parse(window.localStorage.getItem("langPkg"));
-
-  if (!locale || !langPkg) return noLocaleTranslate(str);
-
-  let res = [],
-    resMp = [],
-    flag = false,
-    tres = "";
-
-  let matchStr = "",
-    enableMatch = false;
-
-  for (const char of str) {
-    if (char === "$" && !enableMatch) {
-      enableMatch = true;
-      if (tres !== "") {
-        res.push(tres);
-        tres = "";
-        resMp.push(false);
-      }
-    } else if (enableMatch && char === "{") {
-      continue;
-    } else if (enableMatch && char === "}") {
-      const tStr =
-        langPkg[locale] === undefined ? undefined : langPkg[locale][matchStr];
-      if (tStr === undefined) {
-        flag = true;
-      }
-      res.push(matchStr);
-      resMp.push(true);
-      enableMatch = false;
-      matchStr = "";
-    } else if (enableMatch) matchStr += char;
-    else tres += char;
-  }
-
-  if (tres !== "") {
-    res.push(tres);
-    resMp.push(false);
-  }
-
-  if (flag) return res.join("");
-
-  let resStr = "";
-  for (let i = 0; i < res.length; i++) {
-    if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
-    else resStr += res[i];
-  }
-
-  return resStr;
-};
-
-export default translate;
+const noLocaleTranslate = (str) => {
+  let res = [],
+    tres = "";
+
+  let matchStr = "",
+    enableMatch = false;
+
+  for (const char of str) {
+    if (char === "$" && !enableMatch) {
+      enableMatch = true;
+      res.push(tres);
+      tres = "";
+    } else if (enableMatch && char === "{") {
+      continue;
+    } else if (enableMatch && char === "}") {
+      res.push(matchStr);
+      enableMatch = false;
+      matchStr = "";
+    } else if (enableMatch) matchStr += char;
+    else tres += char;
+  }
+
+  res.push(tres);
+  return res.join("");
+};
+const translate = (str) => {
+  const locale = window.localStorage.getItem("locale");
+  const langPkg = JSON.parse(window.localStorage.getItem("langPkg"));
+
+  if (!locale || !langPkg) return noLocaleTranslate(str);
+
+  let res = [],
+    resMp = [],
+    flag = false,
+    tres = "";
+
+  let matchStr = "",
+    enableMatch = false;
+
+  for (const char of str) {
+    if (char === "$" && !enableMatch) {
+      enableMatch = true;
+      if (tres !== "") {
+        res.push(tres);
+        tres = "";
+        resMp.push(false);
+      }
+    } else if (enableMatch && char === "{") {
+      continue;
+    } else if (enableMatch && char === "}") {
+      const tStr =
+        langPkg[locale] === undefined ? undefined : langPkg[locale][matchStr];
+      if (tStr === undefined) {
+        flag = true;
+      }
+      res.push(matchStr);
+      resMp.push(true);
+      enableMatch = false;
+      matchStr = "";
+    } else if (enableMatch) matchStr += char;
+    else tres += char;
+  }
+
+  if (tres !== "") {
+    res.push(tres);
+    resMp.push(false);
+  }
+
+  if (flag) return res.join("");
+
+  let resStr = "";
+  for (let i = 0; i < res.length; i++) {
+    if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
+    else resStr += res[i];
+  }
+
+  return resStr;
+};
+
+export default translate;