From b71d2502efe4ada8d777a72c1decfa688d665aa8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 6 May 2019 10:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=AF=91=E6=96=87?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/i18n/core/common_view/i18n_en.properties  | 2 +-
 .../core/src/main/resources/i18n/core/sys/i18n_en.properties | 5 +++++
 .../main/resources/views/modules/sys/user/empUserList.html   | 4 ++--
 .../themes/default/modules/sys/sysIndex/topMenuOnline.html   | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties
index c4c68814..b37478c4 100644
--- a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties
@@ -78,6 +78,6 @@
 
 验证码=Captcha
 请填写验证码=Please fill in the captcha.
-验证码不正确=The captcha is incorrect.
+验证码不正确.=The captcha is incorrect.
 看不清，点击图片刷新=Can't see clearly, click on the picture to refresh.
 
diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
index 43fc75fb..302b9efc 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
@@ -71,6 +71,9 @@
 修改密码=Change password
 退出登录=Log out
 系统切换=System switching
+当前租户=Current tenant
+租户切换=Tenant switch
+在线人员=Online user
 
 在线=Online
 注销=Logout
@@ -114,6 +117,8 @@
 组织机构=Office
 新增用户=New user
 编辑用户=Edit user
+导出=Export
+导入=Import
 
 停用用户=Disable user
 确认要停用该用户吗？=Are you sure want to disable this user?
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
index 65fd380a..b47c526b 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
@@ -15,8 +15,8 @@
 						<i class="fa fa-navicon"></i> <span class="caret"></span>
 					</a>
 					<ul class="dropdown-menu">
-						<li><a href="javascript:" id="btnExport"><i class="glyphicon glyphicon-export"></i> 导出</a></li>
-						<li><a href="javascript:" id="btnImport"><i class="glyphicon glyphicon-import"></i> 导入</a></li>
+						<li><a href="javascript:" id="btnExport"><i class="glyphicon glyphicon-export"></i> ${text('导出')}</a></li>
+						<li><a href="javascript:" id="btnImport"><i class="glyphicon glyphicon-import"></i> ${text('导入')}</a></li>
 					</ul>
 				</div>
 			</div>
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuOnline.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuOnline.html
index 064c9841..444f2869 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuOnline.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuOnline.html
@@ -1,5 +1,5 @@
 <li>
-	<a href="javascript:" data-href="${ctx}/sys/online/list" data-title="在线人员" title="在线人员"
+	<a href="javascript:" data-href="${ctx}/sys/online/list" data-title="${text('在线人员')}" title="${text('在线人员')}"
 		class="${hasPermi('sys:online:view') ? 'addTabPage' : ''}">
 		<i class="icon-people"></i><span id="onlineCount" class="label label-success">0</span>
 	</a>