Merge pull request #122 from Vexatos/master-fork

Even more localization additions.
This commit is contained in:
CovertJaguar committed 2014-08-18 00:45:26 -07:00
commit d2f2d61997
10 files changed
+65 -36

No files matched your search

+1 -1
Submodule lang updated: 9a75c1cb49...0f422edb0a.
@@ -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)
@@ -271,7 +271,7 @@ public class GuiBeealyzer extends GuiAlyzer {
if (bee.getGeneration() >= 0) {
newLine();
displayText = bee.getGeneration() + " " + StringUtil.localize("gui.beealyzer.generations");
displayText = StringUtil.localizeAndFormat("gui.beealyzer.generations", bee.getGeneration());
// offset = (int)(((158 - fontRendererObj.getStringWidth(origin)) / 2)*(1/factor));
drawCenteredLine(displayText, 8, 158, fontColor.get("gui.beealyzer.binomial"));
}
@@ -13,6 +13,7 @@ package forestry.apiculture.gui;
import java.util.ArrayList;
import java.util.HashMap;
import forestry.core.utils.StringUtil;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
@@ -57,8 +58,8 @@ public class GuiImprinter extends GuiForestry<TileForestry> {
container.updateContainer(Proxies.common.getRenderWorld());
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
int offset = (138 - fontRendererObj.getStringWidth("GENOME IMPRINTER")) / 2;
fontRendererObj.drawString("GENOME IMPRINTER", startX + 8 + offset, startY + 16, fontColor.get("gui.screen"));
int offset = (138 - fontRendererObj.getStringWidth(StringUtil.localize("gui.imprinter.name"))) / 2;
fontRendererObj.drawString(StringUtil.localize("gui.imprinter.name"), startX + 8 + offset, startY + 16, fontColor.get("gui.screen"));
IAlleleBeeSpecies primary = inventory.getPrimary();
drawBeeSpeciesIcon(primary, startX + 12, startY + 32);
@@ -68,7 +69,7 @@ public class GuiImprinter extends GuiForestry<TileForestry> {
drawBeeSpeciesIcon(secondary, startX + 12, startY + 52);
fontRendererObj.drawString(secondary.getName(), startX + 32, startY + 56, fontColor.get("gui.screen"));
String youCheater = "(You Cheater!)";
String youCheater = StringUtil.localize("gui.imprinter.cheater");
offset = (138 - fontRendererObj.getStringWidth(youCheater)) / 2;
fontRendererObj.drawString(youCheater, startX + 8 + offset, startY + 76, fontColor.get("gui.screen"));
@@ -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)
@@ -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())
@@ -12,6 +12,7 @@ package forestry.core.genetics;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IAlleleTolerance;
import forestry.core.utils.StringUtil;
public class AlleleTolerance extends Allele implements IAlleleTolerance {
@@ -33,37 +34,37 @@ public class AlleleTolerance extends Allele implements IAlleleTolerance {
public String getName() {
switch(value) {
case BOTH_1:
return "Both 1";
return StringUtil.localize("gui.beealyzer.tolerance.both1");
case BOTH_2:
return "Both 2";
return StringUtil.localize("gui.beealyzer.tolerance.both2");
case BOTH_3:
return "Both 3";
return StringUtil.localize("gui.beealyzer.tolerance.both3");
case BOTH_4:
return "Both 4";
return StringUtil.localize("gui.beealyzer.tolerance.both4");
case BOTH_5:
return "Both 5";
return StringUtil.localize("gui.beealyzer.tolerance.both5");
case DOWN_1:
return "Down 1";
return StringUtil.localize("gui.beealyzer.tolerance.down1");
case DOWN_2:
return "Down 2";
return StringUtil.localize("gui.beealyzer.tolerance.down2");
case DOWN_3:
return "Down 3";
return StringUtil.localize("gui.beealyzer.tolerance.down3");
case DOWN_4:
return "Down 4";
return StringUtil.localize("gui.beealyzer.tolerance.down4");
case DOWN_5:
return "Down 5";
return StringUtil.localize("gui.beealyzer.tolerance.down5");
case NONE:
return "None";
return StringUtil.localize("gui.beealyzer.tolerance.none");
case UP_1:
return "Up 1";
return StringUtil.localize("gui.beealyzer.tolerance.up1");
case UP_2:
return "Up 2";
return StringUtil.localize("gui.beealyzer.tolerance.up2");
case UP_3:
return "Up 3";
return StringUtil.localize("gui.beealyzer.tolerance.up3");
case UP_4:
return "Up 4";
return StringUtil.localize("gui.beealyzer.tolerance.up4");
case UP_5:
return "Up 5";
return StringUtil.localize("gui.beealyzer.tolerance.up5");
default:
return "";
+3 -3
View File
@@ -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;
}
@@ -245,7 +245,7 @@ public class ItemBackpack extends ItemInventoried {
list.add(StringUtil.localize("storage.backpack.mode.receiving"));
else if (mode == BackpackMode.RESUPPLY)
list.add(StringUtil.localize("storage.backpack.mode.resupply"));
list.add(occupied + "/" + getBackpackSize() + " " + StringUtil.localize("gui.slots"));
list.add(StringUtil.localize("gui.slots").replaceAll("%USED", String.valueOf(occupied)).replaceAll("%SIZE", String.valueOf(getBackpackSize())));
}
@@ -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 <command> <arguments>'
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 <plugin-name>: 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 %1$s for Minecraft %2$s (Latest: %3$s).
circuit.dampener.1=Fire Dampener
circuit.electric.choke.1=Electric Choke
circuit.electric.efficiency.1=Electric Efficiency
@@ -120,7 +124,23 @@ gui.beealyzer.mutations=Possible Mutations
gui.beealyzer.behaviour=Behaviour
gui.beealyzer.natural=Natural Origin
gui.beealyzer.artificial=Artificial Origin
gui.beealyzer.generations=Generations in Captivity
gui.beealyzer.generations=%s Generations in Captivity
gui.beealyzer.tolerance.both1=Both 1
gui.beealyzer.tolerance.both2=Both 2
gui.beealyzer.tolerance.both3=Both 3
gui.beealyzer.tolerance.both4=Both 4
gui.beealyzer.tolerance.both5=Both 5
gui.beealyzer.tolerance.down1=Down 1
gui.beealyzer.tolerance.down2=Down 2
gui.beealyzer.tolerance.down3=Down 3
gui.beealyzer.tolerance.down4=Down 4
gui.beealyzer.tolerance.down5=Down 5
gui.beealyzer.tolerance.none=None
gui.beealyzer.tolerance.up1=Up 1
gui.beealyzer.tolerance.up2=Up 2
gui.beealyzer.tolerance.up3=Up 3
gui.beealyzer.tolerance.up4=Up 4
gui.beealyzer.tolerance.up5=Up 5
gui.alyzer.authority=Authority
gui.alyzer.classification=Classification
gui.alyzer.nodescription=Encyclopedia Minecraftia could not provide an entry for this specimen.
@@ -183,7 +203,7 @@ gui.speciescount=Species
gui.queens=Queens
gui.princesses=Princ.
gui.drones=Drones
gui.slots=Slots
gui.slots=%USED/%SIZE Slots
gui.access=Access
gui.rule.shared=Shared
gui.rule.restricted=Restricted
@@ -195,6 +215,8 @@ gui.noeffect=No effect
gui.mail.from=From
gui.mail.to=To
gui.blank=Blank
gui.imprinter.name=GENOME IMPRINTER
gui.imprinter.cheater=(You Cheater!)
gui.mail.nametrader=Name your trade station
gui.mail.pleasesend=Please send
gui.mail.foreveryattached=for every attached
@@ -656,6 +678,8 @@ chat.bees.command.help.2=- list [<world-#>]: lists current and available beekeep
chat.bees.command.help.3=- info <mode-name> : information on beekeeping mode.
chat.bees.command.help.4=- set [<world-#>] <mode-name>: set beekeeping mode for world.
chat.bees.command.help.5=- save [<world-#>] <player-name>: 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 +756,8 @@ chat.trees.command.help.2=- list [<world-#>]: lists current and available treeke
chat.trees.command.help.3=- info <mode-name> : information on treekeeping mode.
chat.trees.command.help.4=- set [<world-#>] <mode-name>: set treekeeping mode for world.
chat.trees.command.help.5=- save [<world-#>] <player-name>: 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 +1000,7 @@ chat.mail.command.help.0=Format: '/%s <command> <arguments>'
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 <tradestation-name>: 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.