From a9c722de6798cf30ca45524d3a5a3e844e7e1c58 Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 17 Jan 2013 11:02:55 -0500 Subject: [PATCH] Wrapping up the localizations... though I'm sure there are probably still some that got missed. --- .../nossr50/commands/general/InspectCommand.java | 2 +- .../nossr50/commands/general/XprateCommand.java | 2 +- .../gmail/nossr50/commands/mc/McrefreshCommand.java | 2 +- .../com/gmail/nossr50/commands/party/PtpCommand.java | 2 +- .../java/com/gmail/nossr50/party/PartyManager.java | 12 ++++++------ .../gmail/nossr50/runnables/SQLConversionTask.java | 2 +- .../gmail/nossr50/skills/gathering/Herbalism.java | 2 +- .../nossr50/skills/repair/SimpleRepairManager.java | 2 +- src/main/resources/locale/locale_cy.properties | 8 ++++++++ src/main/resources/locale/locale_de.properties | 8 ++++++++ src/main/resources/locale/locale_en_US.properties | 10 +++++++++- 11 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java index b704047a7..5f84dc8a4 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java @@ -17,7 +17,7 @@ import com.gmail.nossr50.util.Users; public class InspectCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - String usage = "Proper usage is /inspect "; //TODO: Needs more locale. + String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"inspect", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"}); if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) { return true; diff --git a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java index ff0f4ff3a..181bab644 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java @@ -74,7 +74,7 @@ public class XprateCommand implements CommandExecutor { } } else { - sender.sendMessage("The XP RATE was modified to " + Config.getInstance().xpGainMultiplier); //TODO: Locale + sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", new Object[] {Config.getInstance().xpGainMultiplier})); } } else { diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java index f85768a75..687ca697d 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java @@ -56,7 +56,7 @@ public class McrefreshCommand implements CommandExecutor { return true; } - sender.sendMessage("You have refreshed " + playerName + "'s cooldowns!"); //TODO: Use locale + sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", new Object[] {playerName})); break; diff --git a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java index f59740f18..f3951e6ac 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java @@ -47,7 +47,7 @@ public class PtpCommand implements CommandExecutor { Player target = plugin.getServer().getPlayer(args[0]); if (player.equals(target)) { - player.sendMessage("You can't teleport to yourself!"); //TODO: Use locale + player.sendMessage(LocaleLoader.getString("Party.Teleport.Self")); return true; } diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java index c5a4beb43..113c46f8f 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -248,16 +248,16 @@ public class PartyManager { if (partyPassword != null) { if (password == null) { - player.sendMessage("This party requires a password. Use /party to join it."); //TODO: Needs more locale. + player.sendMessage(LocaleLoader.getString("Party.Help.1")); return false; } else if (!password.equals(partyPassword)) { - player.sendMessage("Party password incorrect."); //TODO: Needs more locale. + player.sendMessage(LocaleLoader.getString("Party.Password.Incorrect")); return false; } } else { - player.sendMessage("Party is locked."); //TODO: Needs more locale. + player.sendMessage(LocaleLoader.getString("Party.Locked")); return false; } } @@ -323,13 +323,13 @@ public class PartyManager { for (Player member : party.getOnlineMembers()) { if (member.getName().equals(playerName)) { - member.sendMessage("You are now the party owner."); //TODO: Needs more locale. + member.sendMessage(LocaleLoader.getString("Party.Owner.Player")); } else if (member.equals(leaderName)) { - member.sendMessage("You are no longer party owner."); //TODO: Needs more locale. + member.sendMessage(LocaleLoader.getString("Party.Owner.NotLeader")); } else { - member.sendMessage(playerName + " is the new party owner."); //TODO: Needs more Locale. + member.sendMessage(LocaleLoader.getString("Party.Owner.New", new Object[] {playerName})); } } diff --git a/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java b/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java index 00ff8d7b0..21b748f61 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java @@ -275,7 +275,7 @@ public class SQLConversionTask implements Runnable { } } - System.out.println("[mcMMO] MySQL Updated from users file, " + theCount + " items added/updated to MySQL DB"); //TODO: Locale + System.out.println("[mcMMO] MySQL Updated from users file, " + theCount + " items added/updated to MySQL DB"); in.close(); } catch (Exception e) { diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java index ab8d37b1c..ee7801ddb 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java @@ -41,7 +41,7 @@ public class Herbalism { boolean hasSeeds = inventory.contains(Material.SEEDS); if (!hasSeeds) { - player.sendMessage("You need more seeds to spread Green Terra"); //TODO: Needs more locale. + player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.NeedMore")); } else if (hasSeeds && !block.getType().equals(Material.WHEAT)) { inventory.removeItem(new ItemStack(Material.SEEDS)); diff --git a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java index 2085deaf8..5b0e3f977 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java @@ -124,7 +124,7 @@ public class SimpleRepairManager implements RepairManager { // This should never happen, but if it does we need to complain loudly about it. if (repairItemLocation == -1) { - player.sendMessage("mcMMO encountered an error attempting to repair this item!"); // TODO: Locale ? + player.sendMessage(LocaleLoader.getString("Repair.Error")); return; } diff --git a/src/main/resources/locale/locale_cy.properties b/src/main/resources/locale/locale_cy.properties index 8e338f10a..07bca3e37 100644 --- a/src/main/resources/locale/locale_cy.properties +++ b/src/main/resources/locale/locale_cy.properties @@ -96,6 +96,7 @@ Fishing.Skillup=[[YELLOW]]Fishing skill increased by {0}. Total ({1}) Herbalism.Ability.DoubleDropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0} Herbalism.Ability.FD=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} Herbalism.Ability.GTe.Length=[[RED]]Green Terra Length: [[YELLOW]]{0}s +Herbalism.Ability.GTe.NeedMore=[[RED]]You need more seeds to spread Green Terra. Herbalism.Ability.GTh.Chance=[[RED]]Green Thumb Chance: [[YELLOW]]{0} Herbalism.Ability.GTh.Fail=[[RED]]**GREEN THUMB FAIL** Herbalism.Ability.GTh.Stage=[[RED]]Green Thumb Stage: [[YELLOW]] Crops grow in stage {0} @@ -179,6 +180,7 @@ Repair.Effect.8=Arcane Forging Repair.Effect.9=Atgyweiriwch eitemau sydd hud Repair.Effect.16=Salvage ({0}+ SKILL) Repair.Effect.17=Salvage Tools & Armor +Repair.Error=[[DARK_RED]]mcMMO encountered an error attempting to repair this item! Repair.Listener.Anvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor. Repair.Listener.Anvil2=[[DARK_RED]]You have placed a Salvage anvil, use this to Salvage tools and armor. Repair.Listener=Atgyweirio: @@ -365,6 +367,7 @@ Commands.mcrank.Overall=[[YELLOW]]Overall[[GREEN]] - [[GOLD]]Rank [[WHITE]]#[[GR Commands.mcrank.Player=[[RED]]TARGET: [[WHITE]]{0} Commands.mcrank.Skill=[[YELLOW]]{0}[[GREEN]] - [[GOLD]]Rank [[WHITE]]#[[GREEN]]{1} Commands.mcrank.Unranked=[[WHITE]]Unranked +Commands.mcrefresh.Success=[[RED]]{0}'s cooldowns have been refreshed. Commands.mcremove.Success=[[GREEN]]{0} was successfully removed from the database! Commands.mctop.Tip=[[GOLD]]Tip: Use [[RED]]/mcrank[[GOLD]] to view all of your personal rankings! Commands.mmoedit=[chwaraewr] [[RED]] - Targed addasu @@ -432,6 +435,10 @@ Party.IsntLocked=[[RED]]This party is not locked! Party.Locked=[[RED]]Party is locked, only party leader may invite. Party.NotInYourParty=[[DARK_RED]]{0} is not in your party Party.NotOwner=[[DARK_RED]]You are not the party owner +Party.Owner.New=[[GREEN]]{0} is the new party leader. +Party.Owner.NotLeader=[[DARK_RED]]You are no longer the party leader. +Party.Owner.Player =[[GREEN]]You are now the party leader. +Party.Password.Incorrect=[[RED]]Party password is incorrect. Party.PasswordSet=[[GREEN]] Blaid cyfrinair wedi ei osod i {0} Party.Player.Invalid=[[RED]] Nid yw hynny\'n chwaraewr ddilys. Party.Teleport.Dead=[[RED]] Ni allwch teleport y chwaraewr yn farw. @@ -455,6 +462,7 @@ Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]] Cael Profiad: [[WHITE]] {0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! +Commands.xprate.modified=[[RED]]The XP RATE was modified to {0} Commands.xprate.over=[[RED]]mcMMO XP Rate Event is OVER!! Commands.xprate.proper.0=[[RED]]Proper usage to change the XP rate is /xprate Commands.xprate.proper.1=[[RED]]Proper usage to restore the XP rate to default is /xprate reset diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index d58f252b9..6f839dadf 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -115,6 +115,7 @@ Fishing.Skillup=[[YELLOW]]Angel Skill um {0} gestiegen. Gesamt ({1}) Herbalism.Ability.DoubleDropChance=[[RED]]Chance auf Doppel-Drops: [[YELLOW]]{0} Herbalism.Ability.FD=[[RED]]Bauernfr\u00FChst\u00FCck Rang:[[YELLOW]] {0} Herbalism.Ability.GTe.Length=[[RED]]Gr\u00FCnes Land Dauer: [[YELLOW]]{0}s +Herbalism.Ability.GTe.NeedMore=[[RED]]You need more seeds to spread Green Terra. Herbalism.Ability.GTh.Chance=[[RED]]Gr\u00FCner Daumen Chance: [[YELLOW]]{0} Herbalism.Ability.GTh.Fail=[[RED]]**Gr\u00FCner Daumen GESCHEITERT** Herbalism.Ability.GTh.Stage=[[RED]]Gr\u00FCner Daumen Stufe: [[YELLOW]] Weizen w\u00E4chst auf Stufe {0} @@ -204,6 +205,7 @@ Repair.Effect.8=Arkanes Schmieden Repair.Effect.9=Repariere magische Gegenst\u00E4nde Repair.Effect.16=Verwertung ({0}+ SKILL) Repair.Effect.17=Verwerte Werkzeuge & R\u00FCstung +Repair.Error=[[DARK_RED]]mcMMO encountered an error attempting to repair this item! Repair.Listener.Anvil=[[DARK_RED]]Du hast einen Amboss gebaut, hiermit kannst du R\u00FCstung und Werkzeug reparieren. Repair.Listener.Anvil2=[[DARK_RED]]Du hast einen Verwertungs-Amboss gebaut, hiermit kannst du R\u00FCstung und Werkzeug verwerten. Repair.Listener=Reparatur: @@ -408,6 +410,7 @@ Commands.mcrank.Overall=[[YELLOW]]Overall[[GREEN]] - [[GOLD]]Rank [[WHITE]]#[[GR Commands.mcrank.Player=[[RED]]TARGET: [[WHITE]]{0} Commands.mcrank.Skill=[[YELLOW]]{0}[[GREEN]] - [[GOLD]]Rank [[WHITE]]#[[GREEN]]{1} Commands.mcrank.Unranked=[[WHITE]]Unranked +Commands.mcrefresh.Success=[[RED]]{0}'s cooldowns have been refreshed. Commands.mcremove.Success=[[GREEN]]{0} was successfully removed from the database! Commands.mctop.Tip=[[GOLD]]Tip: Use [[RED]]/mcrank[[GOLD]] to view all of your personal rankings! Commands.mmoedit=[Spieler] [[RED]] - Ziel modifizieren @@ -480,6 +483,10 @@ Party.IsntLocked=[[RED]]Diese Gruppe ist NICHT gesperrt! Party.Locked=[[RED]]Gruppe gesperrt, nur der Gruppenleiter kann Einladungen versenden. Party.NotInYourParty=[[DARK_RED]]{0} ist nicht in deiner Gruppe Party.NotOwner=[[DARK_RED]]Du bist nicht der Gruppenleiter +Party.Owner.New=[[GREEN]]{0} is the new party leader. +Party.Owner.NotLeader=[[DARK_RED]]You are no longer the party leader. +Party.Owner.Player =[[GREEN]]You are now the party leader. +Party.Password.Incorrect=[[RED]]Party password is incorrect. Party.PasswordSet=[[GREEN]]Gruppen-Password ge\u00E4ndert zu: {0} Party.Player.Invalid=[[RED]]Dies ist kein g\u00FCltiger Spieler. Party.Teleport.Dead=[[RED]]Du kannst dich nicht zu toten Spielern teleportieren @@ -505,6 +512,7 @@ Commands.XPGain.Woodcutting=B\u00E4ume f\u00E4llen Commands.XPGain=[[DARK_GRAY]]XP ZUWACHS: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Deine XP Anzeige ist nun auf {0} festgesetzt! Commands.xplock.unlocked=[[GOLD]]Deine XP Anzeige ist nun wieder [[GREEN]]FREIGEGEBEN[[GOLD]]! +Commands.xprate.modified=[[RED]]The XP RATE was modified to {0} Commands.xprate.over=[[RED]]Das mcMMO XP Rate Event ist vor\u00FCber!! Commands.xprate.proper.0=[[RED]]Korrekte Eingabe f\u00FCr XP Rate Wechsel: /xprate Commands.xprate.proper.1=[[RED]]Korrekte Eingabe f\u00FCr R\u00FCcksetzung auf Standard XP Rate: /xprate reset diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 1f2529f6b..07d184f2b 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -124,6 +124,7 @@ Fishing.Skillup=[[YELLOW]]Fishing skill increased by {0}. Total ({1}) Herbalism.Ability.DoubleDropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0} Herbalism.Ability.FD=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} Herbalism.Ability.GTe.Length=[[RED]]Green Terra Length: [[YELLOW]]{0}s +Herbalism.Ability.GTe.NeedMore=[[RED]]You need more seeds to spread Green Terra. Herbalism.Ability.GTh.Chance=[[RED]]Green Thumb Chance: [[YELLOW]]{0} Herbalism.Ability.GTh.Fail=[[RED]]**GREEN THUMB FAIL** Herbalism.Ability.GTh.Stage=[[RED]]Green Thumb Stage: [[YELLOW]] Crops grow in stage {0} @@ -213,6 +214,7 @@ Repair.Effect.8=Arcane Forging Repair.Effect.9=Repair magic items Repair.Effect.16=Salvage ({0}+ SKILL) Repair.Effect.17=Salvage Tools & Armor +Repair.Error=[[DARK_RED]]mcMMO encountered an error attempting to repair this item! Repair.Listener.Anvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor. Repair.Listener.Anvil2=[[DARK_RED]]You have placed a Salvage anvil, use this to Salvage tools and armor. Repair.Listener=Repair: @@ -417,6 +419,7 @@ Commands.mcrank.Overall=[[YELLOW]]Overall[[GREEN]] - [[GOLD]]Rank [[WHITE]]#[[GR Commands.mcrank.Player=[[RED]]TARGET: [[WHITE]]{0} Commands.mcrank.Skill=[[YELLOW]]{0}[[GREEN]] - [[GOLD]]Rank [[WHITE]]#[[GREEN]]{1} Commands.mcrank.Unranked=[[WHITE]]Unranked +Commands.mcrefresh.Success=[[RED]]{0}'s cooldowns have been refreshed. Commands.mcremove.Success=[[GREEN]]{0} was successfully removed from the database! Commands.mctop.Tip=[[GOLD]]Tip: Use [[RED]]/mcrank[[GOLD]] to view all of your personal rankings! Commands.mmoedit=[player] [[RED]] - Modify target @@ -488,7 +491,11 @@ Party.IsLocked=[[RED]]This party is already locked! Party.IsntLocked=[[RED]]This party is not locked! Party.Locked=[[RED]]Party is locked, only party leader may invite. Party.NotInYourParty=[[DARK_RED]]{0} is not in your party -Party.NotOwner=[[DARK_RED]]You are not the party owner +Party.NotOwner=[[DARK_RED]]You are not the party leader. +Party.Owner.New=[[GREEN]]{0} is the new party leader. +Party.Owner.NotLeader=[[DARK_RED]]You are no longer the party leader. +Party.Owner.Player =[[GREEN]]You are now the party leader. +Party.Password.Incorrect=[[RED]]Party password is incorrect. Party.PasswordSet=[[GREEN]]Party password set to {0} Party.Player.Invalid=[[RED]]That is not a valid player. Party.Teleport.Dead=[[RED]]You can't teleport to a dead player. @@ -514,6 +521,7 @@ Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! +Commands.xprate.modified=[[RED]]The XP RATE was modified to {0} Commands.xprate.over=[[RED]]mcMMO XP Rate Event is OVER!! Commands.xprate.proper.0=[[RED]]Proper usage to change the XP rate is /xprate Commands.xprate.proper.1=[[RED]]Proper usage to restore the XP rate to default is /xprate reset