[tuxdroid-svn] r5640 - in software_suite_v3/software/plugin/plugin-twitter/branches/october_release
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r5640 - in software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter: resources src
|
From: jerome <c2m...@c2...> - 2009-10-13 09:42:04
|
Author: jerome
Date: 2009-10-13 11:41:48 +0200 (Tue, 13 Oct 2009)
New Revision: 5640
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
Log:
* Added a protection in case of default password set.
* Updated de.po.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-13 09:41:48 UTC (rev 5640)
@@ -2,13 +2,13 @@
msgstr "Twitter Plugin"
msgid "The Twitter plugin will make Tux Droid check your Twitter account."
-msgstr ""
+msgstr "Dieses Twitter-Plugin weist Sie auf alle Aktualisierungen Ihres Twitter-Kontos hin."
msgid "Username"
msgstr "Benutzername"
msgid "Password"
-msgstr "Kennwort"
+msgstr "Passwort"
msgid "Tweet your new status"
msgstr "Tweeten Sie Ihren neuen Status"
@@ -17,59 +17,61 @@
msgstr "Tweeten Sie entsprechend dem Statustext"
msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hallo an Alle von meinem Twitter - Tux Droid"
+msgstr "Hallo an alle von meinem Twitter - Tux Droid"
msgid "Check Friends updates"
-msgstr ""
+msgstr "Freund Updates prüfen"
msgid "Check my messages/replies"
-msgstr ""
+msgstr "Nachrichten/Antworten überprüfen"
msgid "Check your Twitter account."
-msgstr ""
+msgstr "Mein Twitter-Konto überprüfen."
msgid "Check your tweets from your Twitter account."
-msgstr ""
+msgstr "ÜberPrüfen Sie Ihre Tweets."
msgid "Start me every x"
-msgstr "Alert"
+msgstr "ÜberPrüfen Sie mein Twitter-Konto automatisch"
msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Anscheinend sind Sie nicht verbunden. Prüfen Sie Benutzername und Kennwort und versuchen Sie es wieder."
+msgstr "Anscheinend sind Sie nicht mit dem Internet verbunden. Prüfen Sie Benutzername und Passwort und versuchen Sie es danach wieder."
msgid "You have a new friend update"
-msgstr ""
+msgstr "Sie haben eine neue Freund Aktualisierung."
msgid "You have {0} friend updates"
-msgstr ""
+msgstr "Sie haben {0} Freund Aktualisierungen."
msgid "You don't have any friend updates."
-msgstr ""
+msgstr "Sie haben keine Freund Aktualisierungen."
msgid "You don't have any messages"
-msgstr ""
+msgstr "Sie haben keine Nachrichten."
msgid "You don't have any replies"
-msgstr ""
+msgstr "Sie haben keine Antworten."
msgid "Your new Tweet was not set, please, try again later"
-msgstr ""
+msgstr "Ihre neue Tweet wurde nicht hinzugefügt, versuchen Sie es später."
msgid "Your Tweet was added"
-msgstr ""
+msgstr "Ihre neue Tweet wurde hinzugefügt."
msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter ist ausgelastet, versuchen Sie es später."
+msgstr "Twitter ist ausgelastet, versuchen Sie es später wieder."
msgid "One reply from {0}"
-msgstr ""
+msgstr "Sie haben eine Antwort von {0}."
msgid "{0} replies from {1}"
-msgstr ""
+msgstr "Sie haben {0} Antworten von {1}."
msgid "One message from {0}"
-msgstr ""
+msgstr "Sie haben eine Nachricht von {0}."
msgid "{0} messages from {1}"
-msgstr ""
+msgstr "Sie haben {0} Nachrichten von {1}."
+msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+msgstr "Sorry, Bei der Verbindung mit Twitter gab es einen Fehler. Prüfen Sie Ihre Twitter-Konfiguration."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-13 09:41:48 UTC (rev 5640)
@@ -17,10 +17,10 @@
msgstr "Tweet following status text"
msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hello all from my Tux Droid twitter gadget"
+msgstr "Hello all from my Tux Droid Twitter gadget."
msgid "Check Friends updates"
-msgstr "Check Friends updates"
+msgstr "Check friends updates"
msgid "Check my messages/replies"
msgstr "Check my messages/replies"
@@ -29,47 +29,50 @@
msgstr "Check my Twitter account."
msgid "Check your tweets from your Twitter account."
-msgstr "Check my tweets from your Twitter account."
+msgstr "Check my Tweets from my Twitter account."
msgid "Start me every x"
-msgstr "Alert"
+msgstr "Check my Twitter account automatically"
msgid "You do not seem to be connected. Please, verify you username and password, then try again."
msgstr "You do not seem to be connected. Please, verify you username and password, then try again."
msgid "You have a new friend update"
-msgstr "You have a new friend update"
+msgstr "You have a new friends update."
msgid "You have {0} friend updates"
-msgstr "You have {0} friend updates"
+msgstr "You have {0} friends updates."
msgid "You don't have any friend updates."
-msgstr "You don't have any friend updates."
+msgstr "You don't have any friends updates."
msgid "You don't have any messages"
-msgstr "You don't have any messages"
+msgstr "You don't have any messages."
msgid "You don't have any replies"
-msgstr "You don't have any replies"
+msgstr "You don't have any replies."
msgid "Your new Tweet was not set, please, try again later"
-msgstr "Your new Tweet was not set, please, try again later"
+msgstr "Your new Tweet was not set, please, try again later."
msgid "Your Tweet was added"
-msgstr "Your Tweet was added"
+msgstr "Your Tweet was added."
msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter is busy for now, please, try later."
+msgstr "Twitter is busy for now, please, try again later."
msgid "One reply from {0}"
-msgstr "One reply from {0}"
+msgstr "One reply from {0}."
msgid "{0} replies from {1}"
-msgstr "{0} replies from {1}"
+msgstr "{0} replies from {1}."
msgid "One message from {0}"
-msgstr "One message from {0}"
+msgstr "One message from {0}."
msgid "{0} messages from {1}"
-msgstr "{0} messages from {1}"
+msgstr "{0} messages from {1}."
+msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+msgstr "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po 2009-10-13 09:41:48 UTC (rev 5640)
@@ -32,7 +32,7 @@
msgstr "Vérifier vos Tweets"
msgid "Start me every x"
-msgstr "Alerte"
+msgstr "Vérifier automatiquement mon compte Twitter."
msgid "You do not seem to be connected. Please, verify you username and password, then try again."
msgstr "Il semble que vous ne soyez pas connecté. Vérifiez votre login et votre mot de passe et essayez à nouveau."
@@ -73,3 +73,7 @@
msgid "{0} messages from {1}"
msgstr "{0} messages de {1}"
+msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+msgstr "Désolé, il y a eu une erreur lors de la connexion avec Twitter. Vérifiez votre login et votre mot de passe"
+
+
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po 2009-10-13 09:41:48 UTC (rev 5640)
@@ -1,74 +1,77 @@
-msgid "Twitter Plugin"
-msgstr "Twitter Plugin"
-
-msgid "The Twitter plugin will make Tux Droid check your Twitter account."
-msgstr "De Twitter plugin zal Tux Droid je tweets doen lezen op je Twitter account."
-
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-msgid "Password"
-msgstr "Wachtwoord"
-
-msgid "Tweet your new status"
-msgstr "Tweet je nieuwe status"
-
-msgid "Tweet following status text"
-msgstr "Tweet volgende status tekst"
-
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
-
-msgid "Check Friends updates"
-msgstr "Check voor vriend updates"
-
-msgid "Check my messages/replies"
-msgstr "Check mijn berichten/antwoorden"
-
-msgid "Check your Twitter account."
-msgstr "Check je Twitter account."
-
-msgid "Check your tweets from your Twitter account."
-msgstr "Check je tweets van je Twitter account."
-
-msgid "Start me every x"
-msgstr "Start me elke x"
-
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
-
-msgid "You have a new friend update"
-msgstr "Je hebt een nieuwe vriend update"
-
-msgid "You have {0} friend updates"
-msgstr "Je hebt {0} vriend updates"
-
-msgid "You don't have any friend updates."
-msgstr "Je hebt geen vriend updates."
-
-msgid "You don't have any messages"
-msgstr "Je hebt geen berichten"
-
-msgid "You don't have any replies"
-msgstr "Je hebt geen antwoorden"
-
-msgid "Your new Tweet was not set, please, try again later"
-msgstr "Je nieuwe Tweet werd niet toegevoegd, probeer later opnieuw"
-
-msgid "Your Tweet was added"
-msgstr "Je Tweet werd toegevoegd"
-
-msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter is bezet op het ogenblik, probeer later opnieuw."
-
-msgid "One reply from {0}"
-msgstr "1 antwoord van {0}"
-
-msgid "{0} replies from {1}"
-msgstr "{0} antwoorden van {1}"
-
-msgid "One message from {0}"
-msgstr "1 bericht van {0}"
-
-msgid "{0} messages from {1}"
-msgstr "{0} berichten van {1}"
\ No newline at end of file
+msgid "Twitter Plugin"
+msgstr "Twitter Plugin"
+
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr "De Twitter plugin zal Tux Droid je Twitter account laten checken."
+
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+msgid "Password"
+msgstr "Wachtwoord"
+
+msgid "Tweet your new status"
+msgstr "Tweet je nieuwe status"
+
+msgid "Tweet following status text"
+msgstr "Tweet volgende status tekst"
+
+msgid "Hello all from my Tux Droid twitter gadget"
+msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
+
+msgid "Check Friends updates"
+msgstr "Check wijzigingen van vrienden"
+
+msgid "Check my messages/replies"
+msgstr "Check mijn berichten/ antwoorden"
+
+msgid "Check your Twitter account."
+msgstr "Check mijn Twitter account."
+
+msgid "Check your tweets from your Twitter account."
+msgstr "Check mijn Tweets op mijn Twitter account."
+
+msgid "Start me every x"
+msgstr "Check mijn Twitter account automatisch"
+
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
+
+msgid "You have a new friend update"
+msgstr "je hebt een nieuwe vriend status wijziging"
+
+msgid "You have {0} friend updates"
+msgstr "Je hebt {0} vrienden status wijzigingen."
+
+msgid "You don't have any friend updates."
+msgstr "Je hebt geen vrienden status wijzigingen."
+
+msgid "You don't have any messages"
+msgstr "Je hebt geen nieuwe berichten."
+
+msgid "You don't have any replies"
+msgstr "Je hebt geen nieuwe antwoorden."
+
+msgid "Your new Tweet was not set, please, try again later"
+msgstr "Je nieuwe Tweet werd niet geplaatst, probeer later opnieuw."
+
+msgid "Your Tweet was added"
+msgstr "Je nieuwe Tweet werd toegevoegd."
+
+msgid "Twitter is busy for now, please, try later."
+msgstr "Twitter is bezet op het ogenblik, probeer later opnieuw."
+
+msgid "One reply from {0}"
+msgstr "Je hebt 1 antwoord van {0}."
+
+msgid "{0} replies from {1}"
+msgstr "{0} antwoorden van {1}."
+
+msgid "One message from {0}"
+msgstr "1 bericht van {0}."
+
+msgid "{0} messages from {1}"
+msgstr "{0} berichten van {1}."
+
+msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+msgstr "Sorry, ik kan geen connectie maken met Twitter. Controleer je configuratie of probeer later opnieuw."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot 2009-10-13 09:41:48 UTC (rev 5640)
@@ -73,3 +73,6 @@
msgid "{0} messages from {1}"
msgstr ""
+msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+msgstr ""
+
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java 2009-10-13 09:41:48 UTC (rev 5640)
@@ -34,7 +34,10 @@
private boolean checkFriends = true;
private boolean checkMessages = true;
+ private String defaultUser = "your_user_name";
+ private String defaultPassword = "_secret_";
+
/**
* Sets the username.
* @param username
@@ -51,6 +54,11 @@
*/
public String getUsername()
{
+ if (this.username.equalsIgnoreCase(this.defaultUser))
+ {
+ return null;
+ }
+
return this.username;
}
@@ -71,6 +79,10 @@
*/
public String getPassword()
{
+ if (this.password.equalsIgnoreCase(this.defaultPassword))
+ {
+ return null;
+ }
return this.password;
}
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-13 09:41:48 UTC (rev 5640)
@@ -217,6 +217,16 @@
@Override
protected void start() throws Throwable
{
+
+ if(( this.configuration().getPassword() == null) || (this.configuration().getUsername() == null))
+ {
+ if( ! this.getCommand().equalsIgnoreCase("check"))
+ {
+ this.throwMessage("Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration.");
+ }
+ this.stop();
+ }
+
//Creating / getting sav context.
savedStruct = new TwitterDatasStruct(this.configuration().getUsername());
|
