Read ResourceBundles from themes as UTF-8

git-svn-id: https://svn.libreccm.org/ccm/trunk@5857 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-03-06 19:12:57 +00:00
parent d504f2dbb9
commit 1de5f0f7d2
1 changed files with 9 additions and 4 deletions

View File

@ -7,6 +7,8 @@ package org.libreccm.theming;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Locale; import java.util.Locale;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@ -45,7 +47,10 @@ public class ThemeResourceBundleControl extends ResourceBundle.Control {
if (stream == null) { if (stream == null) {
return null; return null;
} else { } else {
return new PropertyResourceBundle(stream); final InputStreamReader reader = new InputStreamReader(
stream,
StandardCharsets.UTF_8);
return new PropertyResourceBundle(reader);
} }
} }