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

@ -22,6 +22,7 @@ package com.sk89q.worldedit.bukkit;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.bukkit.FaweBukkit;
import com.boydti.fawe.config.Caption;
import com.sk89q.worldedit.util.formatting.component.TextUtils;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.RunnableVal;
@ -280,7 +281,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
@Override
public Locale getLocale() {
return Locale.forLanguageTag(player.getLocale().replace('_', '-'));
return TextUtils.getLocaleByMinecraftTag(player.getLocale());
}
@Nullable