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

fix duplicate filter

Browse Source
This commit is contained in:
marhali 2022-05-28 14:35:44 +02:00
parent e8236b272b
commit d4ef478d48
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/marhali/easyi18n/FilteredDataBus.java
View File

@ -116,7 +116,7 @@ public class FilteredDataBus implements BusListener {
// filter duplicate values // filter duplicate values
if(filterDuplicate) { if(filterDuplicate) {
if(!isDuplicate(value)) { if(!isDuplicate(key, value)) {
shadow.setTranslation(key, null); shadow.setTranslation(key, null);
} }
} }
@ -155,13 +155,17 @@ public class FilteredDataBus implements BusListener {
/** /**
* Filter duplicate translation values * Filter duplicate translation values
*/ */
private boolean isDuplicate(@NotNull TranslationValue value) { private boolean isDuplicate(@NotNull KeyPath key, @NotNull TranslationValue value) {
Collection<String> contents = value.getLocaleContents(); Collection<String> contents = value.getLocaleContents();
for (KeyPath currentKey : this.data.getFullKeys()) { for (KeyPath currentKey : this.data.getFullKeys()) {
TranslationValue currentValue = this.data.getTranslation(currentKey); TranslationValue currentValue = this.data.getTranslation(currentKey);
assert currentValue != null; assert currentValue != null;
if(currentKey.equals(key)) { // Only consider other translations
continue;
}
for (String currentContent : currentValue.getLocaleContents()) { for (String currentContent : currentValue.getLocaleContents()) {
if(contents.contains(currentContent)) { if(contents.contains(currentContent)) {
return true; return true;