Merge branch 'doc' into next-gen

This commit is contained in:
2015-06-21 21:24:10 -05:00
3 changed files with 238 additions and 66 deletions

View File

@@ -7,7 +7,7 @@ actions = reverse_sort.reverse_sort([ ("audio", _(u"Audio tweet.")),
("dm_received", _(u"Direct message received.")),
("dm_sent", _(u"Direct message sent.")),
("error", _(u"Error.")),
("favourite", _(u"Tweet favorited.")),
("favourite", _(u"Tweet favourited.")),
("favourites_timeline_updated", _(u"Favourites buffer updated.")),
("geo", _(u"Geotweet.")),
("limit", _(u"Boundary reached.")),

View File

@@ -96,7 +96,7 @@ def compose_event(data, username):
if data["source"]["screen_name"] == username:
event = _(u"You've added to favourites: %s, %s") % (data["target"]["name"], data["target_object"]["text"])
else:
event = _(u"%s(@%s) has marked as favorite: %s") % (data["source"]["name"], data["source"]["screen_name"], data["target_object"]["text"])
event = _(u"%s(@%s) has marked as favourite: %s") % (data["source"]["name"], data["source"]["screen_name"], data["target_object"]["text"])
elif data["event"] == "unfavorite":
if data["source"]["screen_name"] == username: event = _(u"You've removed from favourites: %s, %s") % (data["target"]["name"], data["target_object"]["text"])
else: event = _(u"%s(@%s) has removed from favourites: %s") % (data["source"]["name"], data["source"]["screen_name"], data["target_object"]["text"])