From 147a40bff998ceb23fae7abf21d0af63b4ebda61 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Fri, 17 Dec 2010 19:13:33 +0100 Subject: [PATCH 1/6] gettextify warning --- pyfpdb/GuiSessionViewer.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pyfpdb/GuiSessionViewer.py b/pyfpdb/GuiSessionViewer.py index 6f0fd269..903c7fd1 100644 --- a/pyfpdb/GuiSessionViewer.py +++ b/pyfpdb/GuiSessionViewer.py @@ -157,15 +157,10 @@ class GuiSessionViewer (threading.Thread): # make sure Hand column is not displayed #[x for x in self.columns if x[0] == 'hand'][0][1] = False if DEBUG == False: - warning_string = """ -Session Viewer is proof of concept code only, and contains many bugs. - -Feel free to use the viewer, but there is no guarantee that the data is accurate. - -If you are interested in developing the code further please contact us via the usual channels. - -Thankyou -""" + warning_string = _("Session Viewer is proof of concept code only, and contains many bugs.\n") + warning_string += _("Feel free to use the viewer, but there is no guarantee that the data is accurate.\n") + warning_string += _("If you are interested in developing the code further please contact us via the usual channels.\n") + warning_string += _("Thankyou") self.warning_box(warning_string) def warning_box(self, str, diatitle=_("FPDB WARNING")): From 43911a49e8620fe4e43bb97f5c721d2d4965ccf8 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Fri, 17 Dec 2010 19:16:11 +0100 Subject: [PATCH 2/6] split warning into several strings for easier translation --- pyfpdb/GuiStove.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pyfpdb/GuiStove.py b/pyfpdb/GuiStove.py index f238e503..b600c81e 100644 --- a/pyfpdb/GuiStove.py +++ b/pyfpdb/GuiStove.py @@ -54,15 +54,10 @@ class GuiStove(): self.mainHBox.show_all() if DEBUG == False: - warning_string = _(""" -Stove is a GUI mockup of a EV calculation page, and completely non functional. - -Unless you are interested in developing this feature, please ignore this page. - -If you are interested in developing the code further see GuiStove.py and Stove.py - -Thankyou -""") + warning_string = _("Stove is a GUI mockup of a EV calculation page, and completely non functional.\n") + warning_string = _("Unless you are interested in developing this feature, please ignore this page.\n") + warning_string = _("If you are interested in developing the code further see GuiStove.py and Stove.py\n") + warning_string = _("Thank you\n") self.warning_box(warning_string) From 3157cf3c15211f0b8a0142670e7c3261271d1b7d Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Fri, 17 Dec 2010 19:18:52 +0100 Subject: [PATCH 3/6] correct comment --- pyfpdb/fpdb.pyw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/fpdb.pyw b/pyfpdb/fpdb.pyw index 6dc2feb2..1cdb7783 100755 --- a/pyfpdb/fpdb.pyw +++ b/pyfpdb/fpdb.pyw @@ -1094,7 +1094,7 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an self.add_and_display_tab(gv_tab, _("Tourney Graphs")) def tabStove(self, widget, data=None): - """opens a tab for bulk importing tournament summaries""" + """opens a tab for poker stove""" thread = GuiStove.GuiStove(self.config, self.window) self.threads.append(thread) tab = thread.get_vbox() From 185aa5af3ebb9f74f04388ea2282e70632ab5796 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Sat, 18 Dec 2010 20:32:24 +0100 Subject: [PATCH 4/6] tiny cosmetic change to prints --- pyfpdb/GuiReplayer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyfpdb/GuiReplayer.py b/pyfpdb/GuiReplayer.py index 4b95faf2..6cdf326b 100644 --- a/pyfpdb/GuiReplayer.py +++ b/pyfpdb/GuiReplayer.py @@ -108,11 +108,11 @@ class GuiReplayer: self.table[i]={"name":self.MyHand.players[i][1],"stack":Decimal(self.MyHand.players[i][2]),"x":x,"y":y,"chips":0,"status":"live"} #save coordinates of each player try: self.table[i]['holecards']=self.MyHand.holecards["PREFLOP"][self.MyHand.players[i][1]][1]+' '+self.MyHand.holecards["PREFLOP"][self.MyHand.players[i][1]][2] - print "holecards",self.table[i]['holecards'] + print "holecards: ",self.table[i]['holecards'] except: self.table[i]['holecards']='' except IndexError: #if seat is empty - print "seat",i+1,"out of",self.maxseats,"empty" + print "seat ",i+1," out of ",self.maxseats," empty" self.actions=[] #create list with all actions From 51ff6d0bb0dfa9ab30f7df24003c6aa198fed18e Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Sat, 18 Dec 2010 20:33:22 +0100 Subject: [PATCH 5/6] another trivial cosmetic change to guireplayer --- pyfpdb/GuiReplayer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/GuiReplayer.py b/pyfpdb/GuiReplayer.py index 6cdf326b..f9269b8e 100644 --- a/pyfpdb/GuiReplayer.py +++ b/pyfpdb/GuiReplayer.py @@ -226,7 +226,7 @@ class GuiReplayer: rect = gtk.gdk.Rectangle(270,270,100,50) self.area.window.invalidate_rect(rect, True) #refresh pot area self.area.window.process_updates(True) - print "draw action",self.action_number,self.actions[self.action_number][1],self.actions[self.action_number][2],self.actions[self.action_number][3] + print "draw action: ",self.action_number,self.actions[self.action_number][1],self.actions[self.action_number][2],self.actions[self.action_number][3] return True From 86150294ec917cbd3804c27b9a7259bacd7597da Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Sat, 18 Dec 2010 21:28:01 +0100 Subject: [PATCH 6/6] some gettextifications --- pyfpdb/Database.py | 4 ++-- pyfpdb/HUD_main.pyw | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index fa23f1cd..943479cd 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -1694,11 +1694,11 @@ class Database: def storeHand(self, p, printdata = False): if printdata: - print "######## Hands ##########" + print _("######## Hands ##########") import pprint pp = pprint.PrettyPrinter(indent=4) pp.pprint(p) - print "###### End Hands ########" + print _("###### End Hands ########") #stores into table hands: q = self.sql.query['store_hand'] diff --git a/pyfpdb/HUD_main.pyw b/pyfpdb/HUD_main.pyw index 79b2fbfe..9c50bcb4 100755 --- a/pyfpdb/HUD_main.pyw +++ b/pyfpdb/HUD_main.pyw @@ -321,7 +321,7 @@ def idle_resize(hud): [aw.update_card_positions() for aw in hud.aux_windows] hud.resize_windows() except: - log.exception("Error resizing HUD for table: %s." % hud.table.title) + log.exception(_("Error resizing HUD for table: %s.") % hud.table.title) finally: gtk.gdk.threads_leave() @@ -335,7 +335,7 @@ def idle_kill(hud_main, table): del(hud_main.hud_dict[table]) hud_main.main_window.resize(1, 1) except: - log.exception("Error killing HUD for table: %s." % table.title) + log.exception(_("Error killing HUD for table: %s.") % table.title) finally: gtk.gdk.threads_leave() @@ -358,7 +358,7 @@ def idle_create(hud_main, new_hand_id, table, temp_key, max, poker_game, type, s hud_main.hud_dict[temp_key].update(new_hand_id, hud_main.config) hud_main.hud_dict[temp_key].reposition_windows() except: - log.exception("Error creating HUD for hand %s." % new_hand_id) + log.exception(_("Error creating HUD for hand %s.") % new_hand_id) finally: gtk.gdk.threads_leave() return False @@ -369,7 +369,7 @@ def idle_update(hud_main, new_hand_id, table_name, config): hud_main.hud_dict[table_name].update(new_hand_id, config) [aw.update_gui(new_hand_id) for aw in hud_main.hud_dict[table_name].aux_windows] except: - log.exception("Error updating HUD for hand %s." % new_hand_id) + log.exception(_("Error updating HUD for hand %s.") % new_hand_id) finally: gtk.gdk.threads_leave() return False