Update of /cvsroot/freevo/freevo/src/audio/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv26156/src/audio/plugins
Modified Files:
cdbackup.py coversearch.py mplayer.py playlist.py radio.py
webradio.py xine.py
Log Message:
Some more i18n improvements.
Index: cdbackup.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/cdbackup.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** cdbackup.py 20 Oct 2003 18:26:01 -0000 1.22
--- cdbackup.py 21 Oct 2003 21:17:41 -0000 1.23
***************
*** 29,32 ****
--- 29,35 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.23 2003/10/21 21:17:41 gsbarbieri
+ # Some more i18n improvements.
+ #
# Revision 1.22 2003/10/20 18:26:01 outlyer
# No CDDB data is a warning at best; sometimes a CD is just not listed there.
***************
*** 211,215 ****
if (self.item.type == 'audiocd'):
if self.rip_thread:
! return [ ( self.show_status, 'Show CD ripping status') ]
else:
self.device = self.item.devicename
--- 214,218 ----
if (self.item.type == 'audiocd'):
if self.rip_thread:
! return [ ( self.show_status, _( 'Show CD ripping status' ) ) ]
else:
self.device = self.item.devicename
***************
*** 219,223 ****
_('Get CDs available for ripping')) ]
except:
! _debug_('[Error] - Item is not an AudioCD')
return []
--- 222,226 ----
_('Get CDs available for ripping')) ]
except:
! _debug_( _( 'ERROR' ) + ': ' + _( 'Item is not an Audio CD' ) )
return []
***************
*** 226,230 ****
t = self.rip_thread
if t:
! pop = AlertBox(text='Ripping in progress\nTrack %s of %s' % \
(t.current_track, t.max_track))
pop.show()
--- 229,233 ----
t = self.rip_thread
if t:
! pop = AlertBox(text=_( 'Ripping in progress\nTrack %d of %d' ) % \
(t.current_track, t.max_track))
pop.show()
***************
*** 260,264 ****
self.rip_thread = main_backup_thread(device=device, rip_format=type)
self.rip_thread.start()
! AlertBox(text='Ripping started').show()
menuw.delete_menu()
menuw.back_one_menu()
--- 263,267 ----
self.rip_thread = main_backup_thread(device=device, rip_format=type)
self.rip_thread.start()
! AlertBox(text=_( 'Ripping started' ) ).show()
menuw.delete_menu()
menuw.back_one_menu()
***************
*** 327,331 ****
os.makedirs(pathname, 0777)
except:
! _debug_('Directory %s already exists' % pathname)
self.output_directory = pathname
--- 330,334 ----
os.makedirs(pathname, 0777)
except:
! _debug_(_( 'Directory %s already exists' ) % pathname)
self.output_directory = pathname
***************
*** 453,466 ****
if ((cd_info.title == None) and (cd_info.artist == None)):
! _debug_('[Warning] - No CDDB data available to mmpython',2)
current_time = time.strftime('%d-%b-%y-%I:%M%P')
! artist ='Unknown Artist ' + current_time + ' - RENAME'
! album ='Unknown CD Album ' + current_time + ' - RENAME'
! genre ='Other'
# Flash a popup window indicating copying is done
! popup_string="CD info not found!\nMust manually rename files\n"\
! "when finished ripping"
pop = AlertBox(text=popup_string)
--- 456,468 ----
if ((cd_info.title == None) and (cd_info.artist == None)):
! _debug_( _( 'WARNING' ) + ': ' + _( 'No CDDB data available to mmpython'
) ,2)
current_time = time.strftime('%d-%b-%y-%I:%M%P')
! artist = _( 'Unknown Artist' ) + ' ' + current_time + ' - ' + _(
'RENAME' )
! album = _( 'Unknown CD Album' ) + ' ' + current_time + ' - ' + _(
'RENAME' )
! genre = _( 'Other' )
# Flash a popup window indicating copying is done
! popup_string=_( "CD info not found!\nMust manually rename files\nwhen
finished ripping" )
pop = AlertBox(text=popup_string)
***************
*** 523,526 ****
(new_string, num) = re.subn(pattern, repl, new_string, count=0)
except:
! _debug_('[Error] - Problem trying to call re.subn')
return new_string
--- 525,528 ----
(new_string, num) = re.subn(pattern, repl, new_string, count=0)
except:
! _debug_( _( 'ERROR' ) + ': ' + _( 'Problem trying to call:' ) + '
re.subn' )
return new_string
Index: coversearch.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/coversearch.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** coversearch.py 20 Oct 2003 14:23:08 -0000 1.20
--- coversearch.py 21 Oct 2003 21:17:41 -0000 1.21
***************
*** 14,17 ****
--- 14,20 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.21 2003/10/21 21:17:41 gsbarbieri
+ # Some more i18n improvements.
+ #
# Revision 1.20 2003/10/20 14:23:08 outlyer
# Tolerate 404 errors from Amazon without crashing. Sorry this is so ugly,
***************
*** 138,143 ****
amazon.getLicense()
except amazon.NoLicenseKey:
! print 'To search for covers you need an Amazon.com Web Services'
! print 'license key. You can get yours from:'
print 'https://associates.amazon.com/exec/panama/associates/join/'\
'developer/application.html'
--- 141,146 ----
amazon.getLicense()
except amazon.NoLicenseKey:
! print _( 'To search for covers you need an Amazon.com Web Services\n' \
! 'license key. You can get yours from:\n' )
print 'https://associates.amazon.com/exec/panama/associates/join/'\
'developer/application.html'
***************
*** 164,188 ****
((self.item.getattr('album') and item.type == 'audio') or \
(self.item.getattr('title') and item.type == 'audiocd')):
! return [ ( self.cover_search_file, 'Find a cover for this music',
'imdb_search_or_cover_search') ]
else:
if config.DEBUG:
! print "WARNING: coversearch disabled for this item! " + \
! "coversearch needs an item with " + \
! "Artist and Album (if it's a mp3 or ogg) or " + \
! "Title (if it's a cd track) to be able to search. " + \
! "So you need a file with a ID3 tag (mp3) or an Ogg
Info. " + \
! "Maybe you must fix this file (%s) tag?" %
item.filename
except KeyError:
if config.DEBUG:
! print "WARNING: coversearch disabled for this item! " + \
! "coversearch needs an item with " + \
! "Artist and Album (if it's a mp3 or ogg) or " + \
! "Title (if it's a cd track) to be able to search. " + \
! "So you need a file with a ID3 tag (mp3) or an Ogg Info. "
+ \
! "Maybe you must fix this file (%s) tag?" % item.filename
except AttributeError:
if config.DEBUG:
! print "WARNING: Unknown CD, cover searching is disabled"
return []
--- 167,191 ----
((self.item.getattr('album') and item.type == 'audio') or \
(self.item.getattr('title') and item.type == 'audiocd')):
! return [ ( self.cover_search_file, _( 'Find a cover for this
music' ),
'imdb_search_or_cover_search') ]
else:
if config.DEBUG:
! print _( "WARNING" ) + ": "+ _( "Plugin 'coversearch' was
disabled for this item! " \
! "'coversearch' needs an item
with " \
! "Artist and Album (if it's a
mp3 or ogg) or " \
! "Title (if it's a cd track)
to be able to search. " \
! "So you need a file with a
ID3 tag (mp3) or an Ogg Info. " \
! "Maybe you must fix this
file (%s) tag?" ) % item.filename
except KeyError:
if config.DEBUG:
! print _( "WARNING" ) + ": " + _( "Plugin 'coversearch' was
disabled for this item! " \
! "'coversearch' needs an item
with " \
! "Artist and Album (if it's a
mp3 or ogg) or " \
! "Title (if it's a cd track) to
be able to search. " \
! "So you need a file with a ID3
tag (mp3) or an Ogg Info. " \
! "Maybe you must fix this file
(%s) tag?" ) % item.filename
except AttributeError:
if config.DEBUG:
! print _( "WARNING" ) + ": " + _( "Unknown CD, cover searching is
disabled" )
return []
***************
*** 192,196 ****
search imdb for this item
"""
! box = PopupBox(text='searching Amazon...')
box.show()
--- 195,199 ----
search imdb for this item
"""
! box = PopupBox(text=_( 'searching Amazon...' ) )
box.show()
***************
*** 207,212 ****
cover = amazon.searchByKeyword(search_string , product_line="music")
except amazon.AmazonError:
! box.destroy()
! box = PopupBox(text='No matches for %s - %s' % (str(artist),str(album)))
box.show()
time.sleep(2)
--- 210,216 ----
cover = amazon.searchByKeyword(search_string , product_line="music")
except amazon.AmazonError:
! box.destroy()
! dict_tmp = { "artist": str(artist), "album": str(album) }
! box = PopupBox(text=_( 'No matches for %(artist)s - %(album)s' ) %
dict_tmp )
box.show()
time.sleep(2)
***************
*** 216,220 ****
except amazon.ParseError:
box.destroy()
! box = PopupBox(text='The cover provider returned bad information.')
box.show()
time.sleep(2)
--- 220,224 ----
except amazon.ParseError:
box.destroy()
! box = PopupBox(text=_( 'The cover provider returned bad information.' ) )
box.show()
time.sleep(2)
***************
*** 253,257 ****
if not MissingFile and not (n.info()['Content-Length'] == '807'):
image = Image.open(cStringIO.StringIO(n.read()))
! items += [ menu.MenuItem('%s [small]' % cover[i].ProductName,
self.cover_create, cover[i].ImageUrlMedium) ]
n.close()
--- 257,261 ----
if not MissingFile and not (n.info()['Content-Length'] == '807'):
image = Image.open(cStringIO.StringIO(n.read()))
! items += [ menu.MenuItem( ('%s [' + _( 'small' ) + ']') %
cover[i].ProductName,
self.cover_create, cover[i].ImageUrlMedium) ]
n.close()
***************
*** 263,267 ****
if not (n.info()['Content-Length'] == '807'):
image = Image.open(cStringIO.StringIO(n.read()))
! items += [ menu.MenuItem('%s [small]' % cover[i].ProductName,
self.cover_create,
cover[i].ImageUrlLarge) ]
n.close()
--- 267,271 ----
if not (n.info()['Content-Length'] == '807'):
image = Image.open(cStringIO.StringIO(n.read()))
! items += [ menu.MenuItem( ('%s [' + _( 'small' ) + ']' ) %
cover[i].ProductName,
self.cover_create,
cover[i].ImageUrlLarge) ]
n.close()
***************
*** 272,280 ****
return
if items:
! moviemenu = menu.Menu('Cover Results', items)
menuw.pushmenu(moviemenu)
return
! box = PopupBox(text='No covers available from Amazon')
box.show()
time.sleep(2)
--- 276,284 ----
return
if items:
! moviemenu = menu.Menu( _( 'Cover Search Results' ), items)
menuw.pushmenu(moviemenu)
return
! box = PopupBox(text= _( 'No covers available from Amazon' ) )
box.show()
time.sleep(2)
***************
*** 290,294 ****
import directory
! box = PopupBox(text='getting data...')
box.show()
--- 294,298 ----
import directory
! box = PopupBox(text= _( 'getting data...' ) )
box.show()
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/mplayer.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mplayer.py 20 Oct 2003 13:36:07 -0000 1.22
--- mplayer.py 21 Oct 2003 21:17:41 -0000 1.23
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.23 2003/10/21 21:17:41 gsbarbieri
+ # Some more i18n improvements.
+ #
# Revision 1.22 2003/10/20 13:36:07 outlyer
# Remove the double-quit
***************
*** 232,242 ****
except IOError:
print
! print (('ERROR: Cannot open "%s" and "%s" for ' +
! 'MPlayer logging!') % (fname_out, fname_err))
! print 'Please set MPLAYER_DEBUG=0 in local_conf.py, or '
! print 'start Freevo from a directory that is writeable!'
print
else:
! print 'MPlayer logging to "%s" and "%s"' % (fname_out, fname_err)
self.item = item
--- 235,246 ----
except IOError:
print
! print ( _('ERROR') + ': ' + _( 'Cannot open "%s" and "%s" for ' \
! 'MPlayer logging!')
! ) % (fname_out, fname_err)
! print _( 'Please set MPLAYER_DEBUG=0 in local_conf.py, or ' \
! 'start Freevo from a directory that is writeable!' )
print
else:
! print _( 'MPlayer logging to "%s" and "%s"' ) % (fname_out,
fname_err)
self.item = item
Index: playlist.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/playlist.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** playlist.py 7 Oct 2003 19:37:57 -0000 1.1
--- playlist.py 21 Oct 2003 21:17:41 -0000 1.2
***************
*** 81,85 ****
self.naming = naming
! config.DIR_AUDIO.append(('Playlists',self.playlist_folder))
self.playlist_handle = None
plugin.ItemPlugin.__init__(self)
--- 81,85 ----
self.naming = naming
! config.DIR_AUDIO.append( ('Playlists',self.playlist_folder))
self.playlist_handle = None
plugin.ItemPlugin.__init__(self)
***************
*** 88,94 ****
def actions(self, item):
self.item = item
! return [ ( self.queue_file, 'Queue a Track',
'queue_a_track'),
! ( self.new_playlist, 'Make a New Playlist',
'close_playlist')]
--- 88,94 ----
def actions(self, item):
self.item = item
! return [ ( self.queue_file, _( 'Enqueue this Music in Playlist' ),
'queue_a_track'),
! ( self.new_playlist, _( 'Make a new Audio Playlist' ),
'close_playlist')]
Index: radio.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/radio.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** radio.py 22 Sep 2003 20:36:17 -0000 1.3
--- radio.py 21 Oct 2003 21:17:41 -0000 1.4
***************
*** 19,22 ****
--- 19,25 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.4 2003/10/21 21:17:41 gsbarbieri
+ # Some more i18n improvements.
+ #
# Revision 1.3 2003/09/22 20:36:17 mikeruelle
# more web interface help descriptions
***************
*** 68,72 ****
return a list of actions for this item
"""
! items = [ ( self.play , 'Listen to Station' ) ]
return items
--- 71,75 ----
return a list of actions for this item
"""
! items = [ ( self.play , _( 'Listen to Radio Station' ) ) ]
return items
***************
*** 118,123 ****
station_items += [ radio_item ]
if (len(station_items) == 0):
! station_items += [menu.MenuItem('No Stations found',
menwu.goto_prev_page, 0)]
! station_menu = menu.Menu('Stations', station_items)
rc.app(None)
menuw.pushmenu(station_menu)
--- 121,126 ----
station_items += [ radio_item ]
if (len(station_items) == 0):
! station_items += [menu.MenuItem( _( 'No Radio Stations found' ),
menwu.goto_prev_page, 0)]
! station_menu = menu.Menu( _( 'Radio Stations' ), station_items)
rc.app(None)
menuw.pushmenu(station_menu)
***************
*** 149,153 ****
item = RadioMainMenuItem()
! item.name = 'Radio'
if menu_items.has_key('radio') and menu_items['radio'].icon:
item.icon = os.path.join(skin.get_singleton().settings.icon_dir,
--- 152,156 ----
item = RadioMainMenuItem()
! item.name = _( 'Radio' )
if menu_items.has_key('radio') and menu_items['radio'].icon:
item.icon = os.path.join(skin.get_singleton().settings.icon_dir,
Index: webradio.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/webradio.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** webradio.py 20 Sep 2003 09:42:32 -0000 1.3
--- webradio.py 21 Oct 2003 21:17:41 -0000 1.4
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.4 2003/10/21 21:17:41 gsbarbieri
+ # Some more i18n improvements.
+ #
# Revision 1.3 2003/09/20 09:42:32 dischi
# cleanup
***************
*** 63,67 ****
def actions(self):
! return [ ( self.cwd, 'Browse entries' ) ]
def cwd(self, arg=None, menuw=None):
--- 66,70 ----
def actions(self):
! return [ ( self.cwd, _('Browse entries') ) ]
def cwd(self, arg=None, menuw=None):
***************
*** 83,92 ****
def __init__(self, mediamarks, parent):
Item.__init__(self, parent)
! self.name = 'Webradio'
self.type = 'webradio'
self.mediamarks = mediamarks
def actions(self):
! return [ ( self.cwd, 'Browse genre list' ) ]
def cwd(self, arg=None, menuw=None):
--- 86,95 ----
def __init__(self, mediamarks, parent):
Item.__init__(self, parent)
! self.name = _('Webradio')
self.type = 'webradio'
self.mediamarks = mediamarks
def actions(self):
! return [ ( self.cwd, _('Browse genre list') ) ]
def cwd(self, arg=None, menuw=None):
***************
*** 97,101 ****
except KeyError:
pass
! menuw.pushmenu(menu.Menu('Webradio Genre List', items))
--- 100,104 ----
except KeyError:
pass
! menuw.pushmenu(menu.Menu(_('Webradio Genre List'), items))
Index: xine.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/xine.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xine.py 19 Sep 2003 22:09:16 -0000 1.5
--- xine.py 21 Oct 2003 21:17:41 -0000 1.6
***************
*** 13,16 ****
--- 13,19 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2003/10/21 21:17:41 gsbarbieri
+ # Some more i18n improvements.
+ #
# Revision 1.5 2003/09/19 22:09:16 dischi
# use new childapp thread function
***************
*** 72,76 ****
config.CONF.fbxine
except:
! print '\nERROR:\nfbxine not found, plugin deactivated'
return
--- 75,79 ----
config.CONF.fbxine
except:
! print _( 'ERROR' ) + ': ' + _( "'fbxine' not found, plugin 'xine'
deactivated" )
return
***************
*** 96,101 ****
if xine_version < 923:
! print '\nERROR:\nfbxine version to old, plugin deactivated'
! print 'You need xine-ui > 0.9.22\n'
return
--- 99,104 ----
if xine_version < 923:
! print _( 'ERROR' ) + ': ' + _( "'fbxine' version too old, plugin 'xine'
deactivated" )
! print _( 'You need software %s' ) % 'xine-ui > 0.9.22'
return
-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
