Update of /cvsroot/freevo/freevo/src/www/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24782
Modified Files: library.rpy Log Message: unicode breaks several key test rework the interface to cope. Index: library.rpy =================================================================== RCS file: /cvsroot/freevo/freevo/src/www/htdocs/library.rpy,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** library.rpy 23 Feb 2004 08:33:21 -0000 1.21 --- library.rpy 21 Mar 2004 23:40:00 -0000 1.22 *************** *** 12,15 **** --- 12,18 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.22 2004/03/21 23:40:00 mikeruelle + # unicode breaks several key test rework the interface to cope. + # # Revision 1.21 2004/02/23 08:33:21 gsbarbieri # i18n: help translators job. *************** *** 234,243 **** fs_result = 0 bs_result = 0 ! if action_file: fs_result = string.find(action_file, '/') bs_result = string.find(action_file, '\\') #do actions here ! if bs_result == -1 and fs_result == -1: file_loc = os.path.join(action_dir, action_file) if os.path.isfile(file_loc): --- 237,246 ---- fs_result = 0 bs_result = 0 ! if len(action_file): fs_result = string.find(action_file, '/') bs_result = string.find(action_file, '\\') #do actions here ! if not action == 'view' and bs_result == -1 and fs_result == -1: file_loc = os.path.join(action_dir, action_file) if os.path.isfile(file_loc): *************** *** 262,266 **** else: messages += [ '<b>'+_('ERROR') + '</b>: ' + _( '%s does not exist. No action taken.') % ('<b>'+file_loc+'</b>') ] ! elif action_file: messages += [ '<b>'+_('ERROR')+'</b>: ' +_( 'I do not process names (%s) with slashes for security reasons.') % action_file ] --- 265,269 ---- else: messages += [ '<b>'+_('ERROR') + '</b>: ' + _( '%s does not exist. No action taken.') % ('<b>'+file_loc+'</b>') ] ! elif action_file and action != 'view': messages += [ '<b>'+_('ERROR')+'</b>: ' +_( 'I do not process names (%s) with slashes for security reasons.') % action_file ] *************** *** 291,295 **** if not action_mediatype: fv.tableOpen('class="library"') ! movmuslink = '<a href="%s?media=%s">%s</a>' rectvlink = '<a href="%s?media=%s&dir=%s">%s</a>' fv.tableRowOpen('class="chanrow"') --- 294,298 ---- if not action_mediatype: fv.tableOpen('class="library"') ! movmuslink = '<a href="%s?media=%s&dir=">%s</a>' rectvlink = '<a href="%s?media=%s&dir=%s">%s</a>' fv.tableRowOpen('class="chanrow"') *************** *** 313,317 **** fv.printLinks() fv.printFooter() ! elif action_mediatype and not action_dir: # show the appropriate dirs from config variables # make a back to pick music or movies --- 316,320 ---- fv.printLinks() fv.printFooter() ! elif action_mediatype and len(action_dir) == 0: # show the appropriate dirs from config variables # make a back to pick music or movies *************** *** 334,339 **** fv.printLinks() fv.printFooter() ! elif action_mediatype and action_dir and not action == "download": ! if not self.check_dir(action_mediatype,action_dir): sys.exit(1) --- 337,342 ---- fv.printLinks() fv.printFooter() ! elif action_mediatype and len(action_dir) and action != "download": ! if not self.check_dir(action_mediatype,action_dir) and action != 'view': sys.exit(1) *************** *** 396,400 **** backlink = '<a href="'+ action_script +'">« '+_('Back')+'</a>' elif actiondir_is_root == TRUE: ! backlink = '<a href="'+ action_script +'?media='+action_mediatype+'">« '+_('Back')+'</a>' else: backdir = os.path.dirname(action_dir) --- 399,403 ---- backlink = '<a href="'+ action_script +'">« '+_('Back')+'</a>' elif actiondir_is_root == TRUE: ! backlink = '<a href="'+ action_script +'?media='+action_mediatype+'&dir=">« '+_('Back')+'</a>' else: backdir = os.path.dirname(action_dir) ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog