improved translation

SimpleServer · Jun 21, 2011 · adabc64 · adabc64
1 parent a40d79d
commit adabc64
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Sat Jan 22 23:13:13 PST 2011
+#Tue Jun 21 11:35:40 CEST 2011
 eclipse.preferences.version=1
 encoding/<project>=UTF-8
diff --git a/src/simpleserver/command/TimeCommand.java b/src/simpleserver/command/TimeCommand.java
@@ -88,7 +88,7 @@ public void execute(Server server, String message) {
           time.freeze(value);
           tInfo("Time frozen");
         } else {
-          tError("Optional 2nd argument must be freeze!");
+          tError("Optional 2nd argument must be %s!", "freeze");
         }
       }
     }
@@ -98,6 +98,8 @@ public void execute(Server server, String message) {
 
   protected abstract void tError(String message);
 
+  protected abstract void tError(String message, Object... args);
+
   protected abstract void info(String message);
 
   protected abstract void tInfo(String message);

diff --git a/src/simpleserver/command/TimePlayerCommand.java b/src/simpleserver/command/TimePlayerCommand.java
@@ -57,6 +57,11 @@ protected void tError(String message) {
     error(t(message));
   }
 
+  @Override
+  protected void tError(String message, Object... args) {
+    error(String.format(t(message), args));
+  }
+
   @Override
   protected void tInfo(String message) {
     info(t(message));

diff --git a/src/simpleserver/command/TimeServerCommand.java b/src/simpleserver/command/TimeServerCommand.java
@@ -46,6 +46,11 @@ protected void tError(String message) {
     error(message);
   }
 
+  @Override
+  protected void tError(String message, Object... args) {
+    error(String.format(message, args));
+  }
+
   @Override
   protected void tInfo(String message) {
     info(message);

diff --git a/src/simpleserver/lang/translations/template.json b/src/simpleserver/lang/translations/template.json
@@ -90,7 +90,7 @@
   "Nobody sent you a message yet." : "Nobody sent you a message yet.",
   "Only modes %s and %s allowed!" : "Only modes %s and %s allowed!",
   "Open Chest" : "Open Chest",
-  "Optional 2nd argument must be freeze!" : "Optional 2nd argument must be freeze!",
+  "Optional 2nd argument must be %s!" : "Optional 2nd argument must be %s!",
   "Over all you've been online for %s hours and %s minutes." : "Over all you've been online for %s hours and %s minutes.",
   "Player %s has been banned! (%s)" : "Player %s has been banned! (%s)",
   "Player %s has been IP banned!" : "Player %s has been IP banned!",