Author: jerome
Date: 2009-04-16 10:04:57 +0200 (Thu, 16 Apr 2009)
New Revision: 4529
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
Log:
* Removed "description is undefined" and "the description is" from the TTS
strings
* Updated TTS string punctuation.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-16 07:42:27 UTC (rev 4528)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-16 08:04:57 UTC (rev 4529)
@@ -42,13 +42,13 @@
for(Program oneProgram : morning)
{
- if(!configuration.getGiveProgramDescription())
+ if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
- gadget.throwMessage("On {0} at {1}
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
+ gadget.throwMessage("On {0} at {1},
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
}
else
{
- gadget.throwMessage("On {0} at {1} {2},
the description is {3}",oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ gadget.throwMessage("On {0} at {1},
{2}, {3}",oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
@@ -60,13 +60,13 @@
for(Program oneProgram : afternoon)
{
- if(!configuration.getGiveProgramDescription())
+ if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
- gadget.throwMessage("On {0} at {1}
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
+ gadget.throwMessage("On {0} at {1},
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
}
else
{
- gadget.throwMessage("On {0} at {1} {2},
the description is {3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ gadget.throwMessage("On {0} at {1} {2},
{3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
@@ -77,13 +77,13 @@
Vector<Program> evening =
SimplePrograms.sortEvening(programme);
for(Program oneProgram : evening)
{
- if(!configuration.getGiveProgramDescription())
+ if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
- gadget.throwMessage("On {0} at {1}
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
+ gadget.throwMessage("On {0} at {1},
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
}
else
{
- gadget.throwMessage("On {0} at {1} {2},
the description is {3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ gadget.throwMessage("On {0} at {1} {2},
{3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
