多语言译文优化

2023-07-17 11:33:51 +08:00
parent a2d873fee5
commit e7e15fd15e
7 changed files with 28 additions and 36 deletions
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java
@@ -4,27 +4,6 @@
 */
 package com.jeesite.modules.sys.web;

-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import io.swagger.annotations.Api;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.apache.shiro.subject.support.DefaultSubjectContext;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.config.Global;
@@ -36,6 +15,21 @@ import com.jeesite.common.shiro.session.SessionDAO;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.sys.utils.SysCacheUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
+import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.shiro.subject.support.DefaultSubjectContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;

 /**
 * 在线用户Controller
@@ -66,8 +60,6 @@ public class OnlineController extends BaseController{

 	/**
 	 * 在线用户列表
-	 * @param request
-	 * @param response
 	 * @param model
 	 */
 	@RequiresPermissions("sys:online:view")
@@ -78,8 +70,6 @@ public class OnlineController extends BaseController{
 	
 	/**
 	 * 在线用户列表数据
-	 * @param request
-	 * @param response
 	 * @author ThinkGem
 	 */
 	@RequiresPermissions("sys:online:view")
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
@@ -277,7 +277,7 @@
 是否更新已经存在的用户数据=Whether to update existing user data
 下载模板=Download template
 如果用户编码已经存在，更新这条数据。=Update this data if the user code already exists.
-提示：仅允许导入“xls”或“xlsx”格式文件！=Tip: only 'XLS' or 'XLSX' files are allowed to be imported!
+提示：仅允许导入“xls”或“xlsx”格式文件！=Tip: only 'xls' or 'xlsx' files are allowed to be imported!
 文件不正确，请选择后缀为“xls”或“xlsx”的文件。=Incorrect file. Please select a file with suffix 'xls' or 'xlsx'.

 # =========== 机构管理 ===========
@@ -329,7 +329,7 @@

 上级公司=Parent company
 公司名称=Company name
-公司编码=Company code
+公司代码=Company code
 公司全称=Company full name
 归属区域=Area
 包含机构=Organization
@@ -354,8 +354,9 @@

 岗位名称=Position name
 岗位名称已存在=Position already exists
-岗位编码=Position code
+岗位代码=Position code
 岗位分类=Position type
+关联角色=Role

 # =========== 角色管理 ===========

@@ -418,7 +419,7 @@

 二级管理员管理数据权限=Secondary administrator manage data permissions
 管理数据权限=Manage data permissions
-可管理的数据权限=Managed data permissions
+可管理的数据权限=Manage data permissions
 取消二级管理员身份=Cancel secondary administrator status
 确认要取消该用户的二级管理员身份吗？=Are you sure you want to cancel secondary administrator status?

--- a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
@@ -266,7 +266,7 @@

 上级公司=親会社
 公司名称=会社名称
-公司编码=会社コード
+公司代码=会社コード
 公司全称=会社フルネーム
 归属区域=エリア
 包含机构=機構
@@ -291,8 +291,9 @@

 岗位名称=職位名称
 岗位名称已存在=職位名称が既に存在します
-岗位编码=職位コード
+岗位代码=職位コード
 岗位分类=職位分類
+关联角色=キャラク

 # =========== 角色管理 ===========

--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
@@ -23,7 +23,7 @@
        <a-button @click="expandAll" :title="t('展开一级')">
          <Icon icon="bi:chevron-double-down" /> {{ t('展开') }}
        </a-button>
-        <a-button @click="collapseAll" :title="t('展开全部')">
+        <a-button @click="collapseAll" :title="t('折叠全部')">
          <Icon icon="bi:chevron-double-up" /> {{ t('折叠') }}
        </a-button>
        <% } %>
@@ -363,7 +363,7 @@ for(c in table.columnList){
      <% if(table.isTreeEntity){ %>
      {
        icon: 'fluent:add-circle-24-regular',
-        title: t('新建下级${functionNameSimple}'),
+        title: t('新增下级${functionNameSimple}'),
        onClick: handleForm.bind(this, {
          parentCode: record.id,
          parentName: record.${table.treeViewNameAttrName},
--- a/modules/core/src/main/resources/views/modules/sys/companyForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyForm.html
@@ -38,7 +38,7 @@
 					<div class="col-xs-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
-								<span class="required ">*</span> ${text('公司编码')}：<i class="fa icon-question hide"></i></label>
+								<span class="required ">*</span> ${text('公司代码')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:hidden path="isNewRecord"/>
 								<#form:hidden path="companyCode"/>
--- a/web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
+++ b/web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
@@ -66,7 +66,7 @@ $('#dataGrid').dataGrid({
 	},
 	columnModel: [
 		{header:'${text("岗位名称")}', name:'postName', index:'a.post_name', width:200, align:"center"},
-		{header:'${text("岗位编码")}', name:'postCode', index:'a.post_code', width:200, align:"center"},
+		{header:'${text("岗位代码")}', name:'postCode', index:'a.post_code', width:200, align:"center"},
 		{header:'${text("排序号")}', name:'postSort', index:'a.post_sort', width:80, align:"center"},
 		{header:'${text("岗位分类")}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_post_type')}, val, '未知', true);
--- a/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
+++ b/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
@@ -66,7 +66,7 @@ $('#dataGrid').dataGrid({
 	},
 	columnModel: [
 		{header:'${text("岗位名称")}', name:'postName', index:'a.post_name', width:200, align:"center"},
-		{header:'${text("岗位编码")}', name:'postCode', index:'a.post_code', width:200, align:"center"},
+		{header:'${text("岗位代码")}', name:'postCode', index:'a.post_code', width:200, align:"center"},
 		{header:'${text("排序号")}', name:'postSort', index:'a.post_sort', width:80, align:"center"},
 		{header:'${text("岗位分类")}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_post_type')}, val, '未知', true);