X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FLanguage.java;h=75593ccf723618a47598b084611d971c987c809e;hb=ca82909d6bb910769eb756058d51d55e6d257914;hp=9faaaad669038005d728017ee83a95c922c8afe1;hpb=457c7c1aeadfb4145572ec1155603ae4bebfedd3;p=gigi.git

diff --git a/src/org/cacert/gigi/Language.java b/src/org/cacert/gigi/Language.java
index 9faaaad6..75593ccf 100644
--- a/src/org/cacert/gigi/Language.java
+++ b/src/org/cacert/gigi/Language.java
@@ -4,11 +4,13 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Locale;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.cacert.gigi.util.HTMLEncoder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -17,12 +19,19 @@ import org.xml.sax.SAXException;
 public class Language {
 	private static HashMap<String, Language> langs = new HashMap<String, Language>();
 	HashMap<String, String> translations = new HashMap<String, String>();
-	private Language(String language) throws ParserConfigurationException,
-			IOException, SAXException {
+	Locale l;
+
+	private Language(String language) throws ParserConfigurationException, IOException, SAXException {
+		if (language.contains("_")) {
+			String[] parts = language.split("_");
+			l = new Locale(parts[0], parts[1]);
+		} else {
+			l = new Locale(language);
+		}
+
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 		DocumentBuilder db = dbf.newDocumentBuilder();
-		Document d = db.parse(new FileInputStream(new File("locale", language
-				+ ".xml")));
+		Document d = db.parse(new FileInputStream(new File("locale", language + ".xml")));
 		NodeList nl = d.getDocumentElement().getChildNodes();
 		for (int i = 0; i < nl.getLength(); i++) {
 			if (!(nl.item(i) instanceof Element)) {
@@ -31,13 +40,19 @@ public class Language {
 			Element e = (Element) nl.item(i);
 			Element id = (Element) e.getElementsByTagName("id").item(0);
 			Element msg = (Element) e.getElementsByTagName("msg").item(0);
-			translations.put(id.getTextContent(), msg.getTextContent());
+			translations.put(id.getTextContent(), HTMLEncoder.encodeHTML(msg.getTextContent()));
 		}
 		System.out.println(translations.size() + " strings loaded.");
 	}
+
 	public String getTranslation(String text) {
-		return translations.get(text);
+		String string = translations.get(text);
+		if (string == null || string.equals("")) {
+			return text;
+		}
+		return string;
 	}
+
 	public static Language getInstance(String language) {
 		Language l = langs.get(language);
 		if (l == null) {
@@ -55,4 +70,8 @@ public class Language {
 		return l;
 	}
 
+	public Locale getLocale() {
+		return l;
+	}
+
 }