From 990620ab753e28bb5a02bb952c5d94dd4fe0b40e Mon Sep 17 00:00:00 2001
From: bancika <bancika@Bancika-PC>
Date: Fri, 24 Apr 2020 14:49:10 +0200
Subject: [PATCH] include languages for OSX distribution

---
 .../{TranslateUtil.java => LangUtil.java}     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)
 rename diylc/diylc-core/src/org/diylc/lang/{TranslateUtil.java => LangUtil.java} (87%)

diff --git a/diylc/diylc-core/src/org/diylc/lang/TranslateUtil.java b/diylc/diylc-core/src/org/diylc/lang/LangUtil.java
similarity index 87%
rename from diylc/diylc-core/src/org/diylc/lang/TranslateUtil.java
rename to diylc/diylc-core/src/org/diylc/lang/LangUtil.java
index c385d257..0ecd2f04 100644
--- a/diylc/diylc-core/src/org/diylc/lang/TranslateUtil.java
+++ b/diylc/diylc-core/src/org/diylc/lang/LangUtil.java
@@ -34,14 +34,16 @@ 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;
 
-public class TranslateUtil {
+public class LangUtil {
 
   private static final String LANG_DIR = "lang";
 
-  private static final Logger LOG = Logger.getLogger(TranslateUtil.class);
+  private static final Logger LOG = Logger.getLogger(LangUtil.class);
 
   private static Map<String, String> dict = null;
   private static List<String> missing;
@@ -126,12 +128,13 @@ public class TranslateUtil {
   }
 
   public static Map<String, Map<String, String>> getAvailableLanguages() {
-    try (Stream<Path> walk = Files.walk(Paths.get(LANG_DIR))) {
-      Map<String, Map<String, String>> res = new HashMap<String, Map<String, String>>();
-      List<String> files = walk.filter(Files::isRegularFile).map(x -> x.getFileName().toString())
-          .collect(Collectors.toList());
-      for (String file : files) {
-        String key = file.replaceFirst("[.][^.]+$", "");
+    Map<String, Map<String, String>> res = new HashMap<String, Map<String, String>>();
+    File[] files = ResourceLoader.getFiles(LANG_DIR);
+    if (files == null)
+      return res;
+    try {      
+      for (File file : files) {        
+        String key = file.getName().replaceFirst("[.][^.]+$", "");
         Map<String, String> details = new HashMap<String, String>();
         try (Stream<String> stream = Files.lines(
             Paths.get(LANG_DIR + File.separator + file), StandardCharsets.UTF_8)) {
@@ -148,7 +151,7 @@ public class TranslateUtil {
         res.put(key, details);
       }
       return res;
-    } catch (IOException e) {
+    } catch (Exception e) {
       LOG.error("Error fetching available languages");
       return null;
     }