From 2549affc1f3faf8c56ea8674cb4acd7d82cccb1b Mon Sep 17 00:00:00 2001 From: bancika Date: Fri, 24 Apr 2020 15:05:45 +0200 Subject: [PATCH] fix lang loading --- diylc/diylc-core/src/org/diylc/lang/LangUtil.java | 5 +---- diylc/diylc-swing/dict.txt | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/lang/LangUtil.java b/diylc/diylc-core/src/org/diylc/lang/LangUtil.java index 0ecd2f04..114cf936 100644 --- a/diylc/diylc-core/src/org/diylc/lang/LangUtil.java +++ b/diylc/diylc-core/src/org/diylc/lang/LangUtil.java @@ -23,18 +23,15 @@ import java.io.IOException; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.log4j.Logger; -import org.apache.log4j.lf5.util.ResourceUtils; import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.utils.ResourceLoader; @@ -137,7 +134,7 @@ public class LangUtil { String key = file.getName().replaceFirst("[.][^.]+$", ""); Map details = new HashMap(); try (Stream stream = Files.lines( - Paths.get(LANG_DIR + File.separator + file), StandardCharsets.UTF_8)) { + Paths.get(file.getAbsolutePath()), StandardCharsets.UTF_8)) { stream.forEach(s -> { if (s.contains("=")) { String[] parts = s.split("="); diff --git a/diylc/diylc-swing/dict.txt b/diylc/diylc-swing/dict.txt index 7d4ba51c..2d7241e2 100644 --- a/diylc/diylc-swing/dict.txt +++ b/diylc/diylc-swing/dict.txt @@ -46,7 +46,6 @@ G-D-S MOSFET G-S-D JFET G-S-D MOSFET Italiano -Jezik NPN Nand Nederlands