Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-21 11:45:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make CaptionLoader namespace-aware

Browse Source
This commit is contained in:
SirYwell 2021-06-08 15:35:29 +02:00
parent 7f3d3ecb00
commit 2ac5fe45e3
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/src/main/java/com/plotsquared/core/PlotSquared.java
View File

@ -186,7 +186,8 @@ public class PlotSquared {
DefaultCaptionProvider.forClassLoaderFormatString(
this.getClass().getClassLoader(),
"lang/messages_%s.json"
)
),
TranslatableCaption.DEFAULT_NAMESPACE
); // the path in our jar file
// Load caption map
try {
@ -1534,7 +1535,8 @@ public class PlotSquared {
}
/**
* Register a caption map
* Register a caption map. The namespace needs be equal to the namespace used for
* the {@link TranslatableCaption}s inside the map.
*
* @param namespace Namespace
* @param captionMap Map instance

17
Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java
View File

@ -32,9 +32,9 @@ import com.plotsquared.core.configuration.caption.CaptionMap;
import com.plotsquared.core.configuration.caption.LocalizedCaptionMap;
import com.plotsquared.core.configuration.caption.PerUserLocaleCaptionMap;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -76,15 +76,18 @@ public final class CaptionLoader {
private final Locale defaultLocale;
private final Function<Path, Locale> localeExtractor;
private final DefaultCaptionProvider captionProvider;
private final String namespace;
private CaptionLoader(
final @NonNull Locale internalLocale,
final @NonNull Function<@NonNull Path, @NonNull Locale> localeExtractor,
final @NonNull DefaultCaptionProvider captionProvider
final @NonNull DefaultCaptionProvider captionProvider,
final @NonNull String namespace
) {
this.defaultLocale = internalLocale;
this.localeExtractor = localeExtractor;
this.captionProvider = captionProvider;
this.namespace = namespace;
Map<String, String> temp;
try {
temp = this.captionProvider.loadDefaults(internalLocale);
@ -107,9 +110,10 @@ public final class CaptionLoader {
public static @NonNull CaptionLoader of(
final @NonNull Locale internalLocale,
final @NonNull Function<@NonNull Path, @NonNull Locale> localeExtractor,
final @NonNull DefaultCaptionProvider captionProvider
final @NonNull DefaultCaptionProvider captionProvider,
final @NonNull String namespace
) {
return new CaptionLoader(internalLocale, localeExtractor, captionProvider);
return new CaptionLoader(internalLocale, localeExtractor, captionProvider, namespace);
}
/**
@ -209,7 +213,10 @@ public final class CaptionLoader {
save(file, map); // update the file using the modified map
}
return new LocalizedCaptionMap(locale, map.entrySet().stream()
.collect(Collectors.toMap(entry -> TranslatableCaption.of(entry.getKey()), Map.Entry::getValue)));
.collect(Collectors.toMap(
entry -> TranslatableCaption.of(this.namespace, entry.getKey()),
Map.Entry::getValue)
));
}
}