From ba753deafd67764c880c062d0634a36eca4bdf4b Mon Sep 17 00:00:00 2001 From: ineanto Date: Thu, 28 Dec 2023 21:39:04 +0100 Subject: [PATCH] feat(i18n): Updated the localization files (#tf2) --- src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java | 2 +- .../xyz/ineanto/nicko/storage/PlayerDataStore.java | 2 +- .../nicko/storage/mariadb/MariaDBStorage.java | 10 +++++----- .../ineanto/nicko/storage/mysql/MySQLStorage.java | 10 +++++----- src/main/resources/fr.yml | 14 +++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java b/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java index 8055a4c..95a3398 100644 --- a/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java +++ b/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java @@ -9,7 +9,7 @@ public class I18NDict { public static final String CACHE = ERROR_KEY + "cache"; public static final String MOJANG_NAME = ERROR_KEY + "mojang_name"; public static final String MOJANG_SKIN = ERROR_KEY + "mojang_skin"; - public static final String SQL = ERROR_KEY + "sql"; + public static final String DATABASE = ERROR_KEY + "database"; public static final String JSON = ERROR_KEY + "json"; } diff --git a/src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java b/src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java index e3b444b..81fae57 100644 --- a/src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java +++ b/src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java @@ -77,7 +77,7 @@ public class PlayerDataStore { } public ActionResult saveData(Player player) { - if (storage.isError()) return ActionResult.error(I18NDict.Error.SQL); + if (storage.isError()) return ActionResult.error(I18NDict.Error.DATABASE); if (cache.isError()) return ActionResult.error(I18NDict.Error.CACHE); if (!cache.isCached(player.getUniqueId())) return ActionResult.error(I18NDict.Error.CACHE); diff --git a/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java b/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java index f761f56..694e053 100644 --- a/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java +++ b/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java @@ -36,7 +36,7 @@ public class MariaDBStorage extends Storage { @Override public ActionResult store(UUID uuid, NickoProfile profile) { final Connection connection = getProvider().getConnection(); - if (connection == null) return ActionResult.error(I18NDict.Error.SQL); + if (connection == null) return ActionResult.error(I18NDict.Error.DATABASE); try { final PreparedStatement statement = isStored(uuid) ? @@ -45,7 +45,7 @@ public class MariaDBStorage extends Storage { return ActionResult.ok(); } catch (SQLException e) { logger.warning("Couldn't send SQL Request: " + e.getMessage()); - return ActionResult.error(I18NDict.Error.SQL); + return ActionResult.error(I18NDict.Error.DATABASE); } } @@ -103,17 +103,17 @@ public class MariaDBStorage extends Storage { @Override public ActionResult delete(UUID uuid) { final Connection connection = getProvider().getConnection(); - if (connection == null) return ActionResult.error(I18NDict.Error.SQL); + if (connection == null) return ActionResult.error(I18NDict.Error.DATABASE); try { final String sql = "DELETE FROM nicko.DATA WHERE uuid = ?"; final PreparedStatement statement = connection.prepareStatement(sql); statement.setString(1, uuid.toString()); int rows = statement.executeUpdate(); - return (rows == 1 ? ActionResult.ok() : ActionResult.error(I18NDict.Error.SQL)); + return (rows == 1 ? ActionResult.ok() : ActionResult.error(I18NDict.Error.DATABASE)); } catch (SQLException e) { logger.warning("Couldn't delete profile: " + e.getMessage()); - return ActionResult.error(I18NDict.Error.SQL); + return ActionResult.error(I18NDict.Error.DATABASE); } } diff --git a/src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java b/src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java index 490c8e1..102cdab 100644 --- a/src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java +++ b/src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java @@ -36,7 +36,7 @@ public class MySQLStorage extends Storage { @Override public ActionResult store(UUID uuid, NickoProfile profile) { final Connection connection = getProvider().getConnection(); - if (connection == null) return ActionResult.error(I18NDict.Error.SQL); + if (connection == null) return ActionResult.error(I18NDict.Error.DATABASE); try { final PreparedStatement statement = isStored(uuid) ? @@ -45,7 +45,7 @@ public class MySQLStorage extends Storage { return ActionResult.ok(); } catch (SQLException e) { logger.warning("Couldn't send SQL Request: " + e.getMessage()); - return ActionResult.error(I18NDict.Error.SQL); + return ActionResult.error(I18NDict.Error.DATABASE); } } @@ -103,17 +103,17 @@ public class MySQLStorage extends Storage { @Override public ActionResult delete(UUID uuid) { final Connection connection = getProvider().getConnection(); - if (connection == null) return ActionResult.error(I18NDict.Error.SQL); + if (connection == null) return ActionResult.error(I18NDict.Error.DATABASE); try { final String sql = "DELETE FROM nicko.DATA WHERE uuid = ?"; final PreparedStatement statement = connection.prepareStatement(sql); statement.setString(1, uuid.toString()); int rows = statement.executeUpdate(); - return (rows == 1 ? ActionResult.ok() : ActionResult.error(I18NDict.Error.SQL)); + return (rows == 1 ? ActionResult.ok() : ActionResult.error(I18NDict.Error.DATABASE)); } catch (SQLException e) { logger.warning("Couldn't delete profile: " + e.getMessage()); - return ActionResult.error(I18NDict.Error.SQL); + return ActionResult.error(I18NDict.Error.DATABASE); } } diff --git a/src/main/resources/fr.yml b/src/main/resources/fr.yml index e71d358..60682bb 100644 --- a/src/main/resources/fr.yml +++ b/src/main/resources/fr.yml @@ -1,16 +1,16 @@ -# Nicko ${version} - Config: +# Nicko ${version} - Fichier de langue: -# Specifies the configuration version, don't change. -version: "1.1.0" +# Précise la version de la configuration, ne pas changer. +version: "1.1.2" error: generic: "Une erreur inconnue c'est produite." permission: "§cVous ne possédez pas la permission." invalid_username: "§cLe pseudo n'est pas un pseudo Minecraft valide." - mojang_name: "Un compte Minecraft avec ce nom n'existe pas." - mojang_skin: "Ce compte Minecraft n'a pas de skin." - cache: "Impossible de récupérer le skin depuis le cache." - sql: "Erreur SQL" + mojang_name: "Compte Minecraft inexistant" + mojang_skin: "Skin Minecraft invalide" + cache: "Erreur du cache" + database: "Erreur SQL" json: "Erreur JSON" event: