From 1de5f0f7d29eae056bb2a640181812d10489f600 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 6 Mar 2019 19:12:57 +0000
Subject: [PATCH] Read ResourceBundles from themes as UTF-8

git-svn-id: https://svn.libreccm.org/ccm/trunk@5857 8810af33-2d31-482b-a856-94f89814c4df
---
 .../theming/ThemeResourceBundleControl.java         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ccm-themedirector/src/org/libreccm/theming/ThemeResourceBundleControl.java b/ccm-themedirector/src/org/libreccm/theming/ThemeResourceBundleControl.java
index 72472fe24..2b1f5b487 100644
--- a/ccm-themedirector/src/org/libreccm/theming/ThemeResourceBundleControl.java
+++ b/ccm-themedirector/src/org/libreccm/theming/ThemeResourceBundleControl.java
@@ -7,6 +7,8 @@ package org.libreccm.theming;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
@@ -38,16 +40,19 @@ public class ThemeResourceBundleControl extends ResourceBundle.Control {
 
         final String bundleName = toBundleName(baseName, locale);
         final String fileName = String.format("%s.properties", bundleName);
-        
+
         final InputStream stream = servletContext
             .getResourceAsStream(fileName);
-        
+
         if (stream == null) {
             return null;
         } else {
-            return new PropertyResourceBundle(stream);
+            final InputStreamReader reader = new InputStreamReader(
+                stream,
+                StandardCharsets.UTF_8);
+            return new PropertyResourceBundle(reader);
         }
-        
+
     }
 
 }