i18n upstream merge

This commit is contained in:
NotMyFault
2019-12-09 20:07:57 +01:00
parent c5a9436174
commit 80d7b0582f
24 changed files with 121 additions and 119 deletions

View File

@ -24,6 +24,7 @@ import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extent.NullExtent;
import com.sk89q.worldedit.function.mask.BlockMask;
import com.sk89q.worldedit.function.mask.BlockMaskBuilder;
import com.sk89q.worldedit.util.formatting.component.TextUtils;
import com.sk89q.worldedit.util.logging.LogFormat;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType;
@ -210,5 +211,12 @@ public abstract class LocalConfiguration {
return item;
}
public void setDefaultLocaleName(String localeName) {
this.defaultLocaleName = localeName;
if (localeName.equals("default")) {
this.defaultLocale = Locale.getDefault();
} else {
this.defaultLocale = TextUtils.getLocaleByMinecraftTag(localeName);
}
}
}