Gwibber

Merge lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322 into lp://staging/~gwibber-committers/gwibber/trunk.merge.backup

  1. statusnet-identica-groups-lp364322
  2. Merge into trunk.merge.backup
Proposed by Colin Dean
Status: Rejected
Rejected by: Ken VanDine
Proposed branch: lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322
Merge into: lp://staging/~gwibber-committers/gwibber/trunk.merge.backup
Diff against target: 286 lines
5 files modified
gwibber/actions.py (+5/-0)
gwibber/client.py (+3/-0)
gwibber/microblog/identica.py (+7/-4)
gwibber/microblog/laconica.py (+4/-4)
po/ru.po (+33/-23)
To merge this branch: bzr merge lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322
Reviewer Review Type Date Requested Status
Ken VanDine Needs Resubmitting
Review via email: mp+12693@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Dean (colindean) wrote :

The get_group() method for identica.Client and laconica.Client has been modified to use the Groups API available as of StatusNet 0.8.0. It is largely untested because of #381023, but similar code worked fine against the 1.2 GUI.

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Can you please resubmit against trunk again? we had to move branches.

review: Needs Resubmitting
Revision history for this message
Colin Dean (colindean) wrote :

Will do.

Is there a command which can ease this? I'm admittedly a bit of a bzr newb.

Could I do something like "bzr merge lp:<whatever the new branch is>" and then simply resolve any conflicts?

lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322 updated
459. By Colin Dean

reorienting statusnet changes with the current trunk

Revision history for this message
Colin Dean (colindean) wrote :

I'm not entirely sure I handled this correctly, but I updated the branch to the most current trunk and recommitted it, and have filed a new merge proposal.

https://code.edge.launchpad.net/~colindean/gwibber/statusnet-identica-groups-lp364322/+merge/13898

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Marked this as rejected, the resubmit has been merged. Thanks!

Unmerged revisions

459. By Colin Dean

reorienting statusnet changes with the current trunk

458. By Colin Dean

adding similar get_group() changes to laconia

457. By Colin Dean

*added group action stubs similar to tag
*altered identica.get_group() to use json instead of rss

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 2009-09-24 15:06:26 +0000
3+++ gwibber/actions.py 2009-10-24 17:10:22 +0000
4@@ -133,6 +133,11 @@
5 @classmethod
6 def action(self, w, client, query):
7 print "Searching for tag", query
8+
9+class group(MessageAction):
10+ @classmethod
11+ def action(self, w, client, query):
12+ print "Searching for group", query
13
14 class tomboy(MessageAction):
15 icon = "tomboy"
16
17=== modified file 'gwibber/client.py'
18--- gwibber/client.py 2009-10-22 18:45:56 +0000
19+++ gwibber/client.py 2009-10-24 17:10:23 +0000
20@@ -894,12 +894,15 @@
21 self.message_target = message
22 self.cancel_button.show()
23
24+<<<<<<< TREE
25 #if acct["protocol"] in microblog.PROTOCOLS.keys():
26 # if hasattr(message.client, "can_reply"):
27 # view = self.add_msg_tab(lambda: self.client.thread(message), "Jaiku Replies", True)
28 # view.load_messages()
29 # view.load_preferences(self.get_account_config())
30
31+=======
32+>>>>>>> MERGE-SOURCE
33 def on_theme_change(self, *args):
34 for tab in self.tabs:
35 view = tab.get_child()
36
37=== modified file 'gwibber/microblog/identica.py'
38--- gwibber/microblog/identica.py 2009-10-01 06:57:48 +0000
39+++ gwibber/microblog/identica.py 2009-10-24 17:10:23 +0000
40@@ -165,10 +165,13 @@
41 query}))))["entries"]
42
43 def get_group(self, query):
44- return feedparser.parse(urllib2.urlopen(
45- urllib2.Request("https://identi.ca/index.php",
46- urllib.urlencode({"action": "grouprss", "nickname":
47- query}))))["entries"]
48+ return simplejson.load(urllib2.urlopen(
49+ urllib2.Request("http://identi.ca/api/statusnet/groups/timeline.json",
50+ urllib.urlencode({"id": query}))))["results"]
51+ #return feedparser.parse(urllib2.urlopen(
52+ # urllib2.Request("https://identi.ca/index.php",
53+ # urllib.urlencode({"action": "grouprss", "nickname":
54+ # query}))))["entries"]
55
56 def get_public_timeline(self):
57 return simplejson.loads(self.connect(
58
59=== modified file 'gwibber/microblog/laconica.py'
60--- gwibber/microblog/laconica.py 2009-09-21 22:56:53 +0000
61+++ gwibber/microblog/laconica.py 2009-10-24 17:10:23 +0000
62@@ -165,10 +165,10 @@
63 urllib.urlencode({"action": "tagrss", "tag": query}))))["entries"]
64
65 def get_group(self, query):
66- return feedparser.parse(urllib2.urlopen(
67- urllib2.Request(self.url("/index.php"),
68- urllib.urlencode({"action": "grouprss", "nickname": query}))))["entries"]
69-
70+ return simplejson.load(urllib2.urlopen(
71+ urllib2.Request(self.url("/api/statusnet/groups/timeline.json"),
72+ urllib.urlencode({"id": query}))))["results"]
73+
74 def search(self, query):
75 for data in self.get_search(query):
76 yield SearchResult(self, data, query)
77
78=== modified file 'po/ru.po'
79--- po/ru.po 2009-02-28 16:43:51 +0000
80+++ po/ru.po 2009-10-24 17:10:23 +0000
81@@ -8,14 +8,14 @@
82 "Project-Id-Version: gwibber\n"
83 "Report-Msgid-Bugs-To: gwibber-team@lists.launchpad.net\n"
84 "POT-Creation-Date: 2009-02-28 15:47+0000\n"
85-"PO-Revision-Date: 2009-02-15 12:32+0000\n"
86+"PO-Revision-Date: 2009-10-09 07:02+0400\n"
87 "Last-Translator: [lol]2Fast4U <Unknown>\n"
88 "Language-Team: Russian <ru@li.org>\n"
89 "MIME-Version: 1.0\n"
90 "Content-Type: text/plain; charset=UTF-8\n"
91 "Content-Transfer-Encoding: 8bit\n"
92-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
93-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
94+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
95+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
96 "X-Launchpad-Export-Date: 2009-02-28 16:24+0000\n"
97 "X-Generator: Launchpad (build Unknown)\n"
98
99@@ -169,7 +169,7 @@
100
101 #: ../gwibber/client.py:714 ../ui/preferences.glade.h:23
102 msgid "Display bubbles"
103-msgstr ""
104+msgstr "Отображать всплывающие уведомления"
105
106 #: ../gwibber/client.py:765
107 msgid "Errors"
108@@ -247,25 +247,25 @@
109 #: ../gwibber/microblog/__init__.py:65 ../gwibber/microblog/__init__.py:72
110 #: ../gwibber/microblog/__init__.py:79
111 msgid "send message"
112-msgstr ""
113+msgstr "отправить сообщение"
114
115 #. Translators: this message appears in the Errors dialog
116 #. Indicates with wich action the error happened
117 #: ../gwibber/microblog/__init__.py:87
118 msgid "retrieve thread"
119-msgstr ""
120+msgstr "получить цепочку"
121
122 #. Translators: this message appears in the Errors dialog
123 #. Indicates with wich action the error happened
124 #: ../gwibber/microblog/__init__.py:94
125 msgid "retrieve responses"
126-msgstr ""
127+msgstr "получить ответы"
128
129 #. Translators: this message appears in the Errors dialog
130 #. Indicates with wich action the error happened
131 #: ../gwibber/microblog/__init__.py:101
132 msgid "retrieve messages"
133-msgstr ""
134+msgstr "получить сообщения"
135
136 #. Translators: this message appears in the Errors dialog
137 #. Indicates with wich action the error happened
138@@ -277,28 +277,28 @@
139 #. Indicates with wich action the error happened
140 #: ../gwibber/microblog/__init__.py:115 ../gwibber/microblog/__init__.py:122
141 msgid "perform search query"
142-msgstr ""
143+msgstr "выполнить поисковый запрос"
144
145 #. Translators: this message appears in the Errors dialog
146 #. Indicates with wich action the error happened
147 #: ../gwibber/microblog/__init__.py:129
148 msgid "perform tag query"
149-msgstr ""
150+msgstr "выполнить запрос тега"
151
152 #. Translators: this message appears in the Errors dialog
153 #. Indicates with wich action the error happened
154 #: ../gwibber/microblog/__init__.py:142
155 msgid "perform group query"
156-msgstr ""
157+msgstr "выполнить запрос группы"
158
159 #: ../gwibber/microblog/twitter.py:92 ../gwibber/microblog/twitter.py:93
160 msgid "This user has protected their updates."
161 msgstr "Этот пользователь не показывает свои обновления."
162
163 #: ../gwibber/microblog/twitter.py:92 ../gwibber/microblog/twitter.py:93
164-msgid ""
165-"You need to send a request before you can view this person's timeline."
166+msgid "You need to send a request before you can view this person's timeline."
167 msgstr ""
168+"Вы должны послать запрос, чтобы просматривать ленту этого пользователя."
169
170 #: ../gwibber/microblog/twitter.py:92 ../gwibber/microblog/twitter.py:93
171 msgid "Send request..."
172@@ -354,7 +354,7 @@
173 "<b>1.</b> Click the button below to request\n"
174 "a Gwibber login code from Facebook."
175 msgstr ""
176-"<b>1.</b> Нажми кнопку внизу, чтобы запросить\n"
177+"<b>1.</b> Нажмите кнопку ниже, чтобы запросить\n"
178 "код авторизации для Gwibber на Facebook."
179
180 #: ../ui/preferences.glade.h:3
181@@ -362,16 +362,20 @@
182 "<b>2.</b> Copy and paste the one-time code into the entry field below and "
183 "then click the Apply button."
184 msgstr ""
185+"<b>2.</b> Скопируйте и вставьте одноразовый код в поле ввода ниже и нажмите "
186+"кнопку Apply."
187
188 #: ../ui/preferences.glade.h:4
189 msgid ""
190 "<b>3.</b> Click the button below to give Gwibber permission to set your "
191 "Facebook status."
192 msgstr ""
193+"Нажмите кнопку ниже, чтобы предоставить Gwibber доступ на установку вашего "
194+"статуса в Facebook."
195
196 #: ../ui/preferences.glade.h:5
197 msgid "<b>Account Information</b>"
198-msgstr ""
199+msgstr "<b>Информация учетной записи</b>"
200
201 #: ../ui/preferences.glade.h:6
202 msgid "<b>Account Status</b>"
203@@ -383,7 +387,7 @@
204
205 #: ../ui/preferences.glade.h:8
206 msgid "<b>Experimental</b>"
207-msgstr ""
208+msgstr "<b>Экспериментальная возможность</b>"
209
210 #: ../ui/preferences.glade.h:9
211 msgid "<b>Notification</b>"
212@@ -395,11 +399,11 @@
213
214 #: ../ui/preferences.glade.h:11
215 msgid "<b>Update</b>"
216-msgstr ""
217+msgstr "Обновить"
218
219 #: ../ui/preferences.glade.h:12
220 msgid "<b>Window Behavior</b>"
221-msgstr ""
222+msgstr "<b>Поведение окна</b>"
223
224 #: ../ui/preferences.glade.h:13
225 msgid "API key:"
226@@ -415,11 +419,11 @@
227
228 #: ../ui/preferences.glade.h:16
229 msgid "Append colon to username when replying"
230-msgstr ""
231+msgstr "Добавлять двоеточие после имени пользователя в ответах"
232
233 #: ../ui/preferences.glade.h:17
234 msgid "Authorize Status Changes"
235-msgstr ""
236+msgstr "Авторизовать изменения статуса"
237
238 #: ../ui/preferences.glade.h:18
239 msgid "Automatically shorten pasted URLs"
240@@ -431,6 +435,9 @@
241 "the \"Friend's Status Feed\" link from the left-hand side of the page and "
242 "paste it into the Feed URL textbox."
243 msgstr ""
244+"Нажмите на ссылку ниже, чтобы перейти на страницу друзей на Facebook, а "
245+"потом скопируйте ссылку \"Friend's Status Feed\", расположенную в левой "
246+"части страницы, и вставьте её в поле \"URL ссылки\"."
247
248 #: ../ui/preferences.glade.h:20
249 msgid "Comment Color:"
250@@ -442,7 +449,7 @@
251
252 #: ../ui/preferences.glade.h:22
253 msgid "Digg Color:"
254-msgstr ""
255+msgstr "Цвет для Digg:"
256
257 #: ../ui/preferences.glade.h:24
258 msgid "Domain:"
259@@ -478,6 +485,9 @@
260 "Twitter, Jaiku, Facebook, Pownce, Identi.ca and other popular social web "
261 "services."
262 msgstr ""
263+"Gwibber - это клиент для микроблоггинга с открытым исходным кодом для "
264+"рабочей среды GNOME, который поддерживает Twitter, Jaiku, Facebook, Pownce, "
265+"Identi.ca и другие популярные социальные веб-сервисы."
266
267 #: ../ui/preferences.glade.h:32
268 msgid "Hide taskbar entry"
269@@ -493,7 +503,7 @@
270
271 #: ../ui/preferences.glade.h:35
272 msgid "Minutes between refresh: "
273-msgstr ""
274+msgstr "Интервал между обновлениями, в минутах:"
275
276 #: ../ui/preferences.glade.h:36
277 msgid "Password:"
278@@ -501,7 +511,7 @@
279
280 #: ../ui/preferences.glade.h:38
281 msgid "Request Login Code"
282-msgstr ""
283+msgstr "Запросить код для входа"
284
285 #: ../ui/preferences.glade.h:39
286 msgid "Show tray icon"

Subscribers

People subscribed via source and target branches

to all changes: