litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-12 NIHVIVO-4011 Read properties files as UTF-8

Browse source
This commit is contained in:
j2blake 2013-01-28 11:24:56 -05:00
parent f350c28d24
commit b6bab121c5
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java
View file

@ -6,6 +6,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.text.MessageFormat;
import java.util.Enumeration;
import java.util.Properties;
@ -111,20 +113,22 @@ public class VitroResourceBundle extends ResourceBundle {
log.debug("Loading bundle '" + bundleName + "' defaults from '"
+ defaultsPath + "'");
FileInputStream stream = new FileInputStream(defaultsFile);
Reader reader = new InputStreamReader(stream, "UTF-8");
try {
this.defaults.load(stream);
this.defaults.load(reader);
} finally {
stream.close();
reader.close();
}
}
if (propertiesFile != null) {
log.debug("Loading bundle '" + bundleName + "' overrides from '"
+ propertiesPath + "'");
FileInputStream stream = new FileInputStream(propertiesFile);
Reader reader = new InputStreamReader(stream, "UTF-8");
try {
this.properties.load(stream);
this.properties.load(reader);
} finally {
stream.close();
reader.close();
}
}
}