Changeset 13506 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-03-04T19:42:31+01:00 (6 years ago)

Author:

Don-vip

Message:

see #11392 - let Dirk enjoy his break

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)
• tagging/presets/TaggingPresetReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -59 +59 @@
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.LanguageInfo;
@@ -515 +516 @@
             zipFile = new ZipFile(file, StandardCharsets.UTF_8);
             zipIcons = file;
+            I18n.addTextsZip(zipIcons);
             ZipEntry zipEntry = zipFile.getEntry(zipEntryPath);
             return zipFile.getInputStream(zipEntry);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

@@ -43 +43 @@
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -343 +344 @@
             if (zip != null) {
                 zipIcons = cf.getFile();
+                I18n.addTextsZip(zipIcons);
             }
             try (InputStreamReader r = UTFInputStreamReader.create(zip == null ? cf.getInputStream() : zip)) {