From 4d1d3d1cca2d9e96b525d0f2a9637dc11a0ce919 Mon Sep 17 00:00:00 2001 From: kordum Date: Mon, 26 Jun 2017 17:43:39 +0300 Subject: [PATCH] Added missed localization --- .../genetics/gui/AnalystPageDescription.java | 52 ++++++++++++------- .../genetics/gui/AnalystPageProduce.java | 4 +- .../gui/ControlAnalystChromosome.java | 5 +- .../genetics/gui/ControlAnalystPage.java | 8 +-- .../resources/assets/genetics/lang/en_US.lang | 13 ++++- 5 files changed, 53 insertions(+), 29 deletions(-) diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index 8feb29a0..36c3320d 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -7,6 +7,7 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import net.minecraft.util.EnumChatFormatting; @@ -18,17 +19,19 @@ public class AnalystPageDescription extends ControlAnalystPage { int y = 4; IAlleleSpecies species = ind.getGenome().getPrimary(); - String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : ""; + String branchBinomial = (species.getBranch() != null) + ? species.getBranch().getScientific() + : I18N.localise("genetics.gui.analyst.description.unknown"); String desc = species.getDescription(); - String descBody = EnumChatFormatting.ITALIC.toString(); + StringBuilder descBody = new StringBuilder(EnumChatFormatting.ITALIC.toString()); String descSig = ""; if (desc == null || desc.isEmpty() || desc.matches("(\\w+\\.?)+")) { - descBody += ""; + descBody.append(""); } else { String[] descStrings = desc.split("\\|"); - descBody += descStrings[0]; + descBody.append(descStrings[0]); for (int i = 1; i < descStrings.length - 1; ++i) { - descBody += " " + descStrings[i]; + descBody.append(" ").append(descStrings[i]); } if (descStrings.length > 1) { descSig += descStrings[descStrings.length - 1]; @@ -37,27 +40,36 @@ public class AnalystPageDescription extends ControlAnalystPage { String authority = species.getAuthority(); if (authority.contains("Binnie")) { - authority = EnumChatFormatting.DARK_BLUE.toString() + EnumChatFormatting.BOLD + authority; + authority = EnumChatFormatting.DARK_BLUE.toString() + authority; } if (authority.contains("Sengir")) { - authority = EnumChatFormatting.DARK_GREEN.toString() + EnumChatFormatting.BOLD + authority; + authority = EnumChatFormatting.DARK_GREEN.toString() + authority; } if (authority.contains("MysteriousAges")) { - authority = EnumChatFormatting.DARK_PURPLE.toString() + EnumChatFormatting.BOLD + authority; + authority = EnumChatFormatting.DARK_PURPLE.toString() + authority; } - new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + "Description").setColor(getColor()); - y += 16; - new ControlTextCentered(this, y, species.getName() + EnumChatFormatting.RESET).setColor(getColor()); - y += 10; - new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + EnumChatFormatting.RESET).setColor(getColor()); - y += 20; - new ControlTextCentered(this, y, "Discovered by " + EnumChatFormatting.BOLD + authority + EnumChatFormatting.RESET).setColor(getColor()); - y += (int) (3.0f + CraftGUI.Render.textHeight("Discovered by " + EnumChatFormatting.BOLD + authority + EnumChatFormatting.RESET, w())); - new ControlTextCentered(this, y, "Genetic Complexity: " + species.getComplexity()).setColor(getColor()); - y += 26; + new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + getTitle()) + .setColor(getColor()); - ControlText descText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descBody + EnumChatFormatting.RESET, TextJustification.TOP_CENTER); + y += 16; + new ControlTextCentered(this, y, species.getName() + EnumChatFormatting.RESET) + .setColor(getColor()); + + y += 10; + new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + EnumChatFormatting.RESET) + .setColor(getColor()); + + y += 20; + new ControlTextCentered(this, y, EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) + EnumChatFormatting.RESET) + .setColor(getColor()); + + y += (int) (3.0f + CraftGUI.Render.textHeight(EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) + EnumChatFormatting.RESET, w())); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.description.complexity", species.getComplexity())) + .setColor(getColor()); + + y += 26; + ControlText descText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descBody.toString() + EnumChatFormatting.RESET, TextJustification.TOP_CENTER); IWidget signatureText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descSig + EnumChatFormatting.RESET, TextJustification.BOTTOM_RIGHT); descText.setColor(getColor()); signatureText.setColor(getColor()); @@ -68,6 +80,6 @@ public class AnalystPageDescription extends ControlAnalystPage { @Override public String getTitle() { - return "Description"; + return I18N.localise("genetics.gui.analyst.description"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index fd5ca84f..95e5f329 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -58,7 +58,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } public Collection getSqueezer(ItemStack stack) { - List products = new ArrayList(); + List products = new ArrayList<>(); for (Map.Entry recipe : RecipeManagers.squeezerManager.getRecipes().entrySet()) { boolean isRecipe = false; for (Object obj : recipe.getKey()) { @@ -79,7 +79,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { } public Collection getCrafting(ItemStack stack) { - List products = new ArrayList(); + List products = new ArrayList<>(); for (Object recipeO : CraftingManager.getInstance().getRecipeList()) { if (recipeO instanceof ShapelessRecipes) { ShapelessRecipes recipe = (ShapelessRecipes) recipeO; diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index 3089c021..f82a510a 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -12,6 +12,7 @@ import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; import binnie.core.texture.BinnieCoreTexture; +import binnie.core.util.I18N; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; @@ -52,8 +53,8 @@ public class ControlAnalystChromosome extends Control implements ITooltip { if (isHomozygous()) { tooltip.add(system.getAlleleName(chromosomeType, allele0)); } else { - tooltip.add("Active: " + system.getAlleleName(chromosomeType, allele0)); - tooltip.add("Inactive: " + system.getAlleleName(chromosomeType, allele1)); + tooltip.add(I18N.localise("genetics.gui.analyst.chromosome.active", system.getAlleleName(chromosomeType, allele0))); + tooltip.add(I18N.localise("genetics.gui.analyst.chromosome.inactive", system.getAlleleName(chromosomeType, allele1))); } } } diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java index 473b7b4c..86b47a69 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java @@ -3,6 +3,7 @@ package binnie.genetics.gui; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.IArea; +import binnie.core.util.I18N; import java.text.DecimalFormat; @@ -14,6 +15,7 @@ public abstract class ControlAnalystPage extends Control { @Override public void onRenderBackground() { + // ignored } public abstract String getTitle(); @@ -24,11 +26,11 @@ public abstract class ControlAnalystPage extends Control { float hours = minutes / 60.0f; DecimalFormat df = new DecimalFormat("#.0"); if (hours > 1.0f) { - return df.format(hours) + " hours"; + return I18N.localise("genetics.gui.analyst.page.hours", df.format(hours)); } if (minutes > 1.0f) { - return df.format(minutes) + " min."; + return I18N.localise("genetics.gui.analyst.page.minutes", df.format(minutes)); } - return df.format(seconds) + " sec."; + return I18N.localise("genetics.gui.analyst.page.seconds", df.format(seconds)); } } diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 5f8510dd..87e584e4 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -156,6 +156,11 @@ genetics.gui.geneBank.sequencedGenes.short=%d/%d Genes genetics.gui.analyst.info=Add a bee, tree, flower or butterfly to the top left slot. DNA Dye is required if it has not been analysed yet. This dye can also convert vanilla items to breedable individuals. genetics.gui.analyst.registry=Registry +genetics.gui.analyst.page.hours=%s hours. +genetics.gui.analyst.page.minutes=%s min. +genetics.gui.analyst.page.seconds=%s sec. +genetics.gui.analyst.chromosome.active=Active: %s +genetics.gui.analyst.chromosome.inactive=Inactive: %s genetics.gui.analyst.appearance=Appearance genetics.gui.analyst.appearance.primaryColor=Primary Petal Color @@ -184,14 +189,18 @@ genetics.gui.analyst.genome.inactive=Inactive Genome genetics.gui.analyst.growth=Growth genetics.gui.analyst.karyogram=Karyogram - -genetics.gui.analyst.mutations=Mutations genetics.gui.analyst.specimen=Specimen +genetics.gui.analyst.mutations=Mutations genetics.gui.analyst.description=Description +genetics.gui.analyst.description.unknown= +genetics.gui.analyst.description.discoveredBy=Discovered by %s +genetics.gui.analyst.description.complexity=Genetic Complexity: %s genetics.gui.analyst.produce=Produce +genetics.gui.analyst.fruit=Fruit + genetics.gui.analyst.wood=Wood genetics.gui.analyst.wood.fireproof=Fireproof genetics.gui.analyst.wood.flammable=Flammable