Fixed JSON encoding

rmraya · Oct 14, 2020 · d87be6d · d87be6d
1 parent 7008231
commit d87be6d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/lib/openxliff.jar b/lib/openxliff.jar
diff --git a/src/com/maxprograms/converters/Constants.java b/src/com/maxprograms/converters/Constants.java
@@ -19,8 +19,8 @@ private Constants() {
 
 	public static final String TOOLID = "OpenXLIFF";
 	public static final String TOOLNAME = "OpenXLIFF Filters";
-	public static final String VERSION = "1.11.0";
-	public static final String BUILD = "20200925_1344";
+	public static final String VERSION = "1.11.1";
+	public static final String BUILD = "20201014_1434";
 
 	public static final String SUCCESS = "0";
 	public static final String ERROR = "1";

diff --git a/src/com/maxprograms/converters/json/Json2Xliff.java b/src/com/maxprograms/converters/json/Json2Xliff.java
@@ -20,6 +20,7 @@
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 import java.net.URISyntaxException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -80,7 +81,7 @@ public static List<String> run(Map<String, String> params) {
                 segmenter = new Segmenter(initSegmenter, sourceLanguage, catalog);
             }
 
-            JSONObject json = loadFile(inputFile);
+            JSONObject json = loadFile(inputFile, encoding);
             parseJson(json);
 
             if (segments.size() == 0) {
@@ -138,9 +139,9 @@ private static void writeString(FileOutputStream out, String string) throws IOEx
         out.write(string.getBytes(StandardCharsets.UTF_8));
     }
 
-    protected static JSONObject loadFile(String file) throws IOException {
+    protected static JSONObject loadFile(String file, String charset) throws IOException {
         StringBuilder builder = new StringBuilder();
-        try (FileReader stream = new FileReader(new File(file))) {
+        try (FileReader stream = new FileReader(new File(file), Charset.forName(charset))) {
             try (BufferedReader reader = new BufferedReader(stream)) {
                 String line = "";
                 while ((line = reader.readLine()) != null) {

diff --git a/src/com/maxprograms/converters/json/Xliff2json.java b/src/com/maxprograms/converters/json/Xliff2json.java
@@ -30,6 +30,7 @@
 import com.maxprograms.xml.Catalog;
 import com.maxprograms.xml.Document;
 import com.maxprograms.xml.Element;
+import com.maxprograms.xml.PI;
 import com.maxprograms.xml.SAXBuilder;
 import com.maxprograms.xml.TextNode;
 import com.maxprograms.xml.XMLNode;
@@ -42,15 +43,13 @@
 public class Xliff2json {
 
     private static Map<String, Element> segments;
+    private static String encoding;
 
     private Xliff2json() {
         // do not instantiate this class
         // use run method instead
     }
 
-    public static void main(String[] args) {
-    }
-
     public static List<String> run(Map<String, String> params) {
         List<String> result = new ArrayList<>();
         String sklFile = params.get("skeleton");
@@ -60,13 +59,13 @@ public static List<String> run(Map<String, String> params) {
 
         try {
             loadSegments(xliffFile, catalog);
-            JSONObject json = Json2Xliff.loadFile(sklFile);
+            JSONObject json = Json2Xliff.loadFile(sklFile, encoding);
             parseJson(json);
 
             try (FileOutputStream out = new FileOutputStream(outputFile)) {
                 out.write(json.toString(4).getBytes(StandardCharsets.UTF_8));
             }
-            
+
             result.add(Constants.SUCCESS);
         } catch (IOException | SAXException | ParserConfigurationException | URISyntaxException e) {
             Logger logger = System.getLogger(Xliff2json.class.getName());
@@ -86,6 +85,11 @@ private static void loadSegments(String xliffFile, String catalog)
 
         Document doc = builder.build(xliffFile);
         Element root = doc.getRootElement();
+        List<PI> encodings = root.getChild("file").getPI("encoding");
+        if (encodings.size() == 0) {
+            throw new IOException("Missing encoding");
+        }
+        encoding = encodings.get(0).getData();
         Element body = root.getChild("file").getChild("body");
         List<Element> units = body.getChildren("trans-unit");
         Iterator<Element> i = units.iterator();