diff --git a/lang b/lang index 9a75c1cb4..555fb5247 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 9a75c1cb4938243337fcf8d47081b8abf68ed65c +Subproject commit 555fb5247e1ed14bafc9c4f012affe8dc564f570 diff --git a/src/main/java/forestry/apiculture/CommandBeekeepingMode.java b/src/main/java/forestry/apiculture/CommandBeekeepingMode.java index 4e032d271..ccdd8b904 100755 --- a/src/main/java/forestry/apiculture/CommandBeekeepingMode.java +++ b/src/main/java/forestry/apiculture/CommandBeekeepingMode.java @@ -78,7 +78,7 @@ public class CommandBeekeepingMode extends CommandMC { public void processCommand(ICommandSender sender, String[] arguments) { if (arguments.length <= 0) - throw new WrongUsageException("Type '" + this.getCommandUsage(sender) + "' for help."); + throw new WrongUsageException(StringUtil.localizeAndFormat("chat.help",this.getCommandUsage(sender))); if (arguments[0].matches("list")) listModes(sender, arguments); @@ -93,10 +93,10 @@ public class CommandBeekeepingMode extends CommandMC { IBeekeepingMode mode = PluginApiculture.beeInterface.getBeekeepingMode(desired); if (mode == null) - throw new CommandException("A bekeeping mode called '%s' is not available.", desired); + throw new CommandException(StringUtil.localize("chat.bees.command.beekeeping.error"), desired); PluginApiculture.beeInterface.setBeekeepingMode(world, mode.getName()); - func_152373_a(sender, this, "Beekeeping mode set to %s.", mode.getName()); + func_152373_a(sender, this, StringUtil.localize("chat.bees.command.beekeeping.set"), mode.getName()); } else if (arguments[0].matches("save")) { if (arguments.length <= 1) diff --git a/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java b/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java index 11291667e..8b7b64dc6 100755 --- a/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java +++ b/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java @@ -78,7 +78,7 @@ public class CommandTreekeepingMode extends CommandMC { public void processCommand(ICommandSender sender, String[] arguments) { if (arguments.length <= 0) - throw new WrongUsageException("Type '" + this.getCommandUsage(sender) + "' for help."); + throw new WrongUsageException(StringUtil.localizeAndFormat("chat.help",this.getCommandUsage(sender))); if (arguments[0].matches("list")) listModes(sender, arguments); @@ -93,10 +93,10 @@ public class CommandTreekeepingMode extends CommandMC { ITreekeepingMode mode = PluginArboriculture.treeInterface.getTreekeepingMode(desired); if (mode == null) - throw new CommandException("A treekeeping mode called '%s' is not available.", desired); + throw new CommandException(StringUtil.localize("chat.trees.command.treekeeping.error"), desired); PluginArboriculture.treeInterface.setTreekeepingMode(world, mode.getName()); - func_152373_a(sender, this, "Treekeeping mode set to %s.", mode.getName()); + func_152373_a(sender, this, StringUtil.localize("chat.trees.command.treekeeping.set"), mode.getName()); } else if (arguments[0].matches("save")) { if (arguments.length <= 1) diff --git a/src/main/java/forestry/core/CommandForestry.java b/src/main/java/forestry/core/CommandForestry.java index 97204f8b8..a66ad7dca 100755 --- a/src/main/java/forestry/core/CommandForestry.java +++ b/src/main/java/forestry/core/CommandForestry.java @@ -53,7 +53,7 @@ public class CommandForestry extends CommandMC { public void processCommand(ICommandSender sender, String[] arguments) { if (arguments.length <= 0) - throw new WrongUsageException("Type '" + this.getCommandUsage(sender) + "' for help."); + throw new WrongUsageException(StringUtil.localizeAndFormat("chat.help",this.getCommandUsage(sender))); if (arguments[0].matches("version")) { commandVersion(sender, arguments); @@ -76,7 +76,7 @@ public class CommandForestry extends CommandMC { private void commandVersion(ICommandSender sender, String[] arguments) { String colour = Version.isOutdated() ? "\u00A7c" : "\u00A7a"; - sendChatMessage(sender, String.format(colour + "Forestry %s for Minecraft %s (Latest: %s).", Version.getVersion(), + sendChatMessage(sender, String.format(colour + StringUtil.localize("chat.version"), Version.getVersion(), Proxies.common.getMinecraftVersion(), Version.getRecommendedVersion())); if (Version.isOutdated()) for (String updateLine : Version.getChangelog()) @@ -123,7 +123,7 @@ public class CommandForestry extends CommandMC { } if (found == null) - throw new CommandException("No information available for plugin " + arguments[2] + "."); + throw new CommandException(StringUtil.localizeAndFormat("chat.plugins.error",arguments[2])); String entry = "\u00A7c"; if (found.isAvailable()) diff --git a/src/main/java/forestry/mail/CommandMail.java b/src/main/java/forestry/mail/CommandMail.java index 8f5689e57..704face9b 100755 --- a/src/main/java/forestry/mail/CommandMail.java +++ b/src/main/java/forestry/mail/CommandMail.java @@ -56,7 +56,7 @@ public class CommandMail extends CommandMC { @Override public void processCommand(ICommandSender sender, String[] arguments) { if (arguments.length <= 0) - throw new WrongUsageException("Type '" + this.getCommandUsage(sender) + "' for help."); + throw new WrongUsageException(StringUtil.localizeAndFormat("chat.help",this.getCommandUsage(sender))); if (arguments[0].matches("trades")) { commandTrades(sender, arguments); @@ -102,7 +102,7 @@ public class CommandMail extends CommandMC { private void commandVirtualize(ICommandSender sender, String[] arguments) { if ((sender instanceof EntityPlayer && !Proxies.common.isOp((EntityPlayer) sender)) || (!sender.canCommandSenderUseCommand(4, getCommandName()))) { - sendChatMessage(sender, "\u00a7cYou do not have permission to use this command."); + sendChatMessage(sender, "\u00a7c" + StringUtil.localize("chat.command.noperms")); return; } @@ -113,7 +113,7 @@ public class CommandMail extends CommandMC { MailAddress address = new MailAddress(arguments[1]); ITradeStation trade = PostManager.postRegistry.getTradeStation(world, address); if (trade == null) { - sendChatMessage(sender, String.format("\u00a7cNo tradestation by the name of '%s' was found.", arguments[1])); + sendChatMessage(sender, String.format("\u00a7c" + StringUtil.localize("chat.mail.command.no_tradestation"), arguments[1])); return; } diff --git a/src/main/resources/assets/forestry/lang/en_US.lang b/src/main/resources/assets/forestry/lang/en_US.lang index 8720e880a..828cd4088 100644 --- a/src/main/resources/assets/forestry/lang/en_US.lang +++ b/src/main/resources/assets/forestry/lang/en_US.lang @@ -9,11 +9,15 @@ beverage.effect.antidote=Antidote chat.accesslocked=is the owner of this machine and has locked access. chat.memorizednote=You memorize the note and dispose of the crumpled scrap of paper. chat.cannotmemorizeagain=You already memorized this information. +chat.help=Type '%s' for help. chat.command.help.0=Format: '/%s ' chat.command.help.1=Available commands: chat.command.help.2=- version : Version information. chat.command.help.3=- plugins : list of Forestry plugins. chat.command.help.4=- plugins info : information on plugin. +chat.command.noperms=You do not have permission to use this command. +chat.plugins.error=No information available for plugin %s. +chat.version=Forestry %s for Minecraft %s (Latest: %s). circuit.dampener.1=Fire Dampener circuit.electric.choke.1=Electric Choke circuit.electric.efficiency.1=Electric Efficiency @@ -656,6 +660,8 @@ chat.bees.command.help.2=- list []: lists current and available beekeep chat.bees.command.help.3=- info : information on beekeeping mode. chat.bees.command.help.4=- set [] : set beekeeping mode for world. chat.bees.command.help.5=- save [] : save beekeeping statistics for the given player. +chat.bees.command.beekeeping.error=A bekeeping mode called '%s' is not available. +chat.bees.command.beekeeping.set=Beekeeping mode set to %s. description.speciesForest=One of the most common pests in forests; Mostly docile.|Beekeeping 101 description.speciesMeadows=Infests mostly plains in temperate climates; Mostly docile.|Beekeeping 101 description.speciesCommon=Considered the beginner apiarist's badge of participation.|Beekeeping 101 @@ -732,6 +738,8 @@ chat.trees.command.help.2=- list []: lists current and available treeke chat.trees.command.help.3=- info : information on treekeeping mode. chat.trees.command.help.4=- set [] : set treekeeping mode for world. chat.trees.command.help.5=- save [] : save treekeeping statistics for the given player. +chat.trees.command.treekeeping.error=A treekeeping mode called '%s' is not available. +chat.trees.command.treekeeping.set=Treekeeping mode set to %s. gui.maturity=Matures gui.treealyzer=Treealyzer gui.treealyzer.help=Supply sapling and provide honey or honeydew as catalyst. @@ -974,6 +982,7 @@ chat.mail.command.help.0=Format: '/%s ' chat.mail.command.help.1=Available commands: chat.mail.command.help.2=- trades : A list of all trade stations. chat.mail.command.help.3=- virtualize : Toggle virtual mode on specified trade station. +chat.mail.command.no_tradestation=No tradestation by the name of '%s' was found. chat.mail.no_mailbox=Recipient has no mailbox. chat.mail.not_mailable=Letter is not sendable. chat.mail.not_postpaid=Letter is not sufficiently stamped.