fix: multilingual

Author: entrypointkr

README.md

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'io.typst:command-bukkit:3.1.5'
+    implementation 'io.typst:command-bukkit:3.1.6'
 }
 ```
 
@@ -24,7 +24,7 @@ dependencies {
 <dependency>
     <groupId>io.typst</groupId>
     <artifactId>command-bukkit</artifactId>
-    <version>3.1.5</version>
+    <version>3.1.6</version>
 </dependency>
 ```
 

build.gradle

@@ -20,7 +20,7 @@ tasks.register("publishCentralPortal") {
 
 allprojects {
     group 'io.typst'
-    version '3.1.5'
+    version '3.1.6'
     def moduleName = name.substring(name.indexOf('-') + 1)
     ext.registerPublish = {
         publishing {

bukkit/src/main/java/io/typst/command/bukkit/BukkitCommands.java

@@ -117,7 +117,7 @@ public static <A> List<String> tabComplete(CommandSender sender, String[] args,
      */
     static <A> List<String> getCommandUsages(CommandSender sender, String label, String[] args, int position, Command<A> cmd, BukkitCommandConfig config) {
         Player player = sender instanceof Player ? ((Player) sender) : null;
-        String locale = player != null ? player.getLocale() : Locale.getDefault().getLanguage().split("_")[0].toLowerCase();
+        String locale = player != null ? player.getLocale() : Locale.getDefault().toString().toLowerCase();
         Function<BukkitCommandHelp, String> formatter = config.getFormatter();
         String[] succArgs = args.length >= 1
                 ? Arrays.copyOfRange(args, 0, position)
@@ -156,7 +156,7 @@ private static <A> List<String> getFailureMessage(CommandSender sender, String l
             List<String> usages = new ArrayList<>(getCommandUsages(
                     sender, label, unknown.getArguments(), unknown.getIndex(), unknown.getCommand(), config
             ));
-            if (locale.equals("ko")) {
+            if (locale.equals("ko_kr")) {
                 usages.add(String.format("'%s' 명령어는 존재하지 않습니다!", input));
             } else {
                 usages.add(String.format("Command '%s' doesn't exists!", input));
@@ -166,13 +166,13 @@ private static <A> List<String> getFailureMessage(CommandSender sender, String l
             CommandFailure.ParsingFailure<A> parsingFailure = (CommandFailure.ParsingFailure<A>) failure;
             List<String> usages = new ArrayList<>();
             usages.addAll(getCommandUsages(sender, label, parsingFailure.getArguments(), parsingFailure.getIndex(), parsingFailure.getCommand(), config));
-            String message = locale.equals("ko")
+            String message = locale.equals("ko_kr")
                     ? "잘못된 명령어입니다!"
                     : "Wrong command!";
             usages.add(message);
             return usages;
         }
-        String message = locale.equals("ko")
+        String message = locale.equals("ko_kr")
                 ? "잘못된 명령어입니다!"
                 : "Wrong command!";
         return Collections.singletonList(message);

bukkit/src/main/java/io/typst/command/bukkit/BukkitControlFlows.java

@@ -22,7 +22,7 @@ public static Player getPlayerOrThrow(CommandSender sender) {
         if (sender instanceof Player) {
             return ((Player) sender);
         } else {
-            String message = Locale.getDefault().getLanguage().equals("ko")
+            String message = Locale.getDefault().getLanguage().equals("ko_kr")
                     ? "§c게임에 접속해서 사용해주세요!"
                     : "§cIngame player only!";
             throw new CommandCancellationException(message);
@@ -34,7 +34,7 @@ public static ItemStack getHandItemOrThrow(Player player) {
         if (handItem != null && handItem.getType() != Material.AIR) {
             return handItem;
         }
-        String message = Locale.getDefault().getLanguage().equals("ko")
+        String message = Locale.getDefault().getLanguage().equals("ko_kr")
                 ? "§c손에 아이템을 들어주세요!"
                 : "§cPlease hold an item on your main hand!";
         throw new CommandCancellationException(message);
@@ -43,7 +43,7 @@ public static ItemStack getHandItemOrThrow(Player player) {
     static void validatePermission(Command<?> node, CommandSender sender) {
         String perm = CommandSpec.from(node).getPermission();
         if (!perm.isEmpty() && !sender.hasPermission(perm)) {
-            String message = Locale.getDefault().getLanguage().equals("ko")
+            String message = Locale.getDefault().getLanguage().equals("ko_kr")
                     ? "§c권한이 없습니다! `" + perm + "`"
                     : "§cNo permission! `" + perm + "`";
             throw new CommandCancellationException(message);

bukkit/src/test/java/io/typst/command/bukkit/CommandTest.java

@@ -33,7 +33,7 @@ public class CommandTest {
     @Test
     public void help() {
         StringBuilder output = new StringBuilder();
-        MockPlayer player = new MockPlayer(new MockSender(output), "ko", UUID.randomUUID());
+        MockPlayer player = new MockPlayer(new MockSender(output), "ko_kr", UUID.randomUUID());
         List<String> msgs = BukkitCommands.getCommandUsages(
                 player,
                 "mycmd",
@@ -57,7 +57,7 @@ public void help() {
     @Test
     public void helpFallback() {
         StringBuilder output = new StringBuilder();
-        MockPlayer player = new MockPlayer(new MockSender(output), "ko", UUID.randomUUID());
+        MockPlayer player = new MockPlayer(new MockSender(output), "ko_kr", UUID.randomUUID());
         List<String> msgs = BukkitCommands.getCommandUsages(
                 player,
                 "mycmd",
@@ -77,7 +77,7 @@ public void helpFallback() {
     @Test
     public void helpSingle() {
         StringBuilder output = new StringBuilder();
-        MockPlayer player = new MockPlayer(new MockSender(output), "ko", UUID.randomUUID());
+        MockPlayer player = new MockPlayer(new MockSender(output), "ko_kr", UUID.randomUUID());
         BukkitCommands.execute(player, "mycmd", new String[]{"d"}, command, BukkitCommandConfig.empty);
         Assertions.assertEquals(" \n/mycmd d (문자열) (정수) - desc\n잘못된 명령어입니다!\n", output.toString());
         System.out.println(output);
@@ -86,7 +86,7 @@ public void helpSingle() {
     @Test
     public void tabCompleteOnArgThatNoPermission() {
         StringBuilder output = new StringBuilder();
-        MockPlayer player = new MockPlayer(new MockSender(output), "ko", UUID.randomUUID());
+        MockPlayer player = new MockPlayer(new MockSender(output), "ko_kr", UUID.randomUUID());
         List<String> completes = BukkitCommands.tabComplete(player, new String[]{"f", ""}, command, (sender, x) -> Collections.emptyList());
         Assertions.assertEquals(Collections.emptyList(), completes);
     }

core/src/main/java/io/typst/command/CommandConfig.java

@@ -8,6 +8,7 @@
 @Value(staticConstructor = "of")
 @With
 public class CommandConfig {
+    // TODO: data instead of function
     Function<CommandHelp, String> formatter;
     boolean hideNoPermissionCommands;
     public static final CommandConfig empty = new CommandConfig(CommandHelp::format, true);

core/src/main/java/io/typst/command/CommandHelp.java

@@ -21,7 +21,7 @@ public static String format(CommandHelp help) {
         List<String> args = help.getArguments();
         String argSuffix;
         String space = args.isEmpty() ? "" : " ";
-        if (help.getLanguage().equals("ko")) {
+        if (help.getLanguage().equals("ko_kr")) {
             argSuffix = spec.getArguments().stream().anyMatch(arg -> !arg.getName().isEmpty())
                     ? space + "§e" + spec.getArguments().stream()
                     .map(s -> String.format("(%s)", translateToKor(s.getName())))