From b6bab121c58c857cd500d8d3a5c01c6591fa6703 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Mon, 28 Jan 2013 11:24:56 -0500
Subject: [PATCH] VIVO-12 NIHVIVO-4011 Read properties files as UTF-8

---
 .../vitro/webapp/i18n/VitroResourceBundle.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java
index d4c9754f9..c9b2b2acb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java
@@ -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();
 			}
 		}
 	}