Fixes a little problem with internationalization
authorDa Risk <darisk972@gmail.com>
Fri, 26 Jun 2009 17:56:44 +0200
changeset 309 5c39c01e2a42
parent 308 9236b57675c9
child 310 8d36c81dcd65
Fixes a little problem with internationalization fixes #177
res/values
src/com/beem/project/beem/ui/SendIM.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values	Fri Jun 26 17:56:44 2009 +0200
@@ -0,0 +1,1 @@
+values-en
\ No newline at end of file
--- a/src/com/beem/project/beem/ui/SendIM.java	Fri Jun 26 09:39:19 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Fri Jun 26 17:56:44 2009 +0200
@@ -308,11 +308,9 @@
 		// INTERDICTION !
 		mChat.sendMessage(msg);
 		if (mSpeak != 1)
-		    mText.append(String.format(
-			    getString(R.string.SendIMYouSay), text));
+		    mText.append(getString(R.string.SendIMYouSay, text));
 		else
-		    mText.append(String.format(
-			    getString(R.string.SendIMSameSpeaker), text));
+		    mText.append(getString(R.string.SendIMSameSpeaker, text));
 		mToSend.setText(null);
 		mScrolling.fullScroll(ScrollView.FOCUS_DOWN);
 		mToSend.requestFocus();
@@ -336,23 +334,15 @@
 	    String from = message.getFrom();
 	    if (from == null) {
 		if (mSpeak != 1)
-		    mText.append(String
-			    .format(getString(R.string.SendIMYouSay), message
-				    .getBody()));
+		    mText.append(getString(R.string.SendIMYouSay, message.getBody()));
 		else
-		    mText.append(String.format(
-			    getString(R.string.SendIMSameSpeaker), message
-				    .getBody()));
+		    mText.append(getString(R.string.SendIMYouSay, message.getBody()));
 		mSpeak = 1;
 	    } else {
-		if (mSpeak != 2) {
-		    String str = String.format(getString(R.string.SendIMSays),
-			    mContactName, message.getBody());
-		    mText.append(str);
-		} else
-		    mText.append(String.format(
-			    getString(R.string.SendIMSameSpeaker), message
-				    .getBody()));
+		if (mSpeak != 2)
+		    mText.append(getString(R.string.SendIMSays, mContactName, message.getBody()));
+		else
+		    mText.append(getString(R.string.SendIMSameSpeaker, message.getBody()));
 		mSpeak = 2;
 	    }
 	}
@@ -466,21 +456,12 @@
 		public void run() {
 		    if (m.getBody() != null) {
 			if (m.getType() == Message.MSG_TYPE_ERROR) {
-			    mText.append(String.format(
-				    getString(R.string.SendIMErrorMsg), m
-					    .getBody()));
+			    mText.append(getString(R.string.SendIMErrorMsg, m.getBody()));
 			    mSpeak = 0;
 			} else if (mSpeak == 2)
-			    mText.append(String.format(
-				    getString(R.string.SendIMSameSpeaker), m
-					    .getBody()));
-			else {
-
-			    String str = String.format(
-				    getString(R.string.SendIMSays),
-				    mContactName, m.getBody());
-			    mText.append(str);
-			}
+			    mText.append(getString(R.string.SendIMSameSpeaker, m.getBody()));
+			else
+			    mText.append(getString(R.string.SendIMSays, mContactName, m.getBody()));
 			mScrolling.fullScroll(ScrollView.FOCUS_DOWN);
 			mToSend.requestFocus();
 			mSpeak = 2;