Author: duncan
Date: Sun Feb 24 11:28:41 2008
New Revision: 10424
Log:
Updated messages for recordserver being down
Modified:
branches/rel-1-7/freevo/src/tv/plugins/scheduled_recordings.py
branches/rel-1-7/freevo/src/tv/plugins/view_favorites.py
branches/rel-1-7/freevo/src/tv/programitem.py
branches/rel-1-7/freevo/src/util/misc.py
branches/rel-1-7/freevo/src/www/htdocs/guidechannel.rpy
Modified: branches/rel-1-7/freevo/src/tv/plugins/scheduled_recordings.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/scheduled_recordings.py
(original)
+++ branches/rel-1-7/freevo/src/tv/plugins/scheduled_recordings.py Sun Feb
24 11:28:41 2008
@@ -87,7 +87,7 @@
(server_available, msg) = record_client.connectionTest()
if not server_available:
- AlertBox(_('Recording server is unavailable.')+(': %s' %
msg)).show()
+ AlertBox(_('Recording server is not available')+(':\n%s' %
msg)).show()
return []
(result, recordings) = record_client.getScheduledRecordings()
@@ -100,7 +100,7 @@
for prog in progs:
items.append(ProgramItem(self, prog, context='schedule'))
else:
- AlertBox(_('Get recordings failed')+(': %s' % recordings)).show()
+ AlertBox(_('Get recordings failed')+(':\n%s' % recordings)).show()
return []
return items
Modified: branches/rel-1-7/freevo/src/tv/plugins/view_favorites.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/view_favorites.py (original)
+++ branches/rel-1-7/freevo/src/tv/plugins/view_favorites.py Sun Feb 24
11:28:41 2008
@@ -90,7 +90,7 @@
(server_available, msg) = record_client.connectionTest()
if not server_available:
- AlertBox(_('Recording server is unavailable.')+(': %s' %
msg)).show()
+ AlertBox(_('Recording server is not available')+(':\n%s' %
msg)).show()
return []
(result, favorites) = record_client.getFavorites()
@@ -101,7 +101,7 @@
for fav in favorites:
items.append(FavoriteItem(self, fav))
else:
- AlertBox(_('Get favorites failed')+(': %s' % favorites)).show()
+ AlertBox(_('Get favorites failed')+(':\n%s' % favorites)).show()
return []
return items
Modified: branches/rel-1-7/freevo/src/tv/programitem.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/programitem.py (original)
+++ branches/rel-1-7/freevo/src/tv/programitem.py Sun Feb 24 11:28:41 2008
@@ -229,7 +229,7 @@
pop = AlertBox(text=msgtext).show()
else:
# something went wrong
- msgtext = _('Scheduling failed')+(': %s' % reason)
+ msgtext = _('Scheduling failed')+(':\n%s' % reason)
AlertBox(text=msgtext).show()
@@ -250,7 +250,7 @@
AlertBox(text=msgtext).show()
else:
# something went wrong
- msgtext = _('Remove failed')+(': %s' % reason)
+ msgtext = _('Remove failed')+(':\n%s' % reason)
AlertBox(text=msgtext).show()
@@ -320,7 +320,7 @@
return
else:
# something else went wrong
- msgtext = _('findMatches failed') +(': %s' % matches)
+ msgtext = _('findMatches failed') +(':\n%s' % matches)
AlertBox(text=msgtext).show()
return
Modified: branches/rel-1-7/freevo/src/util/misc.py
==============================================================================
--- branches/rel-1-7/freevo/src/util/misc.py (original)
+++ branches/rel-1-7/freevo/src/util/misc.py Sun Feb 24 11:28:41 2008
@@ -416,7 +416,7 @@
(status, recordings) = scheduledRecordings
if not status:
- result = _('The recordserver is down')
+ result = _('Recording server is not available')
return result
progs = recordings.getProgramList()
Modified: branches/rel-1-7/freevo/src/www/htdocs/guidechannel.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/guidechannel.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/guidechannel.rpy Sun Feb 24
11:28:41 2008
@@ -200,9 +200,7 @@
fv.res += ' <br/>\n'
if not self.got_schedule:
- fv.printMessages(
- [ '<b>'+_('ERROR')+'</b>: '+_('Recording server is
unavailable.') ]
- )
+ fv.printMessages([ '<b>'+_('ERROR')+'</b>: '+_('Recording server
is not available') ])
display_channel = fv.formValue(form,'channel')
if not display_channel:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
