From 8a061ab847b4bc935f4808bc8dac0271a7fdc7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=B1=E5=86=A0?= <qianshan.wengqs@alibaba-inc.com>
Date: Thu, 7 May 2020 14:56:06 +0800
Subject: [PATCH] fix: intl

---
 packages/editor-core/src/intl/ali-global-locale.ts | 5 +++--
 packages/plugin-outline-pane/src/index.ts          | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/editor-core/src/intl/ali-global-locale.ts b/packages/editor-core/src/intl/ali-global-locale.ts
index 0eef45403..1d4127649 100644
--- a/packages/editor-core/src/intl/ali-global-locale.ts
+++ b/packages/editor-core/src/intl/ali-global-locale.ts
@@ -49,13 +49,14 @@ class AliGlobalLocale {
       }
     } else if (g_config) {
       if (g_config.locale) {
-        return languageMap[g_config.locale] || (g_config.locale || '').replace('_', '-');
+        return languageMap[g_config.locale] || g_config.locale.replace('_', '-');
       }
     }
 
     let locale: string = '';
     if (navigator.language) {
-      locale = (navigator.language as string).replace('_', '-');
+      const lang = (navigator.language as string);
+      return languageMap[lang] || lang.replace('_', '-');
     }
 
     // IE10 及更低版本使用 browserLanguage
diff --git a/packages/plugin-outline-pane/src/index.ts b/packages/plugin-outline-pane/src/index.ts
index 25382de93..1c96608bc 100644
--- a/packages/plugin-outline-pane/src/index.ts
+++ b/packages/plugin-outline-pane/src/index.ts
@@ -1,12 +1,12 @@
 import Pane from './views/pane';
 import { IconOutline } from './icons/outline';
-import { intl } from './locale';
+import { intlNode } from './locale';
 
 export default {
   name: 'outline-pane',
   props: {
     icon: IconOutline,
-    description: intl('Outline Tree'),
+    description: intlNode('Outline Tree'),
   },
   content: Pane,
 };