From 3ab4938f3d1b8c66f66901e121b6a871654c40bf Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Thu, 2 May 2013 21:08:20 +0200 Subject: [PATCH] Also need to locale these two strings Closes #1019 --- src/main/java/com/gmail/nossr50/listeners/PlayerListener.java | 4 ++-- .../java/com/gmail/nossr50/skills/repair/RepairManager.java | 4 ++-- src/main/resources/locale/locale_en_US.properties | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index e682ccb8f..8f13b6b93 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -376,7 +376,7 @@ public class PlayerListener implements Listener { // Cancel repairing an enchanted item if (repairManager.checkConfirmation(blockID, false) && Config.getInstance().getRepairConfirmRequired()) { UserManager.getPlayer(player).setLastAnvilUse(Repair.repairAnvilId, 0); - player.sendMessage(LocaleLoader.getString("Skills.Cancelled", "Repair")); + player.sendMessage(LocaleLoader.getString("Skills.Cancelled", LocaleLoader.getString("Repair.Pretty.Name"))); } } /* SALVAGE CHECKS */ @@ -386,7 +386,7 @@ public class PlayerListener implements Listener { // Cancel salvaging an enchanted item if (repairManager.checkConfirmation(blockID, false) && Config.getInstance().getRepairConfirmRequired()) { UserManager.getPlayer(player).setLastAnvilUse(Repair.salvageAnvilId, 0); - player.sendMessage(LocaleLoader.getString("Skills.Cancelled", "Salvage")); + player.sendMessage(LocaleLoader.getString("Skills.Cancelled", LocaleLoader.getString("Salvage.Pretty.Name"))); } } diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java index aaf2ad9a2..456c8fd15 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -218,11 +218,11 @@ public class RepairManager extends SkillManager { mcMMOPlayer.actualizeLastAnvilUse(anvilId); if (anvilId == Repair.repairAnvilId) { - player.sendMessage(LocaleLoader.getString("Skills.ConfirmOrCancel", "Repair")); + player.sendMessage(LocaleLoader.getString("Skills.ConfirmOrCancel", LocaleLoader.getString("Repair.Pretty.Name"))); } if (anvilId == Repair.salvageAnvilId) { - player.sendMessage(LocaleLoader.getString("Skills.ConfirmOrCancel", "Salvage")); + player.sendMessage(LocaleLoader.getString("Skills.ConfirmOrCancel", LocaleLoader.getString("Salvage.Pretty.Name"))); } return false; } diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 0460d5108..0ce86f466 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -240,6 +240,8 @@ Repair.Skills.Mastery=[[RED]]Repair Mastery: [[YELLOW]]Extra {0} durability rest Repair.Skills.StackedItems=[[DARK_RED]]You can't repair stacked items. Repair.Skills.Super.Chance=[[RED]]Super Repair Chance: [[YELLOW]]{0} Repair.Skillup=[[YELLOW]]Repair skill increased by {0}. Total ({1}) +Repair.Pretty.Name=Repair +Salvage.Pretty.Name=Salvage #Arcane Forging Repair.Arcane.Chance.Downgrade=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%