Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-07 04:18:26 +02:00
Code Issues Projects Releases Wiki Activity

Optimized Locale replacement

Browse Source
This commit is contained in:
Rsl1122 2019-08-30 14:44:00 +03:00
parent 074289c239
commit 27d436ce7f
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Plan/common/src/main/java/com/djrapitops/plan/system/settings/locale/Locale.java
View File

@ -19,16 +19,12 @@ package com.djrapitops.plan.system.settings.locale;
import com.djrapitops.plan.system.settings.locale.lang.*;
import com.djrapitops.plan.system.storage.file.FileResource;
import com.djrapitops.plan.system.storage.file.PlanFiles;
import org.apache.commons.lang3.StringUtils;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.*;
/**
* Represents loaded language information.
@ -73,6 +69,15 @@ public class Locale extends HashMap<Lang, Message> {
}
}
public Optional<Message> getNonDefault(Object key) {
Message storedValue = super.get(key);
if (key instanceof Lang && storedValue == null) {
return Optional.empty();
} else {
return Optional.of(storedValue);
}
}
public String getString(Lang key) {
return get(key).toString();
}
@ -99,8 +104,6 @@ public class Locale extends HashMap<Lang, Message> {
return from;
}
String replaced = from;
Lang[][] langs = new Lang[][]{
NetworkPageLang.values(),
PlayerPageLang.values(),
@ -108,23 +111,21 @@ public class Locale extends HashMap<Lang, Message> {
CommonHtmlLang.values()
};
List<Entry<Lang, Message>> entries = Arrays.stream(langs)
.flatMap(Arrays::stream)
.collect(Collectors.toMap(Function.identity(), this::get))
.entrySet().stream()
List<String> replace = new ArrayList<>();
List<String> with = new ArrayList<>();
Arrays.stream(langs).flatMap(Arrays::stream)
// Longest first so that entries that contain each other don't partially replace.
.sorted((one, two) -> Integer.compare(
two.getKey().getIdentifier().length(),
one.getKey().getIdentifier().length()
)).collect(Collectors.toList());
two.getIdentifier().length(),
one.getIdentifier().length()
))
.forEach(lang -> getNonDefault(lang).ifPresent(replacement -> {
replace.add(lang.getDefault());
with.add(replacement.toString());
}));
for (Entry<Lang, Message> entry : entries) {
String defaultValue = entry.getKey().getDefault();
String replacement = entry.getValue().toString();
replaced = replaced.replace(defaultValue, replacement);
}
return replaced;
return StringUtils.replaceEach(from, replace.toArray(new String[0]), with.toArray(new String[0]));
}
@Override

5
Plan/common/src/main/java/com/djrapitops/plan/system/settings/locale/Message.java
View File

@ -17,6 +17,7 @@
package com.djrapitops.plan.system.settings.locale;
import com.djrapitops.plugin.utilities.Verify;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringSubstitutor;
import java.io.Serializable;
@ -51,11 +52,11 @@ public class Message {
}
public String[] toArray() {
return content.split("\\\\");
return StringUtils.split(content, '\\');
}
public String[] toArray(Serializable... p) {
return parse(p).split("\\\\");
return parse(p).split(content, '\\');
}
@Override