From 608ac9ac5023e76c9f737cf3234fc6009d717d51 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Tue, 22 Mar 2016 18:10:56 +0100
Subject: [PATCH] Better display in storage gui.

---
 src/main/java/refinedstorage/gui/GuiStorage.java         | 9 +--------
 src/main/resources/assets/refinedstorage/lang/en_US.lang | 4 ++--
 src/main/resources/assets/refinedstorage/lang/nl_NL.lang | 4 ++--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java
index 4ff9e2a27..ad60dacb6 100644
--- a/src/main/java/refinedstorage/gui/GuiStorage.java
+++ b/src/main/java/refinedstorage/gui/GuiStorage.java
@@ -86,17 +86,10 @@ public class GuiStorage extends GuiBase
 	public void drawForeground(int mouseX, int mouseY)
 	{
 		drawString(7, 7, t(gui.getName()));
-		drawString(7, 42, t("misc.refinedstorage:storage"));
+		drawString(7, 42, gui.getCapacity() == -1 ? t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) : t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity()));
 		drawString(97, 42, t("misc.refinedstorage:priority"));
 		drawString(7, 117, t("container.inventory"));
 
-		drawString(30, 54, t("misc.refinedstorage:storage.stored", gui.getStored()));
-
-		if (gui.getCapacity() != -1)
-		{
-			drawString(30, 64, t("misc.refinedstorage:storage.capacity", gui.getCapacity()));
-		}
-
 		if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY))
 		{
 			int full = 0;
diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang
index ff03552dd..0299037a1 100644
--- a/src/main/resources/assets/refinedstorage/lang/en_US.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang
@@ -22,10 +22,10 @@ gui.refinedstorage:interface.export.explanation.2=Incr. or decr. a slot: left/ r
 misc.refinedstorage:energy_stored=%d / %d RF
 misc.refinedstorage:energy_usage=Usage: %d RF/t
 
-misc.refinedstorage:storage=Storage
 misc.refinedstorage:storage.stored=Stored: %d
 misc.refinedstorage:storage.stored_capacity=Stored: %d / %d
-misc.refinedstorage:storage.capacity=Capacity: %d
+misc.refinedstorage:storage.stored_minimal=%d
+misc.refinedstorage:storage.stored_capacity_minimal=%d / %d
 misc.refinedstorage:storage.full=%d%% full
 
 misc.refinedstorage:wireless_grid.tooltip=Bound to %d, %d, %d.
diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
index 758235863..29aeea561 100644
--- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
+++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
@@ -22,10 +22,10 @@ gui.refinedstorage:interface.export.explanation.2=Verhoog of verklein aantal: li
 misc.refinedstorage:energy_stored=%d / %d RF
 misc.refinedstorage:energy_usage=Vebruik: %d RF/t
 
-misc.refinedstorage:storage=Opslag
 misc.refinedstorage:storage.stored=Opgeslagen: %d
 misc.refinedstorage:storage.stored_capacity=Opgeslagen: %d / %d
-misc.refinedstorage:storage.capacity=Capaciteit: %d
+misc.refinedstorage:storage.stored_minimal=%d
+misc.refinedstorage:storage.stored_capacity_minimal=%d / %d
 misc.refinedstorage:storage.full=%d%% vol
 
 misc.refinedstorage:wireless_grid.tooltip=Gebonden aan %d, %d, %d.