Fixed issues brought up in review

This commit is contained in:
Matthew Miller
2019-11-18 19:50:52 +10:00
parent 625be46b30
commit ded86d4872
19 changed files with 76 additions and 41 deletions

View File

@ -22,6 +22,7 @@ package com.sk89q.worldedit.sponge;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.internal.cui.CUIEvent;
import com.sk89q.worldedit.session.SessionKey;
@ -144,7 +145,7 @@ public class SpongeCommandSender implements Actor {
@Override
public Locale getLocale() {
return Locale.US;
return WorldEdit.getInstance().getConfiguration().defaultLocale;
}
@Override

View File

@ -34,6 +34,7 @@ import org.slf4j.Logger;
import java.io.IOException;
import java.util.HashSet;
import java.util.Locale;
public class ConfigurateConfiguration extends LocalConfiguration {
@ -131,5 +132,11 @@ public class ConfigurateConfiguration extends LocalConfiguration {
shellSaveType = type.equals("") ? null : type;
extendedYLimit = node.getNode("compat", "extended-y-limit").getBoolean(false);
defaultLocaleName = node.getNode("default-locale").getString(defaultLocaleName);
if (defaultLocaleName.equals("default")) {
defaultLocale = Locale.getDefault();
} else {
defaultLocale = Locale.forLanguageTag(defaultLocaleName.replace('_', '-'));
}
}
}