flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

close #132

Browse Source
This commit is contained in:
Flemmli97 2022-02-07 12:15:11 +01:00
parent 99b45ac23d
commit bfa769d632
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/io/github/flemmli97/flan/config/LangManager.java
View File

@ -285,8 +285,8 @@ public class LangManager {
//To preserve order
translation = new LinkedHashMap<>();
translationArr = new LinkedHashMap<>();
this.defaultTranslation.forEach((key, t)-> translation.put(key, fromConf.getOrDefault(key, t)));
this.defaultTranslationArray.forEach((key, t)-> translationArr.put(key, fromConfArr.getOrDefault(key, t)));
this.defaultTranslation.forEach((key, t) -> translation.put(key, fromConf.getOrDefault(key, t)));
this.defaultTranslationArray.forEach((key, t) -> translationArr.put(key, fromConfArr.getOrDefault(key, t)));
} else {
translation = this.defaultTranslation;
translationArr = this.defaultTranslationArray;
@ -319,7 +319,7 @@ public class LangManager {
if (e.getValue().isJsonArray()) {
JsonArray arr = e.getValue().getAsJsonArray();
this.translationArr.put(e.getKey(), GSON.fromJson(arr, String[].class));
} else
} else if (e.getValue().isJsonPrimitive())
this.translation.put(e.getKey(), e.getValue().getAsString());
});
//en_us is basically used as a default modifiable file
@ -327,8 +327,8 @@ public class LangManager {
//To preserve order
Map<String, String> ordered = new LinkedHashMap<>();
Map<String, String[]> orderedArr = new LinkedHashMap<>();
this.defaultTranslation.forEach((key, t)-> ordered.put(key, this.translation.getOrDefault(key, t)));
this.defaultTranslationArray.forEach((key, t)-> orderedArr.put(key, this.translationArr.getOrDefault(key, t)));
this.defaultTranslation.forEach((key, t) -> ordered.put(key, this.translation.getOrDefault(key, t)));
this.defaultTranslationArray.forEach((key, t) -> orderedArr.put(key, this.translationArr.getOrDefault(key, t)));
saveTo(this.confDir.resolve("en_us.json").toFile(), ordered, orderedArr);
}
} catch (IOException e) {