Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-22 23:31:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix default locale

Browse Source
This commit is contained in:
Kieran Wallbanks 2021-06-10 14:11:49 +01:00
parent b1f72faa67
commit e532f16735
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/net/minestom/server/adventure/AdventureSerializer.java
View File

@ -13,6 +13,8 @@ import java.util.Locale;
import java.util.Objects; import java.util.Objects;
import java.util.function.Function; import java.util.function.Function;
import org.jetbrains.annotations.Nullable;
/** /**
* Manager class for handling Adventure serialization. By default AdventureSerializer will simply * Manager class for handling Adventure serialization. By default AdventureSerializer will simply
* serialize components to Strings using {@link GsonComponentSerializer}. However, AdventureSerializer * serialize components to Strings using {@link GsonComponentSerializer}. However, AdventureSerializer
@ -35,7 +37,7 @@ public class AdventureSerializer {
protected static final Localizable NULL_LOCALIZABLE = () -> null; protected static final Localizable NULL_LOCALIZABLE = () -> null;
private static Function<Component, String> serializer = component -> GsonComponentSerializer.gson().serialize(component); private static Function<Component, String> serializer = component -> GsonComponentSerializer.gson().serialize(component);
private static Locale defaultLocale = Locale.US; private static Locale defaultLocale = Locale.getDefault();
private AdventureSerializer() {} private AdventureSerializer() {}
@ -73,10 +75,10 @@ public class AdventureSerializer {
* {@link #translate(Component, Localizable)} is called with a localizable that * {@link #translate(Component, Localizable)} is called with a localizable that
* does not have a locale. * does not have a locale.
* *
* @param defaultLocale the new default locale * @param defaultLocale the new default locale, or {@code null} to return to the default
*/ */
public static void setDefaultLocale(@NotNull Locale defaultLocale) { public static void setDefaultLocale(@Nullable Locale defaultLocale) {
AdventureSerializer.defaultLocale = defaultLocale; AdventureSerializer.defaultLocale = Objects.requireNonNullElseGet(defaultLocale, Locale::getDefault);
} }
/** /**