Gwibber

Merge lp:~kelemeng/gwibber/bug-520462 into lp:gwibber

  1. bug-520462
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kelemeng/gwibber/bug-520462
Merge into: lp:gwibber
Diff against target: 98 lines (+9/-7)
5 files modified
gwibber/client.py (+1/-1)
gwibber/gwui.py (+1/-1)
gwibber/lib/gtk/facebook.py (+5/-4)
po/POTFILES.in (+1/-0)
ui/gwibber-accounts-dialog.ui (+1/-1)
To merge this branch: bzr merge lp:~kelemeng/gwibber/bug-520462
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+21849@code.launchpad.net

Description of the change

Contains all the patches submitted earlier by me

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Approved, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/client.py'
2--- gwibber/client.py 2010-03-20 20:28:54 +0000
3+++ gwibber/client.py 2010-03-22 11:38:17 +0000
4@@ -69,7 +69,7 @@
5 self.update_view()
6
7 def setup_ui(self):
8- self.set_title("Social broadcast messages")
9+ self.set_title(_("Social broadcast messages"))
10 gtk.icon_theme_add_builtin_icon("gwibber", 22,
11 gtk.gdk.pixbuf_new_from_file_at_size(
12 resources.get_ui_asset("gwibber.svg"), 24, 24))
13
14=== modified file 'gwibber/gwui.py'
15--- gwibber/gwui.py 2010-03-20 20:14:41 +0000
16+++ gwibber/gwui.py 2010-03-22 11:38:17 +0000
17@@ -717,7 +717,7 @@
18 self.entry.connect("activate", self.on_search)
19 self.entry.connect("changed", self.on_changed)
20
21- self.button = gtk.Button("Search")
22+ self.button = gtk.Button(_("Search"))
23 self.button.connect("clicked", self.on_search)
24
25 self.pack_start(self.entry, True)
26
27=== modified file 'gwibber/lib/gtk/facebook.py'
28--- gwibber/lib/gtk/facebook.py 2010-03-19 13:03:13 +0000
29+++ gwibber/lib/gtk/facebook.py 2010-03-22 11:38:17 +0000
30@@ -26,6 +26,7 @@
31 from gwibber.microblog import facebook
32 from gwibber.microblog.util import facelib
33 import json, urlparse
34+from gettext import gettext as _
35
36 APP_KEY = "71b85c6d8cb5bbb9f1a3f8bbdcdd4b05"
37
38@@ -50,7 +51,7 @@
39 try:
40 if self.account["session_key"] and self.account["secret_key"] and self.account["username"]:
41 self.ui.get_object("hbox_facebook_auth").hide()
42- self.ui.get_object("fb_auth_done_label").set_label(str(self.account["username"]) + " has been authorized by Facebook")
43+ self.ui.get_object("fb_auth_done_label").set_label(_("%s has been authorized by Facebook") % str(self.account["username"]))
44 self.ui.get_object("hbox_facebook_auth_done").show()
45 except:
46 self.ui.get_object("hbox_facebook_auth_done").hide()
47@@ -59,7 +60,7 @@
48 (self.win_w, self.win_h) = self.window.get_size()
49
50 web = webkit.WebView()
51- web.load_html_string("<p>Please wait...</p>", "file:///")
52+ web.load_html_string(_("<p>Please wait...</p>"), "file:///")
53
54 url = urllib.urlencode({
55 "api_key": "71b85c6d8cb5bbb9f1a3f8bbdcdd4b05",
56@@ -96,7 +97,7 @@
57 fbc.secret_key = self.account["secret_key"]
58 self.account["username"] = str(fbc.users.getInfo(fbuid)[0]["name"])
59 self.ui.get_object("hbox_facebook_auth").hide()
60- self.ui.get_object("fb_auth_done_label").set_label(str(self.account["username"]) + " has been authorized by Facebook")
61+ self.ui.get_object("fb_auth_done_label").set_label(_("%s has been authorized by Facebook") % str(self.account["username"]))
62 self.ui.get_object("hbox_facebook_auth_done").show()
63 except:
64 #FIXME: We should do this in the same window
65@@ -108,7 +109,7 @@
66
67 if title.get_title() == "Failure":
68 d = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR,
69- gtk.BUTTONS_OK, "Facebook authorization failed. Please try again.")
70+ gtk.BUTTONS_OK, _("Facebook authorization failed. Please try again."))
71 if d.run(): d.destroy()
72
73 web.hide()
74
75=== modified file 'po/POTFILES.in'
76--- po/POTFILES.in 2010-02-28 09:20:53 +0000
77+++ po/POTFILES.in 2010-03-22 11:38:17 +0000
78@@ -6,6 +6,7 @@
79 gwibber/client.py
80 gwibber/gwui.py
81 gwibber/lib/gtk/widgets.py
82+gwibber/lib/gtk/facebook.py
83 gwibber/microblog/__init__.py
84 gwibber/microblog/twitter.py
85 gwibber/microblog/support/__init__.py
86
87=== modified file 'ui/gwibber-accounts-dialog.ui'
88--- ui/gwibber-accounts-dialog.ui 2010-03-19 13:29:45 +0000
89+++ ui/gwibber-accounts-dialog.ui 2010-03-22 11:38:17 +0000
90@@ -299,7 +299,7 @@
91 </child>
92 <child>
93 <object class="GtkButton" id="button_create_save">
94- <property name="label">_Add</property>
95+ <property name="label" translatable="yes">_Add</property>
96 <property name="visible">True</property>
97 <property name="can_focus">True</property>
98 <property name="receives_default">True</property>