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

Conflicts: pyfpdb/Database.py pyfpdb/TableWindow.py
2010-12-03 16:14:10 -05:00
parent 2d0ea89b9a e032b32ea7
commit 8855530617
18 changed files with 466 additions and 156 deletions
@@ -264,7 +264,7 @@ class PokerStars(HandHistoryConverter):
                            hand.buyinCurrency="PSFP"
                        else:
                            #FIXME: handle other currencies, FPP, play money
-                            raise FpdbParseError(_("failed to detect currency"))
+                            raise FpdbParseError(_("Failed to detect currency: '%s'" % info[key]))

                        info['BIAMT'] = info['BIAMT'].strip(u'$€FPP')