Changeset 13502 in josm for trunk/src/org

Timestamp:

2018-03-04T18:16:19+01:00 (7 years ago)

Author:

stoecker

Message:

see #11392 - first try to add I18n for external Validators (style, presets still missing)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• tools/I18n.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -67 +67 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -743 +744 @@
              InputStream s = zip != null ? zip : cache.getInputStream();
              Reader reader = new BufferedReader(UTFInputStreamReader.create(s))) {
+            if (zip != null)
+                I18n.addTextsZip(cache.getFile());
             result = TagCheck.readMapCSS(reader);
             checks.remove(url);

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -22 +22 @@
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 /**
@@ -367 +368 @@
     }
 
+    /**
+     * I18n initialization for plugins.
+     * @param source file path/name of the JAR file containing translation strings
+     * @since 4159
+     */
     public static void addTexts(File source) {
         if ("en".equals(loadedCode))
@@ -398 +404 @@
                 }
             }
+        } catch (IOException | InvalidPathException e) {
+            Logging.trace(e);
+        }
+    }
+
+    /**
+     * I18n initialization for Zip based resources.
+     * @param source input Zip source
+     * @since xxx
+     */
+    public static void addTextsZip(File source) {
+        if ("en".equals(loadedCode))
+            return;
+        final ZipEntry enfile = new ZipEntry("data/en.lang");
+        final ZipEntry langfile = new ZipEntry("data/"+loadedCode+".lang");
+        try (
+            ZipFile zipFile = new ZipFile(source, StandardCharsets.UTF_8);
+            InputStream orig = zipFile.getInputStream(enfile);
+            InputStream trans = zipFile.getInputStream(langfile);
+        ) {
+            if (orig != null && trans != null)
+                load(orig, trans, true);
         } catch (IOException | InvalidPathException e) {
             Logging.trace(e);