fix: add defaultLanguage & doc: update setValidateLanguage (#1548)

alibaba · Jun 7, 2021 · b277752 · b277752
1 parent 6835f6d
commit b277752
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/packages/core/docs/api/entry/FormValidatorRegistry.md b/packages/core/docs/api/entry/FormValidatorRegistry.md
@@ -13,15 +13,15 @@ order: 6
 #### 签名
 
 ```ts
-interface setValidationLanguage {
+interface setValidateLanguage{
   (language: string): void
 }
 ```
 
 #### 用例
 
 ```ts
-import { setValidationLanguage } from '@formily/core'
+import { setValidateLanguage} from '@formily/core'
 
 setValidationLanguage('en-US')
 

diff --git a/packages/next/README.zh-cn.md b/packages/next/README.zh-cn.md
@@ -1325,13 +1325,13 @@ actions.getFieldValue('username').then((val) => console.log(val))
 **签名**
 
 ```typescript
-const setValidationLanguage = (lang: string) => void;
+const setValidateLanguage= (lang: string) => void;
 ```
 
 **用法**
 
 ```tsx
-import { setValidationLanguage } from '@formily/next'
+import { setValidateLanguage} from '@formily/next'
 setValidationLanguage('zh')
 ```
 

diff --git a/packages/next/src/form/index.tsx b/packages/next/src/form/index.tsx
@@ -21,9 +21,8 @@ export const Form: React.FC<FormProps> = ({
   // @ts-ignore
   const lang = ConfigProvider.getContext()?.locale?.momentLocale
   useMemo(() => {
-    if (getValidateLocaleIOSCode(lang)) {
-      setValidateLanguage(lang)
-    }
+    const validateLanguage = getValidateLocaleIOSCode(lang);
+    setValidateLanguage(validateLanguage)
   }, [lang])
 
   return (

diff --git a/packages/validator/src/registry.ts b/packages/validator/src/registry.ts
@@ -19,12 +19,14 @@ const getIn = FormPath.getIn
 
 const self: any = globalThisPolyfill
 
+const defaultLanguage = 'en'
+
 const getBrowserlanguage = () => {
   /* istanbul ignore next */
   if (!self.navigator) {
-    return 'en'
+    return defaultLanguage
   }
-  return self.navigator.browserlanguage || self.navigator.language || 'en'
+  return self.navigator.browserlanguage || self.navigator.language || defaultLanguage
 }
 
 const registry = {
@@ -57,7 +59,7 @@ const getISOCode = (language: string) => {
 export const getValidateLocaleIOSCode = getISOCode;
 
 export const setValidateLanguage = (lang: string) => {
-  registry.locales.language = lang
+  registry.locales.language = lang || defaultLanguage
 }
 
 export const getValidateLanguage = () => registry.locales.language