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

Timestamp:

2020-03-03T20:58:02+01:00 (5 years ago)

Author:

simon04

Message:

see #18845 - Move lang to resources/data/trans/

File:

• trunk/src/org/openstreetmap/josm/tools/I18n.java (modified) (3 diffs)

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

@@ -30 +30 @@
  */
 public final class I18n {
+
+    private static final String CORE_TRANS_DIRECTORY = "/data/trans/";
+    private static final String PLUGIN_TRANS_DIRECTORY = "data/";
 
     /**
@@ -341 +344 @@
 
     private static URL getTranslationFile(String lang) {
-        return I18n.class.getResource("/data/"+lang.replace('@', '-')+".lang");
+        return I18n.class.getResource(CORE_TRANS_DIRECTORY + lang.replace('@', '-') + ".lang");
     }
 
@@ -417 +420 @@
         if ("en".equals(loadedCode))
             return;
-        final ZipEntry enfile = new ZipEntry("data/en.lang");
-        final ZipEntry langfile = new ZipEntry("data/"+loadedCode+".lang");
+        final ZipEntry enfile = new ZipEntry(PLUGIN_TRANS_DIRECTORY + "en.lang");
+        final ZipEntry langfile = new ZipEntry(PLUGIN_TRANS_DIRECTORY + loadedCode + ".lang");
         try (
             ZipFile zipFile = new ZipFile(source, StandardCharsets.UTF_8);