From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 30 Mar 2013 11:09:44 +0000 (+0200)
Subject: Fix some messages
X-Git-Tag: 0.000_001~39
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=06a86a92d44173f1cdd7e595259596f09f30142f;p=fonbot.git

Fix some messages

The location messages lacked a space and the command disabled
message was incorrect. These were fixed.
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7d76dc7..15fb4d9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -147,7 +147,7 @@ The help command can be used to get a list of commands and help for them. Exampl
     <string name="disabling_wifi">Disabling wifi…</string>
     <string name="polling_server">Polling server…</string>
     <string name="polling_stopped">Polling stopped</string>
-    <string name="command_disabled">Command disabled%s disabled</string>
+    <string name="command_disabled">Command %s disabled</string>
     <string name="command_enabled">Command %s enabled</string>
     <string name="polling_every_milliseconds">Polling every %d milliseconds</string>
     <string name="incoming_message">Incoming message from %1$s: \"%2$s\" sent at %3$s</string>
diff --git a/src/ro/ieval/fonbot/Heavy.java b/src/ro/ieval/fonbot/Heavy.java
index f734437..3249db8 100644
--- a/src/ro/ieval/fonbot/Heavy.java
+++ b/src/ro/ieval/fonbot/Heavy.java
@@ -166,6 +166,7 @@ final class Heavy {
 			final Date locationDate=new Date(loc.getTime());
 			sb.append(" ");
 			sb.append(toNonNull(context.getString(at)));
+			sb.append(" ");
 			sb.append(locationDate.toString());
 			Utils.sendMessage(toNonNull(context), toNonNull(replyTo), toNonNull(sb.toString()));
 		}
diff --git a/src/ro/ieval/fonbot/Utils.java b/src/ro/ieval/fonbot/Utils.java
index 5fd9410..c4f3615 100644
--- a/src/ro/ieval/fonbot/Utils.java
+++ b/src/ro/ieval/fonbot/Utils.java
@@ -439,7 +439,7 @@ public final class Utils {
 	 */
 	private static void processCommand(final Context context, final Command cmd,final String[] args,final Address replyTo){
 		if(Heavy.isCommandDisabled(context, cmd)){
-			sendMessage(context, replyTo, command_disabled);
+			sendMessage(context, replyTo, command_disabled, cmd.toString());
 			return;
 		}