Merge lp:~deejay1/gwibber/i18n-fixes into lp:gwibber

Proposed by Łukasz Jernaś
Status: Merged
Merged at revision: not available
Proposed branch: lp:~deejay1/gwibber/i18n-fixes
Merge into: lp:gwibber
Diff against target: 151 lines (+28/-20)
2 files modified
gwibber/actions.py (+14/-12)
po/POTFILES.in (+14/-8)
To merge this branch: bzr merge lp:~deejay1/gwibber/i18n-fixes
Reviewer Review Type Date Requested Status
gwibber-committers Pending
Review via email: mp+19212@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Łukasz Jernaś (deejay1) wrote :

I've marked string in actions.py as translatable and updated POTFILE.in accordingly.
Also I've sorted POTFILES.in a bit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/actions.py'
2--- gwibber/actions.py 2010-02-07 00:50:39 +0000
3+++ gwibber/actions.py 2010-02-12 23:01:12 +0000
4@@ -1,6 +1,8 @@
5 import gtk, gwui, microblog, resources, util, json
6 from microblog.util.const import *
7
8+from gettext import lgettext as _
9+
10 class MessageAction:
11 icon = None
12 label = None
13@@ -19,7 +21,7 @@
14
15 class reply(MessageAction):
16 icon = "mail-reply-sender"
17- label = "_Reply"
18+ label = _("_Reply")
19
20 @classmethod
21 def action(self, w, client, msg):
22@@ -27,7 +29,7 @@
23
24 class thread(MessageAction):
25 icon = "mail-reply-all"
26- label = "View reply t_hread"
27+ label = _("View reply t_hread")
28
29 @classmethod
30 def action(self, w, client, msg):
31@@ -37,7 +39,7 @@
32
33 class retweet(MessageAction):
34 icon = "mail-forward"
35- label = "R_etweet"
36+ label = _("R_etweet")
37
38 @classmethod
39 def action(self, w, client, msg):
40@@ -56,7 +58,7 @@
41
42 class like(MessageAction):
43 icon = "bookmark_add"
44- label = "_Like this message"
45+ label = _("_Like this message")
46
47 @classmethod
48 def action(self, w, client, msg):
49@@ -68,12 +70,12 @@
50 }))
51
52 d = gtk.MessageDialog(buttons=gtk.BUTTONS_OK)
53- d.set_markup("You have marked this message as liked.")
54+ d.set_markup(_("You have marked this message as liked."))
55 if d.run(): d.destroy()
56
57 class delete(MessageAction):
58 icon = "gtk-delete"
59- label = "_Delete this message"
60+ label = _("_Delete this message")
61
62 @classmethod
63 def action(self, w, client, msg):
64@@ -85,7 +87,7 @@
65 }))
66
67 d = gtk.MessageDialog(buttons=gtk.BUTTONS_OK)
68- d.set_markup("The message has been deleted.")
69+ d.set_markup(_("The message has been deleted."))
70 if d.run(): d.destroy()
71
72 @classmethod
73@@ -96,7 +98,7 @@
74
75 class search(MessageAction):
76 icon = "gtk-find"
77- label = "_Search for a query"
78+ label = _("_Search for a query")
79
80 @classmethod
81 def action(self, w, client, query=None):
82@@ -104,7 +106,7 @@
83
84 class read(MessageAction):
85 icon = "mail-read"
86- label = "View _Message"
87+ label = _("View _Message")
88
89 @classmethod
90 def action(self, w, client, msg):
91@@ -116,7 +118,7 @@
92
93 class user(MessageAction):
94 icon = "face-monkey"
95- label = "View user _Profile"
96+ label = _("View user _Profile")
97
98 @classmethod
99 def action(self, w, client, acct=None, name=None):
100@@ -147,12 +149,12 @@
101
102 class tomboy(MessageAction):
103 icon = "tomboy"
104- label = "Save to _Tomboy"
105+ label = _("Save to _Tomboy")
106
107 @classmethod
108 def action(self, w, client, msg):
109 util.create_tomboy_note(
110- "%s message from %s at %s\n\n%s\n\nSource: %s" % (
111+ _("%s message from %s at %s\n\n%s\n\nSource: %s") % (
112 client.model.services[msg["protocol"]]["name"],
113 msg["sender"]["name"], msg["time"],
114 msg["text"], msg["url"]))
115
116=== modified file 'po/POTFILES.in'
117--- po/POTFILES.in 2010-02-12 18:06:08 +0000
118+++ po/POTFILES.in 2010-02-12 23:01:12 +0000
119@@ -1,18 +1,24 @@
120+gwibber.desktop.in
121+gwibber-accounts.desktop.in
122 gwibber-preferences.desktop.in
123-gwibber-accounts.desktop.in
124-gwibber.desktop.in
125+
126+gwibber/accounts.py
127+gwibber/actions.py
128 gwibber/client.py
129-gwibber/accounts.py
130+gwibber/gwui.py
131 gwibber/preferences.py
132-gwibber/gwui.py
133+
134 gwibber/microblog/__init__.py
135 gwibber/microblog/twitter.py
136 gwibber/microblog/support/__init__.py
137-ui/gwibber-preferences-dialog.ui
138+
139 ui/gwibber-about-dialog.ui
140+ui/gwibber-accounts-dialog.ui
141 ui/gwibber-accounts-facebook.ui
142+ui/gwibber-accounts-flickr.ui
143 ui/gwibber-accounts-friendfeed.ui
144+ui/gwibber-accounts-identica.ui
145 ui/gwibber-accounts-twitter.ui
146-ui/gwibber-accounts-dialog.ui
147-ui/gwibber-accounts-flickr.ui
148-ui/gwibber-accounts-identica.ui
149+
150+ui/gwibber-preferences-dialog.ui
151+