[tuxdroid-svn] r6014 - software_suite_v3/software/plugin/plugin-facebook/branches/dynamic_sentences/src/com/kysoh/plugins/facebook

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-12-25 11:41:27 +0100 (Fri, 25 Dec 2009)
New Revision: 6014

Modified:
   software_suite_v3/software/plugin/plugin-facebook/branches/dynamic_sentences/src/com/kysoh/plugins/facebook/FacebookPlugin.java
Log:
* Finished pick sentence functionality.

Modified: software_suite_v3/software/plugin/plugin-facebook/branches/dynamic_sentences/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/dynamic_sentences/src/com/kysoh/plugins/facebook/FacebookPlugin.java	2009-12-24 18:07:15 UTC (rev 6013)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/dynamic_sentences/src/com/kysoh/plugins/facebook/FacebookPlugin.java	2009-12-25 10:41:27 UTC (rev 6014)
@@ -176,7 +176,7 @@
 		{
 			if(!this.getCommand().equalsIgnoreCase("check"))
 			{
-				this.throwMessage("You do not seem to be connected. Please, verify you username and password, then try again.");
+				this.throwMessage(this.pickSentence(errorConnections));
 			}
 			System.exit( 0 );
 		}
@@ -284,20 +284,20 @@
     		if(read == 1)
     		{
     			throwRes();
-    			this.throwMessage("You have a new message");
+    			this.throwMessage(this.pickSentence(newSingleMessage));
     		}
     		else if( read >= 2 )
     		{
     			throwRes();
     			//User hasn't red his mailbox.
-    			this.throwMessage("You have {0} messages", read);
+    			this.throwMessage(this.pickSentence(newMultipleMessage), read);
     		}
     		
     		else if( read < 0)
     		{
     			throwRes();
     			//User has read something, so throwing all messages count.
-    			this.throwMessage("You have {0} new messages", mails);
+    			this.throwMessage(this.pickSentence(newMultipleMessage), mails);
     		}
     		
     		else
@@ -305,7 +305,7 @@
     			//no messages
     			if(!this.getCommand().equalsIgnoreCase("check"))
     			{
-    				this.throwMessage("You don't have any messages");
+    				this.throwMessage(this.pickSentence(noNewMessage));
     			}
     		}
 		}
@@ -347,7 +347,7 @@
 		    		//Only throwing in the second cycle of check command or run.
 		    		if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
 					{
-		    			this.throwMessage("{0} requests to be your friend", request);
+		    			this.throwMessage(this.pickSentence(newFriend), request);
 		    			said = true;
 					}
 		    	}
@@ -356,14 +356,14 @@
 		    
 		    if((! this.getCommand().equalsIgnoreCase("check")) && (!said))
 		    {
-		    	this.throwMessage("You don't have any friend requests");
+		    	this.throwMessage(this.pickSentence(noNewFriend));
 		    }
 		}
 		else
 		{
 			if (! this.getCommand().equalsIgnoreCase("check"))
 			{
-				this.throwMessage("You don't have any friend requests");
+				this.throwMessage(this.pickSentence(noNewFriend));
 			}
 		}
 	}
@@ -392,7 +392,7 @@
 		    	    //Only throwing in the second cycle of check command or run.
 		    		if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
 					{
-		    			this.throwMessage("You are invited to this group: {0}", group);
+		    			this.throwMessage(this.pickSentence(newGroup), group);
 		    			said = true;
 					}
 				}
@@ -401,14 +401,14 @@
 		    this.facebookHistory.registerStruct();
 		    if ((! this.getCommand().equalsIgnoreCase("check")) && (!said))
 			{
-				this.throwMessage("You don't have any group invites");
+				this.throwMessage(this.pickSentence(noNewGroup));
 			}
 		}
 		else
 		{
 			if (! this.getCommand().equalsIgnoreCase("check"))
 			{
-				this.throwMessage("You don't have any group invites");
+				this.throwMessage(this.pickSentence(noNewGroup));
 			}
 		}
 	}
@@ -436,7 +436,7 @@
 		    	    //Only throwing in the second cycle of check command or run.
 		    		if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
 					{
-				        this.throwMessage("You are invited to the event: {0}", event);
+				        this.throwMessage(this.pickSentence(newEvent), event);
 				        said = true;
 					}
 				}
@@ -445,14 +445,14 @@
 		    this.facebookHistory.registerStruct();
 		    if ((! this.getCommand().equalsIgnoreCase("check")) && (!said))
 			{
-				this.throwMessage("You don't have any event invites");
+				this.throwMessage(this.pickSentence(noNewEvent));
 			}
 		}
 		else
 		{
 			if (! this.getCommand().equalsIgnoreCase("check"))
 			{
-				this.throwMessage("You don't have any event invites");
+				this.throwMessage(this.pickSentence(noNewEvent));
 			}
 		}
 	}