evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.assembla.com/fpdb.git

Browse Source
This commit is contained in:
Eric Blade 2010-10-28 20:49:32 -04:00
commit a6f14c2474
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pyfpdb/SplitHandHistory.py
View File

@ -73,7 +73,7 @@ class SplitHandHistory:
try: try:
infile = codecs.open(self.in_path, 'r', kodec) infile = codecs.open(self.in_path, 'r', kodec)
except IOError: except IOError:
print 'File not found' print _('File not found')
sys.exit(2) sys.exit(2)
#Split with do_hands_per_file if archive and paragraphs if a regular hh #Split with do_hands_per_file if archive and paragraphs if a regular hh
@ -83,7 +83,7 @@ class SplitHandHistory:
nn += 1 nn += 1
check = self.do_hands_per_file(infile, nn) check = self.do_hands_per_file(infile, nn)
if check is None: if check is None:
print '%s processed' % self.in_path print _('%s processed' % self.in_path)
break break
else: else:
filenum = 0 filenum = 0
@ -102,7 +102,7 @@ class SplitHandHistory:
def new_file(self, fileno=-1): def new_file(self, fileno=-1):
if fileno < 1: if fileno < 1:
print 'Nope, will not work (fileno=%d)' % fileno print _('Nope, will not work (fileno=%d)' % fileno)
sys.exit(2) sys.exit(2)
basename = os.path.splitext(os.path.basename(self.in_path))[0] basename = os.path.splitext(os.path.basename(self.in_path))[0]
name = os.path.join(self.out_path, basename+'-%06d.txt' % fileno) name = os.path.join(self.out_path, basename+'-%06d.txt' % fileno)
@ -123,7 +123,7 @@ class SplitHandHistory:
done = True done = True
break break
except: except:
print "Unexpected error processing file" print _("Unexpected error processing file")
sys.exit(2) sys.exit(2)
n += 1 n += 1
outfile.close() outfile.close()
@ -162,7 +162,7 @@ class SplitHandHistory:
#print l, len(l) #print l, len(l)
# Catch EOF # Catch EOF
if len(l) == 0: if len(l) == 0:
raise FpdbEndOfFile("End of file reached") raise FpdbEndOfFile(_("End of file reached"))
m = re_SplitArchive.search(l) m = re_SplitArchive.search(l)
# There is an empty line after pre-hand header and actual HH entry # There is an empty line after pre-hand header and actual HH entry
l = infile.readline() l = infile.readline()

2
pyfpdb/WinTables.py
View File

@ -67,7 +67,7 @@ class Table(Table_Window):
try: try:
if self.window == None: if self.window == None:
log.error("Window %s not found. Skipping." % self.search_string) log.error(_("Window %s not found. Skipping." % self.search_string))
return None return None
except AttributeError: except AttributeError:
log.error(_("self.window doesn't exist? why?")) log.error(_("self.window doesn't exist? why?"))

2
pyfpdb/fpdb.pyw
View File

@ -1243,7 +1243,7 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an
for site in self.config.get_supported_sites(True): # get site names from config file for site in self.config.get_supported_sites(True): # get site names from config file
try: try:
self.config.get_site_id(site) # and check against list from db self.config.get_site_id(site) # and check against list from db
except KeyError as exc: except KeyError , exc:
log.warning("site %s missing from db" % site) log.warning("site %s missing from db" % site)
dia = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Unknown Site") dia = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Unknown Site")
diastring = _("WARNING: Unable to find site '%s'\n\nPress YES to add this site to the database.") % site diastring = _("WARNING: Unable to find site '%s'\n\nPress YES to add this site to the database.") % site