diff --git a/src/main/java/org/jcnc/jnotepad/constants/AppConstants.java b/src/main/java/org/jcnc/jnotepad/constants/AppConstants.java index 9530aff..d6378ec 100644 --- a/src/main/java/org/jcnc/jnotepad/constants/AppConstants.java +++ b/src/main/java/org/jcnc/jnotepad/constants/AppConstants.java @@ -18,10 +18,6 @@ public class AppConstants { * 初始高度 */ public static final double SCREEN_LENGTH = 600; - /** - * 应用名 - */ - public static final String APP_NAME = "JNotepad"; /** * logo地址 */ diff --git a/src/main/java/org/jcnc/jnotepad/constants/TextConstants.java b/src/main/java/org/jcnc/jnotepad/constants/TextConstants.java index f2531d5..c962615 100644 --- a/src/main/java/org/jcnc/jnotepad/constants/TextConstants.java +++ b/src/main/java/org/jcnc/jnotepad/constants/TextConstants.java @@ -6,6 +6,10 @@ import java.util.Properties; /** * 文本常量 + *

+ * 任何string请都在此处readPropertiesFromFile,然后在 + * src/main/java/org/jcnc/jnotepad/init/Config.java的getXXXXXLanguagePack + * 注册配置文件,设置多语言语言包 * * @author gewuyou */ @@ -56,7 +60,7 @@ public class TextConstants { public static final String JNOTEPAD_EN_LANGUAGE_PACK_NAME = PROPERTIES.getProperty("JNotepad en_language_pack"); /// EncodingDetector 文本常量 - public static final String UNKNOWN = "UNKNOWN"; + public static final String UNKNOWN = PROPERTIES.getProperty("UNKNOWN"); /// JNotepadStatusBox public static final String ROW = PROPERTIES.getProperty("ROW"); diff --git a/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java b/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java index 8f7c2d1..ead291a 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java +++ b/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java @@ -3,6 +3,7 @@ package org.jcnc.jnotepad.tool; import com.ibm.icu.text.CharsetDetector; import com.ibm.icu.text.CharsetMatch; +import org.jcnc.jnotepad.constants.TextConstants; import org.slf4j.Logger; import java.io.BufferedInputStream; @@ -13,6 +14,7 @@ import java.nio.charset.StandardCharsets; import static org.jcnc.jnotepad.constants.TextConstants.UNKNOWN; + /** * 编码检测工具类 * diff --git a/tool/jpackage.txt b/tool/jpackage.txt index fe617dd..85f61fc 100644 --- a/tool/jpackage.txt +++ b/tool/jpackage.txt @@ -4,7 +4,7 @@ jpackage ` -m org.jcnc.jnotepad/org.jcnc.jnotepad.LunchApp ` --runtime-image .\target\JNotepad\ ` --icon src/main/resources/img/icon.ico ` - --app-version 1.1.10 ` + --app-version 1.1.11 ` --vendor "JCNC"