Browse Source

i18n part 0

zhou-hao 4 years ago
parent
commit
750418a92a

+ 0 - 4
jetlinks-components/common-component/src/main/java/org/jetlinks/community/utils/ErrorUtils.java

@@ -16,8 +16,4 @@ public class ErrorUtils {
     public static <T> Mono<T> notFound(String message) {
     public static <T> Mono<T> notFound(String message) {
         return Mono.error(() -> new NotFoundException(message));
         return Mono.error(() -> new NotFoundException(message));
     }
     }
-
-    public static <T> Mono<T> accessDeny(String message) {
-        return Mono.error(() -> new AccessDenyException(message));
-    }
 }
 }

+ 3 - 2
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/enums/DeviceState.java

@@ -4,16 +4,17 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;
 import org.hswebframework.web.dict.Dict;
 import org.hswebframework.web.dict.Dict;
 import org.hswebframework.web.dict.EnumDict;
 import org.hswebframework.web.dict.EnumDict;
+import org.hswebframework.web.dict.I18nEnumDict;
 
 
 @AllArgsConstructor
 @AllArgsConstructor
 @Getter
 @Getter
 @Dict("device-state")
 @Dict("device-state")
-public enum DeviceState implements EnumDict<String> {
+public enum DeviceState implements I18nEnumDict<String> {
     notActive("未激活"),
     notActive("未激活"),
     offline("离线"),
     offline("离线"),
     online("在线");
     online("在线");
 
 
-    private String text;
+    private final String text;
 
 
     @Override
     @Override
     public String getValue() {
     public String getValue() {

+ 8 - 0
jetlinks-manager/device-manager/src/main/resources/i18n/device-manager/messages_en_US.properties

@@ -0,0 +1,8 @@
+# org.jetlinks.pro.device.entity.DeviceInstanceEntity
+#org.jetlinks.pro.device.entity.DeviceInstanceEntity.productName=Product Name
+
+# enums
+org.jetlinks.pro.device.enums.DeviceState.notActive=Disabled
+org.jetlinks.pro.device.enums.DeviceState.offline=Offline
+org.jetlinks.pro.device.enums.DeviceState.online=Online
+

+ 9 - 0
jetlinks-manager/device-manager/src/main/resources/i18n/device-manager/messages_zh_CN.properties

@@ -0,0 +1,9 @@
+# org.jetlinks.pro.device.entity.DeviceInstanceEntity
+#org.jetlinks.pro.device.entity.DeviceInstanceEntity.productName=产品名称
+
+##枚举
+
+org.jetlinks.pro.device.enums.DeviceState.notActive=未启用
+org.jetlinks.pro.device.enums.DeviceState.offline=离线
+org.jetlinks.pro.device.enums.DeviceState.online=在线
+