From 3253089e1f7ae549a8db11b00a9c97c127406251 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 2 Jul 2019 15:41:28 +0800
Subject: [PATCH] * Finish task #5920.

---
 module/user/config.php     | 2 +-
 module/user/lang/en.php    | 8 ++++----
 module/user/lang/zh-cn.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/user/config.php b/module/user/config.php
index cb9ff47b9a..a4f9af6619 100644
--- a/module/user/config.php
+++ b/module/user/config.php
@@ -13,7 +13,7 @@ $config->user->custom = new stdclass();
 $config->user->custom->batchCreateFields = 'dept,join,email,gender';
 $config->user->custom->batchEditFields   = 'dept,join,email,commiter';
 
-$config->user->contactField = 'skype,qq,dingding,weixin,mobile,slack,whatsapp,phone';
+$config->user->contactField = 'mobile,phone,qq,dingding,weixin,skype,whatsapp,slack';
 $config->user->failTimes    = 6;
 $config->user->lockMinutes  = 10;
 $config->user->batchCreate  = 10;
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 7214097475..b615237dfd 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -174,13 +174,13 @@ $lang->user->error->verifyPassword   = "Verification failed. Please enter your L
 $lang->user->error->originalPassword = "Old password is incorrect.";
 
 $lang->user->contactFieldList['skype']    = $lang->user->skype;
+$lang->user->contactFieldList['slack']    = $lang->user->slack;
+$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
+$lang->user->contactFieldList['mobile']   = $lang->user->mobile;
+$lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['qq']       = $lang->user->qq;
 $lang->user->contactFieldList['dingding'] = $lang->user->dingding;
 $lang->user->contactFieldList['weixin']   = $lang->user->weixin;
-$lang->user->contactFieldList['mobile']   = $lang->user->mobile;
-$lang->user->contactFieldList['slack']    = $lang->user->slack;
-$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
-$lang->user->contactFieldList['phone']    = $lang->user->phone;
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = 'Contacts';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 9b8b1d2415..6d38ff8bc9 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -173,14 +173,14 @@ $lang->user->error->reserved      = "【ID %s】的用户名已被系统预留";
 $lang->user->error->verifyPassword   = "验证失败，请检查您的系统登录密码是否正确";
 $lang->user->error->originalPassword = "原密码不正确";
 
-$lang->user->contactFieldList['skype']    = $lang->user->skype;
+$lang->user->contactFieldList['phone']    = $lang->user->phone;
+$lang->user->contactFieldList['mobile']   = $lang->user->mobile;
 $lang->user->contactFieldList['qq']       = $lang->user->qq;
 $lang->user->contactFieldList['dingding'] = $lang->user->dingding;
 $lang->user->contactFieldList['weixin']   = $lang->user->weixin;
-$lang->user->contactFieldList['mobile']   = $lang->user->mobile;
+$lang->user->contactFieldList['skype']    = $lang->user->skype;
 $lang->user->contactFieldList['slack']    = $lang->user->slack;
 $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
-$lang->user->contactFieldList['phone']    = $lang->user->phone;
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = '联系人';