From cbf272221c14d7006847356999bf973bbbafffda Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 26 Jul 2004 18:05:55 +0000
Subject: [PATCH] Format the remaining time in code so we can do the right
 thing with the seconds.

---
 .../threerings/getdown/launcher/StatusPanel.java  | 15 ++++++++++-----
 .../com/threerings/getdown/messages.properties    |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/java/com/threerings/getdown/launcher/StatusPanel.java b/src/java/com/threerings/getdown/launcher/StatusPanel.java
index f1e860a..4864db6 100644
--- a/src/java/com/threerings/getdown/launcher/StatusPanel.java
+++ b/src/java/com/threerings/getdown/launcher/StatusPanel.java
@@ -1,5 +1,5 @@
 //
-// $Id: StatusPanel.java,v 1.6 2004/07/26 17:52:32 mdb Exp $
+// $Id: StatusPanel.java,v 1.7 2004/07/26 18:05:55 mdb Exp $
 
 package com.threerings.getdown.launcher;
 
@@ -49,15 +49,20 @@ public class StatusPanel extends JComponent
     {
         _progress = percent;
         String msg = "m.complete";
-        int minutes = 0, seconds = 0;
+        String remstr = "";
         if (remaining > 1) {
             msg = "m.complete_remain";
-            minutes = (int)(remaining / 60);
-            seconds = (int)(remaining % 60);
+            int minutes = (int)(remaining / 60);
+            int seconds = (int)(remaining % 60);
+            remstr = minutes + ":";
+            if (seconds < 10) {
+                remstr += "0";
+            }
+            remstr += seconds;
         }
         msg = get(msg);
         String label = MessageFormat.format(msg, new Object[] {
-            new Integer(percent), new Integer(minutes), new Integer(seconds) });
+            new Integer(percent), remstr });
         _newplab = new Label(label, _ifc.progressText, _pfont);
         repaint();
     }
diff --git a/src/java/com/threerings/getdown/messages.properties b/src/java/com/threerings/getdown/messages.properties
index 0eef4a4..ad7327c 100644
--- a/src/java/com/threerings/getdown/messages.properties
+++ b/src/java/com/threerings/getdown/messages.properties
@@ -1,5 +1,5 @@
 #
-# $Id: messages.properties,v 1.5 2004/07/26 17:52:31 mdb Exp $
+# $Id: messages.properties,v 1.6 2004/07/26 18:05:55 mdb Exp $
 #
 # Getdown translation messages
 
@@ -13,7 +13,7 @@ m.patching = Patching...
 m.launching = Launching...
 
 m.complete = {0}% complete
-m.complete_remain = {0}% complete  {1}:{2} remaining
+m.complete_remain = {0}% complete  {1} remaining
 
 m.updating_metadata = Downloading control files...