Reverted quoted tweets support

This commit is contained in:
Manuel Cortez 2015-10-03 04:34:43 -05:00
parent fd9e4dc05d
commit 148c5176c6
9 changed files with 275 additions and 191 deletions

View File

@ -5,7 +5,7 @@ if snapshot == False:
version = "0.80"
update_url = 'http://twblue.es/updates/twblue_ngen.json'
else:
version = "10.7"
version = "10.10"
update_url = 'http://twblue.es/updates/snapshots_ngen.json'
author = u"Manuel Cortéz, Bill Dengler"
authorEmail = "manuel@manuelcortez.net"

View File

@ -887,6 +887,7 @@ class trendsBufferController(bufferController):
self.buffer.name = name
self.compose_function = self.compose_function_
self.get_formatted_message = self.get_message
self.reply = self.search_topic
def start_stream(self):
try:
@ -913,12 +914,11 @@ class trendsBufferController(bufferController):
def bind_events(self):
log.debug("Binding events...")
self.buffer.list.list.Bind(wx.EVT_CHAR_HOOK, self.get_event)
# widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.post_tweet, self.buffer.tweet)
# widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.retweet, self.buffer.retweet)
# widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.direct_message, self.buffer.dm)
# widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.reply, self.buffer.reply)
widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.tweet_about_this_trend, self.buffer.tweetTrendBtn)
widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.post_tweet, self.buffer.tweet)
widgetUtils.connect_event(self.buffer.list.list, wx.EVT_LIST_ITEM_RIGHT_CLICK, self.show_menu)
widgetUtils.connect_event(self.buffer.list.list, wx.EVT_LIST_KEY_DOWN, self.show_menu_by_key)
widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.search_topic, self.buffer.search_topic)
def get_message(self):
return self.compose_function(self.trends[self.buffer.list.get_selected()])[0]
@ -933,11 +933,13 @@ class trendsBufferController(bufferController):
elif dlg == widgetUtils.NO:
return False
def interact(self, *args, **kwargs):
self.searchfunction(value=self.get_message())
def search_topic(self, *args, **kwargs):
topic = self.trends[self.buffer.list.get_selected()]["name"]
pub.sendMessage("search", term=topic)
def show_menu(self, ev, pos=0, *args, **kwargs):
menu = menus.trendsPanelMenu()
widgetUtils.connect_event(menu, widgetUtils.MENU, self.search_topic, menuitem=menu.search_topic)
widgetUtils.connect_event(menu, widgetUtils.MENU, self.tweet_about_this_trend, menuitem=menu.tweetThisTrend)
widgetUtils.connect_event(menu, widgetUtils.MENU, self.view, menuitem=menu.view)
widgetUtils.connect_event(menu, widgetUtils.MENU, self.copy, menuitem=menu.copy)

View File

@ -16,11 +16,21 @@ class listsController(object):
widgetUtils.connect_event(self.dialog.createBtn, widgetUtils.BUTTON_PRESSED, self.create_list)
widgetUtils.connect_event(self.dialog.editBtn, widgetUtils.BUTTON_PRESSED, self.edit_list)
widgetUtils.connect_event(self.dialog.view, widgetUtils.BUTTON_PRESSED, self.open_list_as_buffer)
widgetUtils.connect_event(self.dialog.deleteBtn, widgetUtils.BUTTON_PRESSED, self.remove_list)
else:
self.dialog = lists.userListViewer(user)
self.dialog.populate_list(self.get_user_lists(user))
widgetUtils.connect_event(self.dialog.createBtn, widgetUtils.BUTTON_PRESSED, self.subscribe)
widgetUtils.connect_event(self.dialog.deleteBtn, widgetUtils.BUTTON_PRESSED, self.unsubscribe)
self.dialog.get_response()
def get_all_lists(self):
return [compose.compose_list(item) for item in self.session.db["lists"]]
def get_user_lists(self, user):
self.lists = self.session.twitter.twitter.show_lists(reverse=True, screen_name=user)
return [compose.compose_list(item) for item in self.lists]
def create_list(self, *args, **kwargs):
dialog = lists.createListDialog()
if dialog.get_response() == widgetUtils.OK:
@ -73,4 +83,23 @@ class listsController(object):
def open_list_as_buffer(self, *args, **kwargs):
if self.dialog.lista.get_count() == 0: return
list = self.session.db["lists"][self.dialog.get_item()]
pub.sendMessage("create-new-buffer", buffer="list", account=self.session.db["user_name"], create=list["name"])
pub.sendMessage("create-new-buffer", buffer="list", account=self.session.db["user_name"], create=list["name"])
def subscribe(self, *args, **kwargs):
if self.dialog.lista.get_count() == 0: return
list_id = self.lists[self.dialog.get_item()]["id"]
try:
list = self.session.twitter.twitter.subscribe_to_list(list_id=list_id)
item = utils.find_item(list["id"], self.session.db["lists"])
self.session.db["lists"].append(list)
except TwythonError as e:
output.speak("error %s: %s" % (e.status_code, e.msg))
def unsubscribe(self, *args, **kwargs):
if self.dialog.lista.get_count() == 0: return
list_id = self.lists[self.dialog.get_item()]["id"]
try:
list = self.session.twitter.twitter.unsubscribe_from_list(list_id=list_id)
self.session.db["lists"].remove(list)
except TwythonError as e:
output.speak("error %s: %s" % (e.status_code, e.msg))

View File

@ -129,6 +129,7 @@ class Controller(object):
pub.subscribe(self.create_new_buffer, "create-new-buffer")
pub.subscribe(self.restart_streams, "restart-streams")
pub.subscribe(self.execute_action, "execute-action")
pub.subscribe(self.search_topic, "search")
if system == "Windows":
pub.subscribe(self.invisible_shorcuts_changed, "invisible-shorcuts-changed")
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.show_hide, menuitem=self.view.show_hide)
@ -157,6 +158,7 @@ class Controller(object):
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.follow, menuitem=self.view.follow)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.send_dm, self.view.dm)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.get_more_items, menuitem=self.view.load_previous_items)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.view_user_lists, menuitem=self.view.viewLists)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.clear_buffer, menuitem=self.view.clear)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.remove_buffer, self.view.deleteTl)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.check_for_updates, self.view.check_for_updates)
@ -394,7 +396,10 @@ class Controller(object):
self.buffers.remove(buffer)
del buffer
def search(self, value="", *args, **kwargs):
def search_topic(self, term):
self.search(value=term)
def search(self, event=None, value="", *args, **kwargs):
""" Searches words or users in twitter. This creates a new buffer containing the search results."""
log.debug("Creating a new search...")
dlg = dialogs.search.searchDialog(value)
@ -468,8 +473,20 @@ class Controller(object):
buffer = self.get_best_buffer()
SoundsTutorial.soundsTutorial(buffer.session)
def view_user_lists(self, users):
pass
def view_user_lists(self, *args, **kwargs):
buff = self.get_best_buffer()
if not hasattr(buff, "get_right_tweet"): return
tweet = buff.get_right_tweet()
if buff.type != "people":
users = utils.get_all_users(tweet, buff.session.db)
else:
users = [tweet["screen_name"]]
dlg = dialogs.utils.selectUserDialog(_(u"Select the user"), users)
if dlg.get_response() == widgetUtils.OK:
user = dlg.get_user()
else:
return
l = listsController.listsController(buff.session, user=user)
def add_to_list(self, *args, **kwargs):
buff = self.get_best_buffer()

Binary file not shown.

View File

@ -5,192 +5,192 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2015-09-04 08:51+Hora de verano central (México)\n"
"PO-Revision-Date: 2015-09-23 12:02+0900\n"
"POT-Creation-Date: 2015-10-02 16:11+0900\n"
"PO-Revision-Date: 2015-10-03 15:50+0900\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: ja_JP\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"X-Generator: Poedit 1.8.4\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja_JP\n"
#: ../src\controller\buffersController.py:89
msgid "This action is not supported for this buffer"
msgstr "その動作は、現在のバッファでは利用できません。"
#: ../src\controller\buffersController.py:128
#: ../src\controller\buffersController.py:957 ../src\wxUI\buffers\base.py:24
#: ../src\controller\buffersController.py:983 ../src\wxUI\buffers\base.py:24
#: ../src\wxUI\buffers\events.py:14 ../src\wxUI\buffers\trends.py:17
#: ../src\wxUI\dialogs\message.py:251 ../src\wxUI\sysTrayIcon.py:33
msgid "Tweet"
msgstr "ツイート"
#: ../src\controller\buffersController.py:129
#: ../src\controller\buffersController.py:958
#: ../src\controller\buffersController.py:984
msgid "Write the tweet here"
msgstr "ツイート:"
#: ../src\controller\buffersController.py:312
#: ../src\controller\buffersController.py:753
#: ../src\controller\buffersController.py:313
#: ../src\controller\buffersController.py:774
msgid "%s items retrieved"
msgstr "%s個のアイテムを取得しました"
#: ../src\controller\buffersController.py:332
#: ../src\controller\buffersController.py:333
msgid "This buffer is not a timeline; it can't be deleted."
msgstr "このバッファは、タイムラインではないため、削除できません"
#: ../src\controller\buffersController.py:448
#: ../src\controller\buffersController.py:449
msgid "Reply to %s"
msgstr "「%s」への返信:"
#: ../src\controller\buffersController.py:448
#: ../src\controller\buffersController.py:449
#: ../src\keystrokeEditor\constants.py:11 ../src\wxUI\buffers\base.py:26
msgid "Reply"
msgstr "返信"
#: ../src\controller\buffersController.py:475
#: ../src\controller\buffersController.py:476
msgid "Direct message to %s"
msgstr "%sへのダイレクトメッセージ"
msgstr "%sへのダイレクトメッセージ"
#: ../src\controller\buffersController.py:475
#: ../src\controller\mainController.py:1125
#: ../src\controller\buffersController.py:476
#: ../src\controller\mainController.py:1143
msgid "New direct message"
msgstr "新しいダイレクトメッセージ:"
#: ../src\controller\buffersController.py:496
#: ../src\controller\buffersController.py:497
msgid "Add your comment to the tweet"
msgstr "ツイートにコメントを追加"
#: ../src\controller\buffersController.py:496
#: ../src\controller\buffersController.py:497
#: ../src\keystrokeEditor\constants.py:12 ../src\wxUI\buffers\base.py:25
#: ../src\wxUI\commonMessageDialogs.py:9 ../src\wxUI\dialogs\message.py:126
msgid "Retweet"
msgstr "リツイート"
#: ../src\controller\buffersController.py:567
#: ../src\controller\buffersController.py:568
msgid "Opening URL..."
msgstr "URLを開いています"
#: ../src\controller\buffersController.py:602
#: ../src\controller\buffersController.py:603
msgid "User details"
msgstr "ユーザーの詳細"
#: ../src\controller\buffersController.py:651
#: ../src\controller\buffersController.py:672
msgid "Empty"
msgstr "何もありません"
#: ../src\controller\buffersController.py:712
#: ../src\controller\buffersController.py:733
msgid "Mention to %s"
msgstr "%sへのメンション"
#: ../src\controller\buffersController.py:712 ../src\wxUI\buffers\people.py:15
#: ../src\controller\buffersController.py:733 ../src\wxUI\buffers\people.py:15
msgid "Mention"
msgstr "メンション"
#: ../src\controller\mainController.py:254
#: ../src\controller\mainController.py:256
msgid "Ready"
msgstr "準備完了"
#: ../src\controller\mainController.py:286
#: ../src\controller\mainController.py:288
msgid "Home"
msgstr "ホーム"
#: ../src\controller\mainController.py:290
#: ../src\controller\mainController.py:292
msgid "Mentions"
msgstr "メンション"
#: ../src\controller\mainController.py:294
#: ../src\controller\mainController.py:296
msgid "Direct messages"
msgstr "ダイレクトメッセージ"
#: ../src\controller\mainController.py:298
#: ../src\controller\mainController.py:300
msgid "Sent direct messages"
msgstr "送信済みのダイレクトメッセージ"
#: ../src\controller\mainController.py:302
#: ../src\controller\mainController.py:304
msgid "Sent tweets"
msgstr "送信済みのツイート"
#: ../src\controller\mainController.py:307
#: ../src\controller\mainController.py:1248
#: ../src\controller\mainController.py:309
#: ../src\controller\mainController.py:1266
#: ../src\wxUI\dialogs\userSelection.py:20
msgid "Favourites"
msgstr "お気に入り"
#: ../src\controller\mainController.py:311
#: ../src\controller\mainController.py:1253
#: ../src\controller\mainController.py:313
#: ../src\controller\mainController.py:1271
msgid "Followers"
msgstr "フォロワー"
#: ../src\controller\mainController.py:315
#: ../src\controller\mainController.py:1258
#: ../src\controller\mainController.py:317
#: ../src\controller\mainController.py:1276
msgid "Friends"
msgstr "フォロー"
#: ../src\controller\mainController.py:319
#: ../src\controller\mainController.py:1263
#: ../src\controller\mainController.py:321
#: ../src\controller\mainController.py:1281
msgid "Blocked users"
msgstr "ブロックしたユーザー"
#: ../src\controller\mainController.py:323
#: ../src\controller\mainController.py:1268
#: ../src\controller\mainController.py:325
#: ../src\controller\mainController.py:1286
msgid "Muted users"
msgstr "ミューとしたユーザー"
#: ../src\controller\mainController.py:327
#: ../src\controller\mainController.py:1273
#: ../src\controller\mainController.py:329
#: ../src\controller\mainController.py:1291
msgid "Events"
msgstr "イベント"
#: ../src\controller\mainController.py:330
#: ../src\controller\mainController.py:332
msgid "Timelines"
msgstr "タイムライン"
#: ../src\controller\mainController.py:334
#: ../src\controller\mainController.py:756
#: ../src\controller\mainController.py:336
#: ../src\controller\mainController.py:774
msgid "Timeline for {}"
msgstr "「{}」のタイムライン"
#: ../src\controller\mainController.py:337
#: ../src\controller\mainController.py:339
msgid "Favourites timelines"
msgstr "他のユーザーのお気に入り一覧"
#: ../src\controller\mainController.py:341
#: ../src\controller\mainController.py:771
#: ../src\controller\mainController.py:343
#: ../src\controller\mainController.py:789
msgid "Favourites timeline for {}"
msgstr "{}のお気に入り一覧"
#: ../src\controller\mainController.py:346 ../src\wxUI\dialogs\lists.py:12
#: ../src\controller\mainController.py:348 ../src\wxUI\dialogs\lists.py:12
msgid "Lists"
msgstr "リスト"
#: ../src\controller\mainController.py:351
#: ../src\controller\mainController.py:1284
#: ../src\controller\mainController.py:353
#: ../src\controller\mainController.py:1302
msgid "List for {}"
msgstr "{}のリスト"
#: ../src\controller\mainController.py:354
#: ../src\controller\mainController.py:356
msgid "Searches"
msgstr "検索"
#: ../src\controller\mainController.py:358
#: ../src\controller\mainController.py:416
#: ../src\controller\mainController.py:360
#: ../src\controller\mainController.py:422
msgid "Search for {}"
msgstr "「{}」の検索結果"
#: ../src\controller\mainController.py:368
#: ../src\controller\mainController.py:817
#: ../src\controller\mainController.py:370
#: ../src\controller\mainController.py:835
msgid "Trending topics for %s"
msgstr "{}の話題のトピック"
#: ../src\controller\mainController.py:435
#: ../src\controller\mainController.py:912
#: ../src\controller\mainController.py:931
#: ../src\controller\mainController.py:950
#: ../src\controller\mainController.py:969
#: ../src\controller\mainController.py:441
#: ../src\controller\mainController.py:930
#: ../src\controller\mainController.py:949
#: ../src\controller\mainController.py:968
#: ../src\controller\mainController.py:987
msgid ""
"No session is currently in focus. Focus a session with the next or previous "
"session shortcut."
@ -198,101 +198,102 @@ msgstr ""
"セッションが選択されていません。「次のセッション」または「前のセッション」の"
"ショートカットを利用して、セッションを選択してください。"
#: ../src\controller\mainController.py:439
#: ../src\controller\mainController.py:445
msgid "Empty buffer."
msgstr "からのバッファ"
#: ../src\controller\mainController.py:446
#: ../src\controller\mainController.py:452
msgid "{0} not found."
msgstr "{0}が見つかりませんでした。"
#: ../src\controller\mainController.py:482
#: ../src\controller\mainController.py:509
#: ../src\controller\mainController.py:485
#: ../src\controller\mainController.py:500
#: ../src\controller\mainController.py:527
msgid "Select the user"
msgstr "ユーザーを選択"
#: ../src\controller\mainController.py:790
#: ../src\controller\mainController.py:808
msgid "Conversation with {0}"
msgstr "{0}との会話"
#: ../src\controller\mainController.py:834
#: ../src\controller\mainController.py:853
#: ../src\controller\mainController.py:852
#: ../src\controller\mainController.py:871
msgid "There are no coordinates in this tweet"
msgstr "このツイートには、ジェオタグは存在しません"
#: ../src\controller\mainController.py:836
#: ../src\controller\mainController.py:855
#: ../src\controller\mainController.py:854
#: ../src\controller\mainController.py:873
msgid "There are no results for the coordinates in this tweet"
msgstr "このツイートのジェオタグには、なにも含まれていません"
#: ../src\controller\mainController.py:838
#: ../src\controller\mainController.py:857
#: ../src\controller\mainController.py:856
#: ../src\controller\mainController.py:875
msgid "Error decoding coordinates. Try again later."
msgstr "ジェオタグの取得に失敗しました"
#: ../src\controller\mainController.py:960
#: ../src\controller\mainController.py:979
#: ../src\controller\mainController.py:978
#: ../src\controller\mainController.py:997
msgid "%s, %s of %s"
msgstr "%s %s/%s"
#: ../src\controller\mainController.py:962
#: ../src\controller\mainController.py:981
#: ../src\controller\mainController.py:1002
#: ../src\controller\mainController.py:1023
#: ../src\controller\mainController.py:980
#: ../src\controller\mainController.py:999
#: ../src\controller\mainController.py:1020
#: ../src\controller\mainController.py:1041
msgid "%s. Empty"
msgstr "%sは、からです。"
#: ../src\controller\mainController.py:994
#: ../src\controller\mainController.py:1012
msgid "{0}: This account is not logged into Twitter."
msgstr "このアカウント{0}は、まだツイッターにログインしていません"
#: ../src\controller\mainController.py:1000
#: ../src\controller\mainController.py:1021
#: ../src\controller\mainController.py:1018
#: ../src\controller\mainController.py:1039
msgid "%s. %s, %s of %s"
msgstr "セッション:%s %s %s/%s/"
#: ../src\controller\mainController.py:1015
#: ../src\controller\mainController.py:1033
msgid "{0}: This account is not logged into twitter."
msgstr "このアカウント{0}は、まだツイッターにログインしていません"
#: ../src\controller\mainController.py:1116
#: ../src\controller\mainController.py:1134
msgid "One mention from %s "
msgstr "%sからの返信"
#: ../src\controller\mainController.py:1205
#: ../src\controller\mainController.py:1214
#: ../src\controller\mainController.py:1223
#: ../src\controller\mainController.py:1232
msgid "One tweet from %s"
msgstr "「%s」からのツイート"
#: ../src\controller\mainController.py:1278
#: ../src\controller\mainController.py:1296
msgid "This list is already opened"
msgstr "既に開かれています"
#: ../src\controller\mainController.py:1337
#: ../src\controller\mainController.py:1355
msgid "The auto-reading of new tweets is enabled for this buffer"
msgstr "自動読み上げ 有効"
#: ../src\controller\mainController.py:1340
#: ../src\controller\mainController.py:1358
msgid "The auto-reading of new tweets is disabled for this buffer"
msgstr "自動読み上げ 無効"
#: ../src\controller\mainController.py:1346
#: ../src\controller\mainController.py:1364
msgid "Session mute on"
msgstr "このセッションのミュートを設定"
#: ../src\controller\mainController.py:1349
#: ../src\controller\mainController.py:1367
msgid "Session mute off"
msgstr "このセッションのミュートを解除"
#: ../src\controller\mainController.py:1356
#: ../src\controller\mainController.py:1374
msgid "Buffer mute on"
msgstr "このバッファのミュートを設定"
#: ../src\controller\mainController.py:1359
#: ../src\controller\mainController.py:1377
msgid "Buffer mute off"
msgstr "このバッファのミュートを解除"
#: ../src\controller\mainController.py:1372
#: ../src\controller\mainController.py:1390
msgid "Copied"
msgstr "コピーしました"
@ -347,16 +348,16 @@ msgstr "画像をアップロード"
#: ../src\controller\settings.py:121 ../src\controller\settings.py:180
#: ../src\wxUI\dialogs\configuration.py:100
msgid "Ask"
msgstr "質問"
msgstr "その都度、質問する"
#: ../src\controller\settings.py:123 ../src\controller\settings.py:182
#: ../src\wxUI\dialogs\configuration.py:100
msgid "Retweet without comments"
msgstr "コメントを付けずにリツイート"
msgstr "コメントを付けずにリツイート公式RT"
#: ../src\controller\settings.py:125 ../src\wxUI\dialogs\configuration.py:100
msgid "Retweet with comments"
msgstr "コメントをつけてリツイート"
msgstr "コメントをつけてリツイート非公式RT"
#: ../src\controller\settings.py:157
msgid "Account settings for %s"
@ -431,21 +432,27 @@ msgid "Attaching..."
msgstr "添付中"
#: ../src\extra\AudioUploader\audioUploader.py:75
#: ../src\extra\AudioUploader\audioUploader.py:80
#: ../src\extra\AudioUploader\audioUploader.py:107
#: ../src\extra\AudioUploader\wx_ui.py:36
msgid "Pause"
msgstr "一時停止"
#: ../src\extra\AudioUploader\audioUploader.py:77
msgid "&Resume"
msgstr "再開(&R)"
#: ../src\extra\AudioUploader\audioUploader.py:78
msgid "Resume"
msgstr "再開"
#: ../src\extra\AudioUploader\audioUploader.py:80
#: ../src\extra\AudioUploader\audioUploader.py:107
#: ../src\extra\AudioUploader\wx_ui.py:36
msgid "&Pause"
msgstr "一時停止(&P)"
#: ../src\extra\AudioUploader\audioUploader.py:95
#: ../src\extra\AudioUploader\audioUploader.py:140
msgid "Stop"
msgstr "停止"
msgid "&Stop"
msgstr "停止(&S)"
#: ../src\extra\AudioUploader\audioUploader.py:96
msgid "Recording"
@ -458,8 +465,8 @@ msgstr "停止"
#: ../src\extra\AudioUploader\audioUploader.py:103
#: ../src\extra\AudioUploader\wx_ui.py:38
msgid "Record"
msgstr "録音"
msgid "&Record"
msgstr "録音(&R)"
#: ../src\extra\AudioUploader\audioUploader.py:136 ../src\sound.py:120
msgid "Playing..."
@ -468,8 +475,8 @@ msgstr "再生中"
#: ../src\extra\AudioUploader\audioUploader.py:144
#: ../src\extra\AudioUploader\audioUploader.py:154
#: ../src\extra\AudioUploader\wx_ui.py:34
msgid "Play"
msgstr "再生"
msgid "&Play"
msgstr "再生(&P)"
#: ../src\extra\AudioUploader\audioUploader.py:159
msgid "Recoding audio..."
@ -481,7 +488,7 @@ msgstr "1日前"
#: ../src\extra\AudioUploader\utils.py:29 ../src\update\utils.py:29
msgid "%d days, "
msgstr "%s日"
msgstr "%s日"
#: ../src\extra\AudioUploader\utils.py:31 ../src\update\utils.py:31
msgid "%d hour, "
@ -489,7 +496,7 @@ msgstr "1時間前"
#: ../src\extra\AudioUploader\utils.py:33 ../src\update\utils.py:33
msgid "%d hours, "
msgstr "%d時間"
msgstr "%d時間"
#: ../src\extra\AudioUploader\utils.py:35 ../src\update\utils.py:35
msgid "%d minute, "
@ -497,7 +504,7 @@ msgstr "1分前"
#: ../src\extra\AudioUploader\utils.py:37 ../src\update\utils.py:37
msgid "%d minutes, "
msgstr "%d分"
msgstr "%d分"
#: ../src\extra\AudioUploader\utils.py:39 ../src\update\utils.py:39
msgid "%s second"
@ -505,7 +512,7 @@ msgstr "1秒前"
#: ../src\extra\AudioUploader\utils.py:41 ../src\update\utils.py:41
msgid "%s seconds"
msgstr "%s秒"
msgstr "%s秒"
#: ../src\extra\AudioUploader\wx_transfer_dialogs.py:13
msgid "File"
@ -533,25 +540,24 @@ msgid "Attach audio"
msgstr "音声を添付"
#: ../src\extra\AudioUploader\wx_ui.py:40
msgid "Add an existing file"
msgstr "既存のファイルを追加"
msgid "&Add an existing file"
msgstr "既存のファイルを追加(&A)"
#: ../src\extra\AudioUploader\wx_ui.py:41
msgid "Discard"
msgstr "拒否"
msgid "&Discard"
msgstr "拒否(&D)"
#: ../src\extra\AudioUploader\wx_ui.py:43
msgid "Upload to"
msgstr "アップロード"
msgstr "アップロード先:"
#: ../src\extra\AudioUploader\wx_ui.py:48
msgid "Attach"
msgstr "添付"
#: ../src\extra\AudioUploader\wx_ui.py:50 ../src\issueReporter\wx_ui.py:74
#: ../src\wxUI\dialogs\find.py:20
msgid "Cancel"
msgstr "キャンセル"
#: ../src\extra\AudioUploader\wx_ui.py:50
msgid "&Cancel"
msgstr "キャンセル(&C)"
#: ../src\extra\AudioUploader\wx_ui.py:75
msgid "Audio Files (*.mp3, *.ogg, *.wav)|*.mp3; *.ogg; *.wav"
@ -1281,6 +1287,10 @@ msgstr ""
msgid "Send report"
msgstr "レポートを送信"
#: ../src\issueReporter\wx_ui.py:74 ../src\wxUI\dialogs\find.py:20
msgid "Cancel"
msgstr "キャンセル"
#: ../src\issueReporter\wx_ui.py:83
msgid "You must fill out both fields"
msgstr "あなたは、両方のフィールドに記入しなければなりません"
@ -1573,15 +1583,15 @@ msgstr "無効なキーストローク"
msgid "You must provide a character for the keystroke"
msgstr "キー名が入力されていません"
#: ../src\languageHandler.py:95
#: ../src\languageHandler.py:96
msgid "User default"
msgstr "ユーザーのデフォルト"
#: ../src\sessionmanager\session.py:186
#: ../src\sessionmanager\session.py:188
msgid "%s failed. Reason: %s"
msgstr "%sに失敗。理由%s"
#: ../src\sessionmanager\session.py:192
#: ../src\sessionmanager\session.py:194
msgid "%s succeeded."
msgstr "%sに成功しました。"
@ -1649,20 +1659,24 @@ msgstr "本当にこのアカウントを削除しますか?"
msgid "Stopped."
msgstr "停止"
#: ../src\twitter\compose.py:41 ../src\twitter\compose.py:74
#: ../src\twitter\compose.py:83
#: ../src\twitter\compose.py:41 ../src\twitter\compose.py:96
#: ../src\twitter\compose.py:105
msgid "dddd, MMMM D, YYYY H:m:s"
msgstr "yyyy, MMMM D, dddd, H:m:s"
msgstr "YYYY年MMMMD日(dddd) H時m分s秒"
#: ../src\twitter\compose.py:47
msgid "Dm to %s "
msgstr "「%s」へのDM"
#: ../src\twitter\compose.py:85 ../src\twitter\compose.py:87
#: ../src\twitter\compose.py:86
msgid "{0}. Quoted tweet from @{1}: {2}"
msgstr "{0} 引用:@{1}:{2}"
#: ../src\twitter\compose.py:107 ../src\twitter\compose.py:109
msgid "Unavailable"
msgstr "無効"
#: ../src\twitter\compose.py:88
#: ../src\twitter\compose.py:110
msgid ""
"%s (@%s). %s followers, %s friends, %s tweets. Last tweeted %s. Joined "
"Twitter %s"
@ -1670,111 +1684,111 @@ msgstr ""
"%s@%s フォロワー:%s, フォロー:%s ツイート数:%s 最後のツイート:%s ツイッター"
"への参加:%s"
#: ../src\twitter\compose.py:92
#: ../src\twitter\compose.py:114
msgid "You've blocked %s"
msgstr "「%s」をブロックしました。"
#: ../src\twitter\compose.py:94
#: ../src\twitter\compose.py:116
msgid "You've unblocked %s"
msgstr "「%s」のブロックを解除しました"
#: ../src\twitter\compose.py:97
#: ../src\twitter\compose.py:119
msgid "%s(@%s) has followed you"
msgstr "「%s:@%s」がフォローしました"
#: ../src\twitter\compose.py:99
#: ../src\twitter\compose.py:121
msgid "You've followed %s(@%s)"
msgstr "「%s:@%s」をフォローしました"
#: ../src\twitter\compose.py:101
#: ../src\twitter\compose.py:123
msgid "You've unfollowed %s (@%s)"
msgstr "「%s:@%s」のフォローを解除しました"
#: ../src\twitter\compose.py:104
#: ../src\twitter\compose.py:126
msgid "You've added to favourites: %s, %s"
msgstr "「%s %s」をお気に入りに追加しました"
#: ../src\twitter\compose.py:106
#: ../src\twitter\compose.py:128
msgid "%s(@%s) has marked as favourite: %s"
msgstr "「%s:@%s」が「%s」をお気に入りに登録しました"
#: ../src\twitter\compose.py:108
#: ../src\twitter\compose.py:130
msgid "You've removed from favourites: %s, %s"
msgstr "「%s %s」をお気に入りから削除しました"
#: ../src\twitter\compose.py:109
#: ../src\twitter\compose.py:131
msgid "%s(@%s) has removed from favourites: %s"
msgstr "「%s:@%s」が「%s」のお気に入りを解除しました"
#: ../src\twitter\compose.py:111
#: ../src\twitter\compose.py:133
msgid "You've created the list %s"
msgstr "リスト「%s」を作成しました"
#: ../src\twitter\compose.py:113
#: ../src\twitter\compose.py:135
msgid "You've deleted the list %s"
msgstr "リスト「%s」を削除しました"
#: ../src\twitter\compose.py:115
#: ../src\twitter\compose.py:137
msgid "You've updated the list %s"
msgstr "リスト「%s」をアップデートしました"
#: ../src\twitter\compose.py:117
#: ../src\twitter\compose.py:139
msgid "You've added %s(@%s) to the list %s"
msgstr "リスト「%s」に「%s:@%s」を追加しました"
#: ../src\twitter\compose.py:118
#: ../src\twitter\compose.py:140
msgid "%s(@%s) has added you to the list %s"
msgstr "「%s:@%s」がリスト「%s」にあなたを追加しました"
#: ../src\twitter\compose.py:120
#: ../src\twitter\compose.py:142
msgid "You'be removed %s(@%s) from the list %s"
msgstr "「%s:@%s」をリスト「%s」から削除しました"
#: ../src\twitter\compose.py:121
#: ../src\twitter\compose.py:143
msgid "%s(@%s) has removed you from the list %s"
msgstr "「%s:@%s」がリスト「%s」からあなたを削除しました"
#: ../src\twitter\compose.py:123
#: ../src\twitter\compose.py:145
msgid "You've subscribed to the list %s, which is owned by %s(@%s)"
msgstr "「%s:@%s」によって所有されているリスト「%s」に加入しました"
#: ../src\twitter\compose.py:124
#: ../src\twitter\compose.py:146
msgid "%s(@%s) has suscribed you to the list %s"
msgstr "「%s:@%s」があなたのリスト「%s」を購読しました"
#: ../src\twitter\compose.py:126
#: ../src\twitter\compose.py:148
msgid "You've unsubscribed from the list %s, which is owned by %s(@%s)"
msgstr "「%s:@%s」によって所有されているリスト「%s」から退会しました"
#: ../src\twitter\compose.py:127
#: ../src\twitter\compose.py:149
msgid "You've been unsubscribed from the list %s, which is owned by %s(@%s)"
msgstr "「%s:@%s」によって所有されているリスト「%s」から退会してきました"
#: ../src\twitter\compose.py:129
#: ../src\twitter\compose.py:151
msgid "You have retweeted a retweet from %s(@%s): %s"
msgstr "「%s:@%s」がリツイートした「%s」をリツイートしました"
#: ../src\twitter\compose.py:130
#: ../src\twitter\compose.py:152
msgid "%s(@%s) has retweeted your retweet: %s"
msgstr "「%s:@%s」がリツイート「%s」をリツイートしました"
#: ../src\twitter\compose.py:132
#: ../src\twitter\compose.py:154
msgid "@{0} quoted your tweet: {1}"
msgstr "@{0} 引用付きツイート: {1}"
#: ../src\twitter\compose.py:134
#: ../src\twitter\compose.py:156
msgid "Unknown"
msgstr "不明"
#: ../src\twitter\compose.py:140
#: ../src\twitter\compose.py:162
msgid "No description available"
msgstr "説明はありません"
#: ../src\twitter\compose.py:144
#: ../src\twitter\compose.py:166
msgid "private"
msgstr "プライベート"
#: ../src\twitter\compose.py:145
#: ../src\twitter\compose.py:167
msgid "public"
msgstr "公式"
@ -1884,13 +1898,17 @@ msgstr "トレンドのトピック"
msgid "Tweet about this trend"
msgstr "このトレンドのツイート"
#: ../src\wxUI\buffers\trends.py:19 ../src\wxUI\menus.py:90
msgid "Search topic"
msgstr "トピックを検索"
#: ../src\wxUI\commonMessageDialogs.py:6
msgid ""
"This retweet is over 140 characters. Would you like to post it as a mention "
"to the poster with your comments and a link to the original tweet?"
msgstr ""
"このリツイートは、140文字を超えています。投稿者への炎暑ンとコメントおよび"
"元のツイートへのリンクで登校しますか?"
"このリツイートは、140文字を超えています。投稿者へのリプライとコメント、お"
"よび元のツイートへのリンクで登校しますか?"
#: ../src\wxUI\commonMessageDialogs.py:9
msgid "Would you like to add a comment to this tweet?"
@ -2576,7 +2594,7 @@ msgid "&Show tweet"
msgstr "ツイートを表示(&S)"
#: ../src\wxUI\menus.py:21 ../src\wxUI\menus.py:39 ../src\wxUI\menus.py:55
#: ../src\wxUI\menus.py:65 ../src\wxUI\menus.py:82 ../src\wxUI\menus.py:94
#: ../src\wxUI\menus.py:65 ../src\wxUI\menus.py:82 ../src\wxUI\menus.py:96
msgid "&Copy to clipboard"
msgstr "クリップボードにコピー(&C)"
@ -2605,7 +2623,7 @@ msgstr "ダイレクトメッセージ(&M)"
msgid "&View lists"
msgstr "リストを見る(&V)"
#: ../src\wxUI\menus.py:78 ../src\wxUI\view.py:46
#: ../src\wxUI\menus.py:78 ../src\wxUI\view.py:45
msgid "Show user &profile"
msgstr "ユーザーのプロファイルを表示(&P)"
@ -2613,11 +2631,11 @@ msgstr "ユーザーのプロファイルを表示(&P)"
msgid "&Show user"
msgstr "ユーザーを表示(&S)"
#: ../src\wxUI\menus.py:90
#: ../src\wxUI\menus.py:92
msgid "&Tweet about this trend"
msgstr "このトレンドのツイート(&T)"
#: ../src\wxUI\menus.py:92
#: ../src\wxUI\menus.py:94
msgid "&Show item"
msgstr "アイテムを表示(&S)"
@ -2637,7 +2655,7 @@ msgstr "プロファイルを更新(&P)"
msgid "&Show / hide"
msgstr "表示または非表示(&S)"
#: ../src\wxUI\sysTrayIcon.py:38 ../src\wxUI\view.py:62
#: ../src\wxUI\sysTrayIcon.py:38 ../src\wxUI\view.py:61
msgid "&Documentation"
msgstr "取扱説明書(&D)"
@ -2677,7 +2695,7 @@ msgstr "キーストロークを編集(&E)"
msgid "E&xit"
msgstr "終了(&X)"
#: ../src\wxUI\view.py:27 ../src\wxUI\view.py:73
#: ../src\wxUI\view.py:27 ../src\wxUI\view.py:72
msgid "&Tweet"
msgstr "ツイート(&T)"
@ -2709,86 +2727,101 @@ msgstr "リストに追加(&A)"
msgid "R&emove from list"
msgstr "リストから削除(&E)"
#: ../src\wxUI\view.py:47
#: ../src\wxUI\view.py:46
msgid "V&iew favourites"
msgstr "お気に入りを表示(&I)"
#: ../src\wxUI\view.py:51
#: ../src\wxUI\view.py:50
msgid "New &trending topics buffer..."
msgstr "新しいトレンドのトピックのバッファ(&T)"
#: ../src\wxUI\view.py:52
#: ../src\wxUI\view.py:51
msgid "Find a string in the currently focused buffer..."
msgstr "現在フォーカス中のバッファ内の文字列を検索"
#: ../src\wxUI\view.py:53
#: ../src\wxUI\view.py:52
msgid "&Load previous items"
msgstr "以前のアイテムを取得(&L)"
#: ../src\wxUI\view.py:55
#: ../src\wxUI\view.py:54
msgid "&Mute"
msgstr "ミュート(&M)"
#: ../src\wxUI\view.py:56
#: ../src\wxUI\view.py:55
msgid "&Autoread"
msgstr "自動読み上げ(&A)"
#: ../src\wxUI\view.py:57
#: ../src\wxUI\view.py:56
msgid "&Clear buffer"
msgstr "バッファをクリア(&C)"
#: ../src\wxUI\view.py:58
#: ../src\wxUI\view.py:57
msgid "&Destroy"
msgstr "バッファを削除(&D)"
#: ../src\wxUI\view.py:63
#: ../src\wxUI\view.py:62
msgid "Sounds &tutorial"
msgstr "サウンドの確認(&T)"
#: ../src\wxUI\view.py:64
#: ../src\wxUI\view.py:63
msgid "&What's new in this version?"
msgstr "更新履歴(&W)"
#: ../src\wxUI\view.py:66
#: ../src\wxUI\view.py:65
msgid "&Check for updates"
msgstr "アップデートを確認(&C)"
#: ../src\wxUI\view.py:67
#: ../src\wxUI\view.py:66
msgid "&Report an error"
msgstr "エラーを報告(&R)"
#: ../src\wxUI\view.py:68
#: ../src\wxUI\view.py:67
msgid "{0}'s &website"
msgstr "{0}のウェブサイト(&W)"
#: ../src\wxUI\view.py:69
#: ../src\wxUI\view.py:68
msgid "About &{0}"
msgstr "{0}について(&A)"
#: ../src\wxUI\view.py:72
#: ../src\wxUI\view.py:71
msgid "&Application"
msgstr "アプリケーション(&A)"
#: ../src\wxUI\view.py:74
#: ../src\wxUI\view.py:73
msgid "&User"
msgstr "ユーザー(&U)"
#: ../src\wxUI\view.py:75
#: ../src\wxUI\view.py:74
msgid "&Buffer"
msgstr "バッファ(&B)"
#: ../src\wxUI\view.py:76
#: ../src\wxUI\view.py:75
msgid "&Help"
msgstr "ヘルプ(&H)"
#: ../src\wxUI\view.py:159
#: ../src\wxUI\view.py:158
msgid "Address"
msgstr "アドレス"
#: ../src\wxUI\view.py:182
#: ../src\wxUI\view.py:181
msgid "Update"
msgstr "アップデート"
#: ../src\wxUI\view.py:182
#: ../src\wxUI\view.py:181
msgid "Your {0} version is up to date"
msgstr "{0}のバージョンは最新です"
#~ msgid "Stop"
#~ msgstr "停止"
#~ msgid "Record"
#~ msgstr "録音"
#~ msgid "Play"
#~ msgstr "再生"
#~ msgid "Add an existing file"
#~ msgstr "既存のファイルを追加"
#~ msgid "Discard"
#~ msgstr "拒否"

View File

@ -16,9 +16,11 @@ class trendsPanel(wx.Panel):
self.create_list()
self.tweet = wx.Button(self, -1, _(u"Tweet"))
self.tweetTrendBtn = wx.Button(self, -1, _(u"Tweet about this trend"))
self.search_topic = wx.Button(self, -1, _(u"Search topic"))
btnSizer = wx.BoxSizer(wx.HORIZONTAL)
btnSizer.Add(self.tweet, 0, wx.ALL, 5)
btnSizer.Add(self.tweetTrendBtn, 0, wx.ALL, 5)
btnSizer.Add(self.search_topic, 0, wx.ALL, 5)
self.sizer.Add(btnSizer, 0, wx.ALL, 5)
self.sizer.Add(self.list.list, 0, wx.ALL, 5)
self.SetSizer(self.sizer)

View File

@ -87,6 +87,8 @@ class peoplePanelMenu(wx.Menu):
class trendsPanelMenu(wx.Menu):
def __init__(self):
super(trendsPanelMenu, self).__init__()
self.search_topic = wx.MenuItem(self, wx.NewId(), _(u"Search topic"))
self.AppendItem(self.search_topic)
self.tweetThisTrend = wx.MenuItem(self, wx.NewId(), _(u"&Tweet about this trend"))
self.AppendItem(self.tweetThisTrend)
self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show item"))

View File

@ -42,7 +42,6 @@ class mainFrame(wx.Frame):
self.addToList = user.Append(wx.NewId(), _(u"&Add to list"))
self.removeFromList = user.Append(wx.NewId(), _(u"R&emove from list"))
self.viewLists = user.Append(wx.NewId(), _(u"&View lists"))
self.viewLists.Enable(False)
self.details = user.Append(wx.NewId(), _(u"Show user &profile"))
self.favs = user.Append(wx.NewId(), _(u"V&iew favourites"))