RedGuy/easy-18in
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not override data by locale iteration

Browse Source
This commit is contained in:
Marcel Haßlinger 2021-11-10 14:15:10 +01:00
parent 70747bf90a
commit d0aff2f816
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java
View File

@ -88,16 +88,18 @@ public class ModularizedJsonIOStrategy implements IOStrategy {
continue;
}
TranslationNode moduleNode = new TranslationNode(state.isSortKeys()
? new TreeMap<>()
: new LinkedHashMap<>());
String moduleName = module.getNameWithoutExtension();
TranslationNode moduleNode = data.getNode(moduleName) != null
? data.getNode(moduleName)
: new TranslationNode(state.isSortKeys() ? new TreeMap<>() : new LinkedHashMap<>());
JsonObject tree = GSON.fromJson(new InputStreamReader(module.getInputStream(),
module.getCharset()), JsonObject.class);
JsonMapper.read(locale, tree, moduleNode);
data.getRootNode().setChildren(module.getNameWithoutExtension(), moduleNode);
data.getRootNode().setChildren(moduleName, moduleNode);
}
}