Author: duncan
Date: Sat Feb 23 10:42:35 2008
New Revision: 10419
Log:
Made all the recording server is not available messages the same
Modified:
branches/rel-1-7/freevo/src/www/htdocs/edit_favorite.rpy
branches/rel-1-7/freevo/src/www/htdocs/favorites.rpy
branches/rel-1-7/freevo/src/www/htdocs/genre.rpy
branches/rel-1-7/freevo/src/www/htdocs/guide.rpy
branches/rel-1-7/freevo/src/www/htdocs/index.rpy
branches/rel-1-7/freevo/src/www/htdocs/manualrecord.rpy
branches/rel-1-7/freevo/src/www/htdocs/record.rpy
branches/rel-1/freevo/src/www/htdocs/edit_favorite.rpy
branches/rel-1/freevo/src/www/htdocs/favorites.rpy
branches/rel-1/freevo/src/www/htdocs/genre.rpy
branches/rel-1/freevo/src/www/htdocs/guide.rpy
branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy
branches/rel-1/freevo/src/www/htdocs/index.rpy
branches/rel-1/freevo/src/www/htdocs/library.rpy
branches/rel-1/freevo/src/www/htdocs/manualrecord.rpy
branches/rel-1/freevo/src/www/htdocs/record.rpy
branches/rel-1/freevo/src/www/htdocs/search.rpy
Modified: branches/rel-1-7/freevo/src/www/htdocs/edit_favorite.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/edit_favorite.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/edit_favorite.rpy Sat Feb 23
10:42:35 2008
@@ -51,7 +51,7 @@
(server_available, message) = ri.connectionTest()
if not server_available:
fv.printHeader(_('Edit Favorite'), 'styles/main.css')
- fv.printMessagesFinish([ '<b>'+_('ERROR')+'</b>: '+_('Recording
server is unavailable.') ])
+ fv.printMessagesFinish([ '<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available') ])
return String( fv.res )
chan = Unicode(fv.formValue(form, 'chan'))
Modified: branches/rel-1-7/freevo/src/www/htdocs/favorites.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/favorites.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/favorites.rpy Sat Feb 23
10:42:35 2008
@@ -51,7 +51,7 @@
(server_available, message) = ri.connectionTest()
if not server_available:
fv.printHeader(_('Favorites'), 'styles/main.css',
selected=_('Favorites'))
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is unavailable.')])
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
return String( fv.res )
action = fv.formValue(form, 'action')
Modified: branches/rel-1-7/freevo/src/www/htdocs/genre.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/genre.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/genre.rpy Sat Feb 23 10:42:35 2008
@@ -88,7 +88,7 @@
config.WWW_STYLESHEET, config.WWW_JAVASCRIPT)
if not got_schedule:
- fv.printMessages(['<b>'+_('ERROR')+'</b>: '+_('Recording server is
unavailable.')])
+ fv.printMessages(['<b>'+_('ERROR')+'</b>: '+_('Recording server is
not available')])
allcategories = []
for chan in guide.chan_list:
Modified: branches/rel-1-7/freevo/src/www/htdocs/guide.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/guide.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/guide.rpy Sat Feb 23 10:42:35 2008
@@ -146,7 +146,7 @@
fv.res += '<div id="content">\n';
fv.res += ' <br/>\n'
if not got_schedule:
- fv.printMessages([ '<b>'+_('ERROR')+'</b>: '+_('Recording server
is unavailable.') ])
+ fv.printMessages([ '<b>'+_('ERROR')+'</b>: '+_('Recording server
is not available') ])
desc = ''
Modified: branches/rel-1-7/freevo/src/www/htdocs/index.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/index.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/index.rpy Sat Feb 23 10:42:35 2008
@@ -52,18 +52,18 @@
(server_available, schedule) = tv.record_client.connectionTest()
if not server_available:
- fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('The
recording server is down.')+'</p>\n'
+ fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Recording
server is not available')+'</p>\n'
else:
- fv.res += '<p class="normal">'+_('The recording server is up and
running.')+'</p>\n'
+ fv.res += '<p class="normal">'+_('Recording server is up and
running')+'</p>\n'
listexpire = tv_util.when_listings_expire()
if listexpire == 1:
- fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Your
listings expire in 1 hour.')+'</p>\n'
+ fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Your
listings expire in 1 hour')+'</p>\n'
elif listexpire < 12:
- fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Your
listings expire in %s hours.') % \
+ fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Your
listings expire in %s hours') % \
listexpire+'</p>\n'
else:
- fv.res += '<p class="normal">'+_('Your listings are up to
date.')+'</p>\n'
+ fv.res += '<p class="normal">'+_('Your listings are up to
date')+'</p>\n'
(got_schedule, recordings) = tv.record_client.getScheduledRecordings()
if got_schedule:
Modified: branches/rel-1-7/freevo/src/www/htdocs/manualrecord.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/manualrecord.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/manualrecord.rpy Sat Feb 23
10:42:35 2008
@@ -64,7 +64,7 @@
(server_available, message) = ri.connectionTest()
if not server_available:
fv.printHeader(_('Manual Record'),
'styles/main.css',selected=_("Manual Record"))
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is unavailable.')])
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
return String(fv.res)
curtime_epoch = time.time()
Modified: branches/rel-1-7/freevo/src/www/htdocs/record.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/record.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/record.rpy Sat Feb 23 10:42:35 2008
@@ -57,7 +57,7 @@
(server_available, message) = ri.connectionTest()
if not server_available:
fv.printHeader('Scheduled Recordings', 'styles/main.css')
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is unavailable.')])
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
return String( fv.res )
if action == 'remove':
Modified: branches/rel-1/freevo/src/www/htdocs/edit_favorite.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/edit_favorite.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/edit_favorite.rpy Sat Feb 23
10:42:35 2008
@@ -54,7 +54,7 @@
server_available = self.recordclient.pingNow()
if not server_available:
fv.printHeader(_('Edit Favorite'), 'styles/main.css')
- fv.printMessagesFinish([ '<b>'+_('ERROR')+'</b>: '+_('Recording
server is unavailable.') ])
+ fv.printMessagesFinish([ '<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available') ])
return String( fv.res )
chan = Unicode(fv.formValue(form, 'chan'))
Modified: branches/rel-1/freevo/src/www/htdocs/favorites.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/favorites.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/favorites.rpy Sat Feb 23 10:42:35 2008
@@ -54,7 +54,7 @@
server_available = self.recordclient.pingNow()
if not server_available:
fv.printHeader(_('Favorites'), 'styles/main.css',
selected=_('Favorites'))
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is unavailable.')])
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
return String( fv.res )
action = fv.formValue(form, 'action')
Modified: branches/rel-1/freevo/src/www/htdocs/genre.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/genre.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/genre.rpy Sat Feb 23 10:42:35 2008
@@ -91,7 +91,7 @@
config.WWW_STYLESHEET, config.WWW_JAVASCRIPT)
if schedule is None:
- fv.printMessages(['<b>'+_('ERROR')+'</b>: '+_('Recording server is
unavailable.')])
+ fv.printMessages(['<b>'+_('ERROR')+'</b>: '+_('Recording server is
not available')])
allcategories = []
for chan in guide.chan_list:
Modified: branches/rel-1/freevo/src/www/htdocs/guide.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/guide.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/guide.rpy Sat Feb 23 10:42:35 2008
@@ -149,7 +149,7 @@
fv.res += '<div id="content">\n';
fv.res += ' <br/>\n'
if schedule is None:
- fv.printMessages([ '<b>'+_('ERROR')+'</b>: '+_('Recording server
is unavailable.') ])
+ fv.printMessages([ '<b>'+_('ERROR')+'</b>: '+_('Recording server
is not available') ])
desc = ''
Modified: branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy Sat Feb 23
10:42:35 2008
@@ -203,9 +203,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:
Modified: branches/rel-1/freevo/src/www/htdocs/index.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/index.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/index.rpy Sat Feb 23 10:42:35 2008
@@ -53,18 +53,18 @@
recordings = RecordClient().getScheduledRecordingsNow()
if recordings is None:
- fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('The
recording server is down.')+'</p>\n'
+ fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Recording
server is not available')+'</p>\n'
else:
- fv.res += '<p class="normal">'+_('The recording server is up and
running.')+'</p>\n'
+ fv.res += '<p class="normal">'+_('Recording server is up and
running')+'</p>\n'
listexpire = tv_util.when_listings_expire()
if listexpire == 1:
- fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Your
listings expire in 1 hour.')+'</p>\n'
+ fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Your
listings expire in 1 hour')+'</p>\n'
elif listexpire < 12:
- fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Your
listings expire in %s hours.') % \
+ fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Your
listings expire in %s hours') % \
listexpire+'</p>\n'
else:
- fv.res += '<p class="normal">'+_('Your listings are up to
date.')+'</p>\n'
+ fv.res += '<p class="normal">'+_('Your listings are up to
date')+'</p>\n'
if recordings:
progl = recordings.getProgramList().values()
Modified: branches/rel-1/freevo/src/www/htdocs/library.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/library.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/library.rpy Sat Feb 23 10:42:35 2008
@@ -349,7 +349,7 @@
# sorry, have to pass without doing anything.
pass
else:
- fv.res += '<h4>The recording server is down, recording
information is unavailable.</h4>'
+ fv.res += '<h4>Recording server is not available,
recording information is unavailable.</h4>'
#generate our favorites regular expression
favre = ''
Modified: branches/rel-1/freevo/src/www/htdocs/manualrecord.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/manualrecord.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/manualrecord.rpy Sat Feb 23
10:42:35 2008
@@ -72,7 +72,7 @@
server_available = self.recordclient.pingNow()
if not server_available:
fv.printHeader(_('Manual Record'),
'styles/main.css',selected=_("Manual Record"))
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is unavailable.')])
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
return String(fv.res)
curtime_epoch = time.time()
Modified: branches/rel-1/freevo/src/www/htdocs/record.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/record.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/record.rpy Sat Feb 23 10:42:35 2008
@@ -59,7 +59,7 @@
server_available = self.recordclient.pingNow()
if server_available is None:
fv.printHeader('Scheduled Recordings', 'styles/main.css')
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is unavailable.')])
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
return String( fv.res )
if action == 'remove':
Modified: branches/rel-1/freevo/src/www/htdocs/search.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/search.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/search.rpy Sat Feb 23 10:42:35 2008
@@ -52,7 +52,7 @@
(server_available, message) = self.recordclient.pingNow()
if not server_available:
fv.printHeader(_('Search Results'), 'styles/main.css',
selected=_('Search'))
- fv.res += '<h4>'+_('ERROR')+': '+_('recording server is
unavailable')+'</h4>'
+ fv.res += '<h4>'+_('ERROR')+': '+_('Recording server is not
available')+'</h4>'
fv.printAdvancedSearchForm()
fv.printLinks()
fv.printFooter()
-------------------------------------------------------------------------
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
