Merge pull request #1220 from thatsIch/e-1219-hardcoded-localizations

Fixes #1219: Improved localization options

src/main/java/appeng/client/gui/AEBaseMEGui.java

@@ -30,6 +30,7 @@ import net.minecraft.item.ItemStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.me.SlotME;
 import appeng.core.AEConfig;
+import appeng.core.localization.ButtonToolTips;
 
 
 public abstract class AEBaseMEGui extends AEBaseGui
@@ -63,14 +64,30 @@ public abstract class AEBaseMEGui extends AEBaseGui
 				if( myStack != null )
 				{
 					if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
-						currentToolTip.add( "\u00a77Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( myStack.getStackSize() ) );
+					{
+						final String local = ButtonToolTips.ItemsStored.getLocal();
+						final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( myStack.getStackSize() );
+						final String format = String.format( local, formattedAmount );
+
+						currentToolTip.add( "\u00a77" + format );
+					}
 
 					if( myStack.getCountRequestable() > 0 )
-						currentToolTip.add( "\u00a77Items Requestable: " + NumberFormat.getNumberInstance( Locale.US ).format( myStack.getCountRequestable() ) );
+					{
+						final String local = ButtonToolTips.ItemsRequestable.getLocal();
+						final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( myStack.getCountRequestable() );
+						final String format = String.format( local, formattedAmount );
+
+						currentToolTip.add( "\u00a77" + format );
+					}
 				}
 				else if( stack.stackSize > BigNumber || ( stack.stackSize > 1 && stack.isItemDamaged() ) )
 				{
-					currentToolTip.add( "\u00a77Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.stackSize ) );
+					final String local = ButtonToolTips.ItemsStored.getLocal();
+					final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( stack.stackSize );
+					final String format = String.format( local, formattedAmount );
+
+					currentToolTip.add( "\u00a77" + format );
 				}
 			}
 		}

src/main/java/appeng/client/render/AppEngRenderItem.java

@@ -29,6 +29,7 @@ import net.minecraft.item.ItemStack;
 
 import appeng.api.storage.data.IAEItemStack;
 import appeng.core.AEConfig;
+import appeng.core.localization.GuiText;
 import appeng.util.ReadableNumberConverter;
 
 
@@ -75,7 +76,7 @@ public class AppEngRenderItem extends RenderItem
 
 			if( is.stackSize == 0 )
 			{
-				String craftLabelText = AEConfig.instance.useTerminalUseLargeFont() ? "+" : "Craft";
+				String craftLabelText = AEConfig.instance.useTerminalUseLargeFont() ? GuiText.LargeFontCraft.getLocal() : GuiText.SmallFontCraft.getLocal();
 				GL11.glDisable( GL11.GL_LIGHTING );
 				GL11.glDisable( GL11.GL_DEPTH_TEST );
 				GL11.glPushMatrix();

src/main/java/appeng/core/localization/ButtonToolTips.java

@@ -58,7 +58,10 @@ public enum ButtonToolTips
 
 	Craft, Mod, DoesntDespawn, EmitterMode, CraftViaRedstone, EmitWhenCrafting, ReportInaccessibleItems, ReportInaccessibleItemsYes, ReportInaccessibleItemsNo,
 
-	BlockPlacement, BlockPlacementYes, BlockPlacementNo;
+	BlockPlacement, BlockPlacementYes, BlockPlacementNo,
+
+	// Used in the tooltips of the items in the terminal, when moused over
+	ItemsStored, ItemsRequestable;
 
 	final String root;
 

src/main/java/appeng/core/localization/GuiText.java

@@ -70,7 +70,13 @@ public enum GuiText
 
 	NoCraftingJobs, CPUs, FacadeCrafting, inWorldCraftingPresses, ChargedQuartzFind,
 
-	Included, Excluded, Partitioned, Precise, Fuzzy;
+	Included, Excluded, Partitioned, Precise, Fuzzy,
+
+	// Used in a terminal to indicate that an item is craftable
+	SmallFontCraft, LargeFontCraft,
+
+	// Used in a ME Interface when no appropriate TileEntity was detected near it
+	Nothing;
 
 	final String root;
 

src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java

@@ -92,7 +92,7 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider
 				final String formatCurrentPower = Platform.formatPowerLong( internalCurrentPower, false );
 				final String formatMaxPower = Platform.formatPowerLong( internalMaxPower, false );
 
-				currentToolTip.add( WailaText.Contains + ": " + formatCurrentPower + " / " + formatMaxPower );
+				currentToolTip.add( WailaText.Contains.getLocal() + ": " + formatCurrentPower + " / " + formatMaxPower );
 			}
 		}