国际化调整

ktg-admin/src/main/java/com/ktg/web/controller/system/SysDictDataController.java

@@ -1,33 +1,29 @@
 package com.ktg.web.controller.system;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
 import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.core.domain.entity.SysDictData;
 import com.ktg.common.core.page.TableDataInfo;
 import com.ktg.common.enums.BusinessType;
+import com.ktg.common.utils.MessageUtils;
 import com.ktg.common.utils.StringUtils;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.system.service.ISysDictDataService;
 import com.ktg.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 数据字典信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -79,6 +75,15 @@ public class SysDictDataController extends BaseController
         if (StringUtils.isNull(data))
         {
             data = new ArrayList<SysDictData>();
+        } else {
+            // 国际化
+            if ("en_US".equals(LocaleContextHolder.getLocale().toString())) {
+                for (SysDictData datum : data) {
+                    try {
+                        datum.setDictLabel(MessageUtils.message(datum.getDictLabel()));
+                    }catch(Exception e) {}
+                }
+            }
         }
         return AjaxResult.success(data);
     }

ktg-admin/src/main/resources/i18n/messages.properties

@@ -506,3 +506,16 @@ SOP\u5217\u8868=SOP\u5217\u8868
 \u4EE3\u7801\u751F\u6210=\u4EE3\u7801\u751F\u6210
 \u7CFB\u7EDF\u63A5\u53E3=\u7CFB\u7EDF\u63A5\u53E3
 
+
+##\u5B57\u5178\u90E8\u5206
+\u603B\u89C8=\u603B\u89C8
+\u67DC\u4E2D=\u67DC\u4E2D
+\u501F\u51FA=\u501F\u51FA
+\u6B63\u5E38=\u6B63\u5E38
+\u8FC7\u671F=\u8FC7\u671F
+\u635F\u574F=\u635F\u574F
+\u662F=\u662F
+\u5426=\u5426
+\u672A\u5F00\u59CB=\u672A\u5F00\u59CB
+\u5DF2\u53D6\u6D88=\u5DF2\u53D6\u6D88
+\u5DF2\u7ED3\u675F=\u5DF2\u7ED3\u675F

ktg-admin/src/main/resources/i18n/messages_en_US.properties

@@ -506,3 +506,16 @@ SOP\u5217\u8868=SOP List
 \u4EE3\u7801\u751F\u6210=Code Generator
 \u7CFB\u7EDF\u63A5\u53E3=API Mgmt
 
+
+##\u5B57\u5178\u90E8\u5206
+\u603B\u89C8=Summary
+\u67DC\u4E2D=Available
+\u501F\u51FA=Loaned
+\u6B63\u5E38=Normal
+\u8FC7\u671F=Expired
+\u635F\u574F=Damaged
+\u662F=Yes
+\u5426=No
+\u672A\u5F00\u59CB=Pending
+\u5DF2\u53D6\u6D88=Cancelled
+\u5DF2\u7ED3\u675F=Closed

ktg-system/src/main/java/com/ktg/system/service/impl/SysMenuServiceImpl.java

@@ -16,6 +16,7 @@ import com.ktg.system.mapper.SysRoleMapper;
 import com.ktg.system.mapper.SysRoleMenuMapper;
 import com.ktg.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -164,12 +165,16 @@ public class SysMenuServiceImpl implements ISysMenuService {
             }
             routers.add(router);
         }
+
         // 国际化
-        for (RouterVo router : routers) {
-            if (StringUtils.isNotBlank(router.getMeta().getTitle())) {
-                try {
-                    router.getMeta().setTitle(MessageUtils.message(router.getMeta().getTitle()));
-                } catch (Exception e) {
+        if ("en_US".equals(LocaleContextHolder.getLocale().toString())) {
+            for (RouterVo router : routers) {
+                if (StringUtils.isNotBlank(router.getMeta().getTitle())) {
+                    try {
+                        router.getMeta().setTitle(MessageUtils.message(router.getMeta().getTitle()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }
@@ -212,11 +217,13 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus) {
         // 国际化
-        for (SysMenu menu : menus) {
-            if (StringUtils.isNotBlank(menu.getMenuName())) {
-                try {
-                    menu.setMenuName(MessageUtils.message(menu.getMenuName()));
-                } catch (Exception e) {
+        if ("en_US".equals(LocaleContextHolder.getLocale().toString())) {
+            for (SysMenu menu : menus) {
+                if (StringUtils.isNotBlank(menu.getMenuName())) {
+                    try {
+                        menu.setMenuName(MessageUtils.message(menu.getMenuName()));
+                    } catch (Exception e) {
+                    }
                 }
             }
         }