From a64577ac9724bcbc4f985479f085b0bf520d4c18 Mon Sep 17 00:00:00 2001 From: ineanto Date: Thu, 16 May 2024 21:23:10 +0200 Subject: [PATCH] feat(gui): translate left item --- .../java/xyz/ineanto/nicko/anvil/AnvilManager.java | 14 +++++++++++--- src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java | 2 ++ src/main/java/xyz/ineanto/nicko/i18n/Locale.java | 2 +- src/main/resources/en.yml | 6 +++++- src/main/resources/fr.yml | 6 +++++- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java b/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java index e52ad99..2c2f7ce 100644 --- a/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java +++ b/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java @@ -26,9 +26,11 @@ public class AnvilManager { private final AppearanceManager appearanceManager; private final PlayerDataStore dataStore = NickoBukkit.getInstance().getDataStore(); private final NickoProfile profile; + private final I18N i18n; public AnvilManager(Player player) { this.player = player; + this.i18n = new I18N(player); final Optional optionalProfile = dataStore.getData(player.getUniqueId()); this.profile = optionalProfile.orElse(NickoProfile.EMPTY_PROFILE.clone()); @@ -112,7 +114,6 @@ public class AnvilManager { Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { return Collections.singletonList(AnvilGUI.ResponseAction.close()); } - final I18N i18n = new I18N(player); final ActionResult actionResult = appearanceManager.updatePlayer(skinChange, false); if (!actionResult.isError()) { player.sendMessage(i18n.translate(I18NDict.Event.Appearance.Set.OK, true)); @@ -130,8 +131,15 @@ public class AnvilManager { private ItemStack getLeftItem(boolean skin) { final ItemStack item = new ItemStack(Material.PAPER); final ItemMeta meta = item.getItemMeta(); - // TODO (Ineanto, 12/28/23): Translate this - if (meta != null) meta.displayName(Component.text("New " + (skin ? "skin" : "name") + "...")); + + if (meta != null) { + if (skin) { + meta.displayName(Component.text(i18n.translate(I18NDict.GUI.NEW_SKIN, false))); + } else { + meta.displayName(Component.text(i18n.translate(I18NDict.GUI.NEW_NAME, false))); + } + } + item.setItemMeta(meta); return item; } diff --git a/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java b/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java index 95a3398..26392de 100644 --- a/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java +++ b/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java @@ -76,6 +76,8 @@ public class I18NDict { public static final String LOADING = GUI_KEY + "loading"; public static final String SCROLL_UP = GUI_KEY + "scroll_up"; public static final String SCROLL_DOWN = GUI_KEY + "scroll_down"; + public static final String NEW_SKIN = GUI_KEY + "new_skin"; + public static final String NEW_NAME = GUI_KEY + "new_name"; public static class Titles { public static final String TITLE_KEY = GUI_KEY + "title."; diff --git a/src/main/java/xyz/ineanto/nicko/i18n/Locale.java b/src/main/java/xyz/ineanto/nicko/i18n/Locale.java index f1d7f3d..e548692 100644 --- a/src/main/java/xyz/ineanto/nicko/i18n/Locale.java +++ b/src/main/java/xyz/ineanto/nicko/i18n/Locale.java @@ -9,7 +9,7 @@ public enum Locale implements Serializable { FRENCH("fr", "Français"), CUSTOM("cm", "Server Custom"); - public static final Version VERSION = new Version(1, 1, 2); + public static final Version VERSION = new Version(1, 1, 3); private final String code; private transient final String name; diff --git a/src/main/resources/en.yml b/src/main/resources/en.yml index 0e544f7..2458b6a 100644 --- a/src/main/resources/en.yml +++ b/src/main/resources/en.yml @@ -1,7 +1,7 @@ # Nicko ${version} - Language File: # Specifies the configuration version, don't change. -version: "1.1.2" +version: "1.1.3" error: generic: "An unknown error occurred." @@ -73,6 +73,10 @@ gui: name: "Scroll down" lore: - "(You can't scroll any further down.)" + new_skin: + name: "New skin..." + new_name: + name: "New name..." home: admin: name: "Administration panel" diff --git a/src/main/resources/fr.yml b/src/main/resources/fr.yml index 60682bb..dc68fe3 100644 --- a/src/main/resources/fr.yml +++ b/src/main/resources/fr.yml @@ -1,7 +1,7 @@ # Nicko ${version} - Fichier de langue: # Précise la version de la configuration, ne pas changer. -version: "1.1.2" +version: "1.1.3" error: generic: "Une erreur inconnue c'est produite." @@ -74,6 +74,10 @@ gui: name: "Défiler vers le bas" lore: - "(Impossible de défiler plus bas.)" + new_skin: + name: "Nouveau skin..." + new_name: + name: "Nouveau nom..." home: admin: name: "Panel d'administration"