From 7a7e3982f3d4b49eb41aa3b9d1f8dc1d61e262bb Mon Sep 17 00:00:00 2001
From: Bane Stojkovic <bancika@gmail.com>
Date: Tue, 15 Apr 2025 18:21:37 +0200
Subject: [PATCH] Language selection doesn't work on some OSs

---
 diylc/.run/DIYLCStarter.run.xml                            | 2 +-
 .../diylc-core/src/main/java/org/diylc/lang/LangUtil.java  | 7 +++++--
 diylc/diylc-core/src/main/resources/update.xml             | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/diylc/.run/DIYLCStarter.run.xml b/diylc/.run/DIYLCStarter.run.xml
index b9dca84e..d1a9924b 100644
--- a/diylc/.run/DIYLCStarter.run.xml
+++ b/diylc/.run/DIYLCStarter.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="DIYLCStarter" type="Application" factoryName="Application" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="org.diylc.DIYLCStarter" />
     <module name="diylc-swing" />
-    <option name="VM_PARAMETERS" value="-Xms1024m -Xmx4096m -Dsun.java2d.uiScale=1.5 -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED" />
+    <option name="VM_PARAMETERS" value="-Xms1024m -Xmx4096m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="org.diylc.*" />
diff --git a/diylc/diylc-core/src/main/java/org/diylc/lang/LangUtil.java b/diylc/diylc-core/src/main/java/org/diylc/lang/LangUtil.java
index 6312f093..766b4d00 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/lang/LangUtil.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/lang/LangUtil.java
@@ -89,8 +89,11 @@ public class LangUtil {
     LOG.info("Loading translation for " + language);
     dict = new HashMap<String, String>();
     try {
-      BufferedReader reader = new BufferedReader(new InputStreamReader(
-              (LangUtil.class.getResourceAsStream("/" + LANG_DIR + File.separator + language + ".txt"))));
+      InputStream inputStream = LangUtil.class.getResourceAsStream('/' + LANG_DIR + '/' + language + ".txt");
+      if (inputStream == null) {
+        throw new RuntimeException("Could not load language file: " + language);
+      }
+      BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
       while(reader.ready()) {
         String s = reader.readLine();
         if (s.contains("|")) {
diff --git a/diylc/diylc-core/src/main/resources/update.xml b/diylc/diylc-core/src/main/resources/update.xml
index cd3a460d..5311c366 100644
--- a/diylc/diylc-core/src/main/resources/update.xml
+++ b/diylc/diylc-core/src/main/resources/update.xml
@@ -273,6 +273,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Output current subscription statistics at the end of the chat for transparency</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Language selection doesn't work on some OSs</description>
+				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>'Connect to Patreon' option doesn't work if the user name contains a space or another non-alphanumerical character</description>