i18n implementation (#55)

src/main/java/com/commafeed/frontend/model/ServerInfo.java

@@ -1,11 +1,13 @@
 package com.commafeed.frontend.model;
 
 import java.io.Serializable;
+import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import com.google.api.client.util.Maps;
 import com.wordnik.swagger.annotations.ApiClass;
 
 @SuppressWarnings("serial")
@@ -15,6 +17,7 @@ import com.wordnik.swagger.annotations.ApiClass;
 public class ServerInfo implements Serializable {
 
 	private String announcement;
+	private Map<String, String> supportedLanguages = Maps.newHashMap();
 
 	public String getAnnouncement() {
 		return announcement;
@@ -24,4 +27,12 @@ public class ServerInfo implements Serializable {
 		this.announcement = announcement;
 	}
 
+	public Map<String, String> getSupportedLanguages() {
+		return supportedLanguages;
+	}
+
+	public void setSupportedLanguages(Map<String, String> supportedLanguages) {
+		this.supportedLanguages = supportedLanguages;
+	}
+
 }

src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java

@@ -26,6 +26,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.util.crypt.Base64;
 
 import com.commafeed.backend.MetricsBean;
+import com.commafeed.backend.StartupBean;
 import com.commafeed.backend.dao.FeedCategoryDAO;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedEntryDAO;
@@ -89,6 +90,9 @@ public abstract class AbstractREST {
 	@Inject
 	UserService userService;
 
+	@Inject
+	StartupBean startupBean;
+
 	@Inject
 	UserSettingsDAO userSettingsDAO;
 

src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java

@@ -18,6 +18,8 @@ public class ServerREST extends AbstractResourceREST {
 		ServerInfo infos = new ServerInfo();
 		infos.setAnnouncement(applicationSettingsService.get()
 				.getAnnouncement());
+		infos.getSupportedLanguages().putAll(
+				startupBean.getSupportedLanguages());
 		return infos;
 	}
 }

src/main/java/com/commafeed/frontend/rest/resources/UserREST.java

@@ -64,6 +64,10 @@ public class UserREST extends AbstractResourceREST {
 	public Response saveSettings(@ApiParam Settings settings) {
 		Preconditions.checkNotNull(settings);
 
+		if (startupBean.getSupportedLanguages().get(settings.getLanguage()) == null) {
+			settings.setLanguage("en");
+		}
+
 		UserSettings s = userSettingsDAO.findByUser(getUser());
 		if (s == null) {
 			s = new UserSettings();

src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java

@@ -3,6 +3,7 @@ package com.commafeed.frontend.utils;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.regex.Matcher;
@@ -67,9 +68,10 @@ public class InternationalizationDevelopmentFilter implements Filter {
 		String lang = settings.getLanguage() == null ? "en" : settings
 				.getLanguage();
 
-		byte[] bytes = translate(wrapper.toString(), lang).getBytes();
-		response.getOutputStream().write(bytes);
+		byte[] bytes = translate(wrapper.toString(), lang).getBytes("UTF-8");
 		response.setContentLength(bytes.length);
+		response.setCharacterEncoding("UTF-8");
+		response.getOutputStream().write(bytes);
 		response.getOutputStream().close();
 
 	}
@@ -80,7 +82,7 @@ public class InternationalizationDevelopmentFilter implements Filter {
 		try {
 			is = getClass()
 					.getResourceAsStream("/i18n/" + lang + ".properties");
-			props.load(is);
+			props.load(new InputStreamReader(is, "UTF-8"));
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 		} finally {
@@ -98,7 +100,9 @@ public class InternationalizationDevelopmentFilter implements Filter {
 		while (m.find()) {
 			String var = m.group(1);
 			Object replacement = props.get(var);
-			m.appendReplacement(sb, replacement.toString());
+			String replacementValue = replacement == null ? var : replacement
+					.toString();
+			m.appendReplacement(sb, replacementValue);
 		}
 		m.appendTail(sb);
 		return sb.toString();