Fix/unlocalised message and user again (#180)

* Remove name localization * Bump version * Make locale codes more flexible
rainbowdashlabs · Jan 17, 2024 · c618ba2 · c618ba2
1 parent 9147d15
commit c618ba2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,7 +38,7 @@ license {
 }
 
 group = "de.chojo"
-version = "2.9.1+beta.19"
+version = "2.9.2+beta.19"
 description = "Discord utilities for use with JDA"
 
 publishData {

diff --git a/src/main/java/de/chojo/jdautil/interactions/message/Message.java b/src/main/java/de/chojo/jdautil/interactions/message/Message.java
@@ -49,8 +49,7 @@ public CommandData toCommandData(ILocalizer localizer) {
                 .setDefaultPermissions(meta.permission())
                 .setDefaultPermissions(meta.permission());
         if (meta.localized()) {
-            message.setNameLocalizations(localizer.prefixedLocalizer("message").apply(localeKey()))
-                    .setLocalizationFunction(localizer.prefixedLocalizer("message"));
+            message.setLocalizationFunction(localizer.prefixedLocalizer("message"));
         }
         return message;
     }

diff --git a/src/main/java/de/chojo/jdautil/interactions/user/User.java b/src/main/java/de/chojo/jdautil/interactions/user/User.java
@@ -48,8 +48,7 @@ public CommandData toCommandData(ILocalizer localizer) {
                 .setGuildOnly(meta.isGuildOnly())
                 .setDefaultPermissions(meta.permission());
         if (meta.localized()) {
-            user.setNameLocalizations(localizer.prefixedLocalizer("user").apply(localeKey()))
-                    .setLocalizationFunction(localizer.prefixedLocalizer("user"));
+            user.setLocalizationFunction(localizer.prefixedLocalizer("user"));
         }
         return user;
     }

diff --git a/src/main/java/de/chojo/jdautil/localization/Localizer.java b/src/main/java/de/chojo/jdautil/localization/Localizer.java
@@ -30,7 +30,7 @@
 
 public class Localizer implements ILocalizer {
     private final Pattern EMBEDDED_CODE;
-    private static final Pattern SIMPLE__CODE = Pattern.compile("^([a-zA-Z]+?\\.[a-zA-Z.]+)$");
+    private static final Pattern SIMPLE__CODE = Pattern.compile("^([a-zA-Z_]+?\\.[a-zA-Z_.]+)$");
     private static final Logger log = getLogger(Localizer.class);
     private final Map<DiscordLocale, ResourceBundle> languages;
     private final Function<Guild, Optional<DiscordLocale>> languageProvider;
@@ -40,7 +40,7 @@ public Localizer(Map<DiscordLocale, ResourceBundle> languages, Function<Guild, O
         this.languages = languages;
         this.languageProvider = languageProvider;
         this.defaultLanguage = defaultLanguage;
-        EMBEDDED_CODE = Pattern.compile("%s([a-zA-Z.]+?)%s".formatted(embedCodeStart, embedCodeEnd));
+        EMBEDDED_CODE = Pattern.compile("%s([a-zA-Z._]+?)%s".formatted(embedCodeStart, embedCodeEnd));
     }
 
     public static Builder builder(DiscordLocale defaultLanguage) {