From d90d09c097f3daa23e3bf9e8d3be9ebaed40b3c4 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 14 Oct 2018 13:27:57 +0800
Subject: [PATCH] Improve language select UI

---
 src/components/GlobalHeader/index.js |  1 -
 src/components/SelectLang/index.js   | 10 ++++++----
 src/components/SelectLang/index.less |  3 +++
 src/locales/en-US.js                 |  8 ++++----
 src/locales/pt-BR.js                 |  8 ++++----
 src/locales/zh-CN.js                 |  8 ++++----
 src/locales/zh-TW.js                 |  8 ++++----
 7 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/components/GlobalHeader/index.js b/src/components/GlobalHeader/index.js
index 3b847548..156f1b7d 100644
--- a/src/components/GlobalHeader/index.js
+++ b/src/components/GlobalHeader/index.js
@@ -36,7 +36,6 @@ export default class GlobalHeader extends PureComponent {
           type={collapsed ? 'menu-unfold' : 'menu-fold'}
           onClick={this.toggle}
         />
-
         <RightContent {...this.props} />
       </div>
     );
diff --git a/src/components/SelectLang/index.js b/src/components/SelectLang/index.js
index 6273953c..758f9a09 100644
--- a/src/components/SelectLang/index.js
+++ b/src/components/SelectLang/index.js
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { FormattedMessage, setLocale, getLocale } from 'umi/locale';
+import { formatMessage, FormattedMessage, setLocale, getLocale } from 'umi/locale';
 import { Menu, Icon, Dropdown } from 'antd';
 import classNames from 'classnames';
 import styles from './index.less';
@@ -30,9 +30,11 @@ export default class SelectLang extends PureComponent {
     );
     return (
       <Dropdown overlay={langMenu}>
-        <span className={classNames(styles.dropDown, className)}>
-          <FormattedMessage id="navBar.lang" /> <Icon type="down" />
-        </span>
+        <Icon
+          type="global"
+          className={classNames(styles.dropDown, className)}
+          title={formatMessage({ id: 'navBar.lang' })}
+        />
       </Dropdown>
     );
   }
diff --git a/src/components/SelectLang/index.less b/src/components/SelectLang/index.less
index 8c159e98..1b81a7be 100644
--- a/src/components/SelectLang/index.less
+++ b/src/components/SelectLang/index.less
@@ -11,4 +11,7 @@
 
 .dropDown {
   cursor: pointer;
+  font-size: 14px;
+  vertical-align: top;
+  line-height: 64px;
 }
diff --git a/src/locales/en-US.js b/src/locales/en-US.js
index a9075642..77455a91 100644
--- a/src/locales/en-US.js
+++ b/src/locales/en-US.js
@@ -1,9 +1,9 @@
 export default {
   'navBar.lang': 'Languages',
-  'lang.simplified-chinese': '简体中文',
-  'lang.traditional-chinese': '繁体中文',
-  'lang.english': 'English',
-  'lang.portuguese': 'Portuguese',
+  'lang.simplified-chinese': '🇨🇳 简体中文',
+  'lang.traditional-chinese': '🇭🇰 繁体中文',
+  'lang.english': '🇬🇧 English',
+  'lang.portuguese': '🇵🇹 Portuguese',
   'layout.user.link.help': 'Help',
   'layout.user.link.privacy': 'Privacy',
   'layout.user.link.terms': 'Terms',
diff --git a/src/locales/pt-BR.js b/src/locales/pt-BR.js
index 1829f9f3..e170bf74 100644
--- a/src/locales/pt-BR.js
+++ b/src/locales/pt-BR.js
@@ -1,9 +1,9 @@
 export default {
   'navBar.lang': 'Idiomas',
-  'lang.simplified-chinese': '简体中文',
-  'lang.traditional-chinese': '繁体中文',
-  'lang.english': 'English',
-  'lang.portuguese': 'Portuguese',
+  'lang.simplified-chinese': '🇨🇳 简体中文',
+  'lang.traditional-chinese': '🇭🇰 繁体中文',
+  'lang.english': '🇬🇧 English',
+  'lang.portuguese': '🇵🇹 Portuguese',
   'layout.user.link.help': 'ajuda',
   'layout.user.link.privacy': 'política de privacidade',
   'layout.user.link.terms': 'termos de serviços',
diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
index 83c158e6..417e2964 100644
--- a/src/locales/zh-CN.js
+++ b/src/locales/zh-CN.js
@@ -1,9 +1,9 @@
 export default {
   'navBar.lang': '语言',
-  'lang.simplified-chinese': '简体中文',
-  'lang.traditional-chinese': '繁体中文',
-  'lang.english': 'English',
-  'lang.portuguese': 'Portuguese',
+  'lang.simplified-chinese': '🇨🇳 简体中文',
+  'lang.traditional-chinese': '🇭🇰 繁体中文',
+  'lang.english': '🇬🇧 English',
+  'lang.portuguese': '🇵🇹 Portuguese',
   'layout.user.link.help': '帮助',
   'layout.user.link.privacy': '隐私',
   'layout.user.link.terms': '条款',
diff --git a/src/locales/zh-TW.js b/src/locales/zh-TW.js
index 415902c1..b7c52af6 100644
--- a/src/locales/zh-TW.js
+++ b/src/locales/zh-TW.js
@@ -1,9 +1,9 @@
 export default {
   'navBar.lang': '語言',
-  'lang.simplified-chinese': '简体中文',
-  'lang.traditional-chinese': '繁体中文',
-  'lang.english': 'English',
-  'lang.portuguese': 'Portuguese',
+  'lang.simplified-chinese': '🇨🇳 简体中文',
+  'lang.traditional-chinese': '🇭🇰 繁体中文',
+  'lang.english': '🇬🇧 English',
+  'lang.portuguese': '🇵🇹 Portuguese',
   'layout.user.link.help': '幫助',
   'layout.user.link.privacy': '隱私',
   'layout.user.link.terms': '條款',
-- 
GitLab