Skip to content

Commit 697bd6d

Browse files
author
yizhaorong
committed
添加简体中文和繁体中文支持
1 parent f58dd3a commit 697bd6d

4 files changed

Lines changed: 25 additions & 16 deletions

File tree

src/main/java/org/yzr/poi/controller/MainController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void handle(MouseEvent event) {
154154
List<CopyWriteContainer> copyWriteContainers = ExcelUtils.read(filePathLabel.getText());
155155
List<CopyWriteContainer> defaultCopyWriteContainers = new ArrayList<>(2);
156156
for (CopyWriteContainer copyWriteContainer : copyWriteContainers) {
157-
if (copyWriteContainer.getLanguage().equalsIgnoreCase("cn")
157+
if (copyWriteContainer.getLanguage().equalsIgnoreCase(Constant.SIMPLIFIED_CHINESE)
158158
|| copyWriteContainer.getLanguage().equalsIgnoreCase("en")) {
159159
defaultCopyWriteContainers.add(copyWriteContainer);
160160
}

src/main/java/org/yzr/poi/utils/Constant.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ public class Constant {
1111
// 类路径
1212
public static final String CLASS_PATH = CLASS_URL.getPath();
1313

14-
public static final String LANGUAGE_EX = "([a-zA-Z])+[_]?([a-zA-Z])*";
14+
public static final String LANGUAGE_EX = "([a-zA-Z])+[-]?([a-zA-Z])*";
15+
public static final String SIMPLIFIED_CHINESE = "zh-CN";
1516
public static final String START_KEY = "[key]";
1617
public static final String END_KEY = "[end]";
1718
public static final String COMMENT_KEY = "[comment]";

src/main/java/org/yzr/poi/utils/ExcelUtils.java

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public static List<Map<String, Object>> read4Effects(String filePath) throws Exc
175175
localValue = localValue.replaceAll("\n", "");
176176
localValue = localValue.replaceAll("\"", "\\\\\"");
177177
String languageKey = localize.getValues().get(j);
178-
if (!localValue.equalsIgnoreCase("") && !languageKey.equalsIgnoreCase("cn")) {
178+
if (!localValue.equalsIgnoreCase("") && !languageKey.equalsIgnoreCase(Constant.SIMPLIFIED_CHINESE)) {
179179
Map<String , Object> word = new HashMap<>();
180180
word.put("language", languageKey);
181181
word.put("word", localValue);
@@ -264,10 +264,10 @@ private static void parseExcel(Sheet sheet, List<Localize> list, boolean started
264264

265265
public static void generate(CopyWriteContainer copyWriteContainer, List<CopyWriteContainer> defaultCopyWriteContainers) throws Exception {
266266
String language = copyWriteContainer.getLanguage();
267-
if (language.equals("cn")) {
268-
Boolean ignoreChinese = Boolean.valueOf(PropertiesManager.getProperty(Constant.IGNORE_CHINESE));
269-
if (ignoreChinese) return;
270-
}
267+
// if (language.equals(Constant.SIMPLIFIED_CHINESE)) {
268+
// Boolean ignoreChinese = Boolean.valueOf(PropertiesManager.getProperty(Constant.IGNORE_CHINESE));
269+
// if (ignoreChinese) return;
270+
// }
271271

272272
Boolean useDefaultValue = new Boolean(PropertiesManager.getProperty(Constant.USE_DEFAULT_VALUE));
273273
if (useDefaultValue) {
@@ -345,17 +345,25 @@ private static void createLocalizeFile(String language, String code, List<Locali
345345
if (ignoreEnglishSuffix) {
346346
language = "";
347347
} else {
348-
language = "-en";
348+
language = "en";
349349
}
350-
filePath = basePath +"values" + language + File.separator + PropertiesManager.getProperty(code+"FileName");
351-
} else {
350+
} else if (language.equals("zh-CN")) {
351+
language = "zh-rCN";
352+
} else if (language.equals("zh-TW")) {
353+
language = "zh-rTW";
354+
} else if (language.equals("id")) {
352355
Boolean fixIdLanguage = Boolean.valueOf(PropertiesManager.getProperty(Constant.FIX_ID_LANGUAGE));
353-
if (language.equals("id") && fixIdLanguage) {
356+
if (fixIdLanguage) {
354357
language = "in";
355358
}
356-
filePath = basePath +"values-" + language + File.separator + PropertiesManager.getProperty(code+"FileName");
357359
}
358360

361+
String values = "values-";
362+
if (language.length() < 1) {
363+
values = "values";
364+
}
365+
filePath = basePath + values + language + File.separator + PropertiesManager.getProperty(code+"FileName");
366+
359367
} else if (code.equalsIgnoreCase(Constant.SERVER_KEY)) {
360368
filePath = basePath + PropertiesManager.getProperty(code+"FileName") + language + ".properties";
361369
}

src/main/resources/layout/setting_stage.fxml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
</Button>
2828
</Pane>
2929
<Pane layoutY="35" prefHeight="265.0" prefWidth="400.0" style="-fx-background-color: white">
30-
<CheckBox fx:id="ignoreChinese" layoutX="10" layoutY="10" text="忽略中文文案" />
31-
<CheckBox fx:id="ignoreAndroidEnglish" layoutX="10" layoutY="35" text="忽略Android英文文件夹后缀" />
32-
<CheckBox fx:id="fixAndroidIdLanguage" layoutX="10" layoutY="60" text="修复Android印尼语key" />
33-
<CheckBox fx:id="useDefault" layoutX="10" layoutY="85.0" text="缺失文案填充默认值" />
30+
<!--<CheckBox fx:id="ignoreChinese" layoutX="10" layoutY="10" text="忽略中文备注文案" />-->
31+
<CheckBox fx:id="ignoreAndroidEnglish" layoutX="10" layoutY="10" text="忽略Android英文文件夹后缀" />
32+
<CheckBox fx:id="fixAndroidIdLanguage" layoutX="10" layoutY="35" text="修复Android印尼语key" />
33+
<CheckBox fx:id="useDefault" layoutX="10" layoutY="60" text="缺失文案填充默认值" />
3434
<!--<Label layoutX="10" layoutY="90.0" prefWidth="60" text="默认文案:" />-->
3535
<!--<TextField fx:id="defaultValue" layoutX="70.0" layoutY="85.0" />-->
3636
</Pane>

0 commit comments

Comments
 (0)