From 3546ff7909d1219e9cfaad4f4ac8439fdd088061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Fri, 12 Jun 2015 13:12:17 -0500 Subject: [PATCH 1/6] Enabled the add to list option in the menu bar --- src/wxUI/view.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wxUI/view.py b/src/wxUI/view.py index 9812c793..058e3e5c 100644 --- a/src/wxUI/view.py +++ b/src/wxUI/view.py @@ -40,7 +40,6 @@ class mainFrame(wx.Frame): self.timeline = user.Append(wx.NewId(), _(u"&View timeline...")) self.dm = user.Append(wx.NewId(), _(u"Direct me&ssage")) self.addToList = user.Append(wx.NewId(), _(u"&Add to list")) - self.addToList.Enable(False) self.removeFromList = user.Append(wx.NewId(), _(u"R&emove from list")) self.removeFromList.Enable(False) self.viewLists = user.Append(wx.NewId(), _(u"&View lists")) From 2279e146233ff883a5539c7665da40220faf0b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Sat, 13 Jun 2015 07:33:48 -0500 Subject: [PATCH 2/6] Updated translations --- tools/twblue.pot | 238 +++++++++++++++++++++++++---------------------- 1 file changed, 127 insertions(+), 111 deletions(-) diff --git a/tools/twblue.pot b/tools/twblue.pot index 3da3a64d..05d0cd62 100644 --- a/tools/twblue.pot +++ b/tools/twblue.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-06-08 05:49+Hora de verano central (México)\n" +"POT-Creation-Date: 2015-06-12 17:49+Hora de verano central (México)\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,10 +19,6 @@ msgstr "" msgid "Opening media..." msgstr "" -#: ../src\controller\buffersController.py:104 -msgid "Not actionable." -msgstr "" - #: ../src\controller\buffersController.py:111 msgid "This action is not supported for this buffer" msgstr "" @@ -40,61 +36,61 @@ msgstr "" msgid "Write the tweet here" msgstr "" -#: ../src\controller\buffersController.py:305 -#: ../src\controller\buffersController.py:659 +#: ../src\controller\buffersController.py:313 +#: ../src\controller\buffersController.py:676 msgid "%s items retrieved" msgstr "" -#: ../src\controller\buffersController.py:325 +#: ../src\controller\buffersController.py:333 msgid "This buffer is not a timeline; it can't be deleted." msgstr "" -#: ../src\controller\buffersController.py:386 +#: ../src\controller\buffersController.py:394 msgid "Reply to %s" msgstr "" -#: ../src\controller\buffersController.py:386 ../src\gtkUI\buffers\base.py:17 +#: ../src\controller\buffersController.py:394 ../src\gtkUI\buffers\base.py:17 #: ../src\keystrokeEditor\constants.py:11 ../src\wxUI\buffers\base.py:26 msgid "Reply" msgstr "" -#: ../src\controller\buffersController.py:406 +#: ../src\controller\buffersController.py:414 msgid "Direct message to %s" msgstr "" -#: ../src\controller\buffersController.py:406 +#: ../src\controller\buffersController.py:414 #: ../src\controller\mainController.py:1056 msgid "New direct message" msgstr "" -#: ../src\controller\buffersController.py:427 +#: ../src\controller\buffersController.py:435 msgid "Add your comment to the tweet" msgstr "" -#: ../src\controller\buffersController.py:427 ../src\gtkUI\buffers\base.py:16 +#: ../src\controller\buffersController.py:435 ../src\gtkUI\buffers\base.py:16 #: ../src\gtkUI\commonMessageDialogs.py:12 #: ../src\keystrokeEditor\constants.py:12 ../src\wxUI\buffers\base.py:25 #: ../src\wxUI\commonMessageDialogs.py:8 ../src\wxUI\dialogs\message.py:129 msgid "Retweet" msgstr "" -#: ../src\controller\buffersController.py:499 +#: ../src\controller\buffersController.py:507 msgid "Opening URL..." msgstr "" -#: ../src\controller\buffersController.py:534 +#: ../src\controller\buffersController.py:542 msgid "User details" msgstr "" -#: ../src\controller\buffersController.py:574 +#: ../src\controller\buffersController.py:591 msgid "Empty" msgstr "" -#: ../src\controller\buffersController.py:618 +#: ../src\controller\buffersController.py:635 msgid "Mention to %s" msgstr "" -#: ../src\controller\buffersController.py:618 +#: ../src\controller\buffersController.py:635 #: ../src\gtkUI\buffers\people.py:15 ../src\wxUI\buffers\people.py:15 msgid "Mention" msgstr "" @@ -317,16 +313,16 @@ msgid "Upload a picture" msgstr "" #: ../src\controller\settings.py:114 ../src\controller\settings.py:173 -#: ../src\wxUI\dialogs\configuration.py:97 +#: ../src\wxUI\dialogs\configuration.py:98 msgid "Ask" msgstr "" #: ../src\controller\settings.py:116 ../src\controller\settings.py:175 -#: ../src\wxUI\dialogs\configuration.py:97 +#: ../src\wxUI\dialogs\configuration.py:98 msgid "Retweet without comments" msgstr "" -#: ../src\controller\settings.py:118 ../src\wxUI\dialogs\configuration.py:97 +#: ../src\controller\settings.py:118 ../src\wxUI\dialogs\configuration.py:98 msgid "Retweet with comments" msgstr "" @@ -335,7 +331,7 @@ msgid "Account settings for %s" msgstr "" #: ../src\controller\settings.py:241 ../src\gtkUI\dialogs\configuration.py:153 -#: ../src\wxUI\dialogs\configuration.py:290 +#: ../src\wxUI\dialogs\configuration.py:291 msgid "Link your Dropbox account" msgstr "" @@ -739,27 +735,27 @@ msgstr "" #: ../src\gtkUI\commonMessageDialogs.py:58 #: ../src\gtkUI\dialogs\configuration.py:165 #: ../src\wxUI\commonMessageDialogs.py:43 -#: ../src\wxUI\dialogs\configuration.py:302 +#: ../src\wxUI\dialogs\configuration.py:303 msgid "Error!" msgstr "" -#: ../src\extra\autocompletionUsers\wx_settings.py:7 +#: ../src\extra\autocompletionUsers\wx_settings.py:8 msgid "Autocomplete users\342\200\231 settings" msgstr "" -#: ../src\extra\autocompletionUsers\wx_settings.py:10 +#: ../src\extra\autocompletionUsers\wx_settings.py:11 msgid "Add users from followers buffer" msgstr "" -#: ../src\extra\autocompletionUsers\wx_settings.py:11 +#: ../src\extra\autocompletionUsers\wx_settings.py:12 msgid "Add users from friends buffer" msgstr "" -#: ../src\extra\autocompletionUsers\wx_settings.py:14 +#: ../src\extra\autocompletionUsers\wx_settings.py:15 msgid "Manage database..." msgstr "" -#: ../src\extra\autocompletionUsers\wx_settings.py:26 +#: ../src\extra\autocompletionUsers\wx_settings.py:27 msgid "Done" msgstr "" @@ -1299,22 +1295,22 @@ msgid "This is a protected user account, you need follow to this user for viewin msgstr "" #: ../src\gtkUI\dialogs\configuration.py:10 -#: ../src\wxUI\dialogs\configuration.py:13 +#: ../src\wxUI\dialogs\configuration.py:14 msgid "Language" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:19 -#: ../src\wxUI\dialogs\configuration.py:26 +#: ../src\wxUI\dialogs\configuration.py:27 msgid "Use invisible interface's keyboard shortcuts while GUI is visible" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:21 -#: ../src\wxUI\dialogs\configuration.py:28 +#: ../src\wxUI\dialogs\configuration.py:29 msgid "Activate Sapi5 when any other screen reader is not being run" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:23 -#: ../src\wxUI\dialogs\configuration.py:30 +#: ../src\wxUI\dialogs\configuration.py:31 msgid "Hide GUI on launch" msgstr "" @@ -1331,7 +1327,7 @@ msgid "API calls when the stream is started (One API call equals to 200 tweetts, msgstr "" #: ../src\gtkUI\dialogs\configuration.py:43 -#: ../src\wxUI\dialogs\configuration.py:88 +#: ../src\wxUI\dialogs\configuration.py:89 msgid "Items on each API call" msgstr "" @@ -1341,43 +1337,43 @@ msgstr "" #: ../src\gtkUI\dialogs\configuration.py:63 #: ../src\gtkUI\dialogs\configuration.py:198 -#: ../src\wxUI\dialogs\configuration.py:200 -#: ../src\wxUI\dialogs\configuration.py:339 +#: ../src\wxUI\dialogs\configuration.py:201 +#: ../src\wxUI\dialogs\configuration.py:340 msgid "Ignored clients" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:69 -#: ../src\wxUI\dialogs\configuration.py:206 +#: ../src\wxUI\dialogs\configuration.py:207 msgid "Add client" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:70 -#: ../src\wxUI\dialogs\configuration.py:207 +#: ../src\wxUI\dialogs\configuration.py:208 msgid "Remove client" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:94 -#: ../src\wxUI\dialogs\configuration.py:231 +#: ../src\wxUI\dialogs\configuration.py:232 msgid "Volume" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:102 -#: ../src\wxUI\dialogs\configuration.py:239 +#: ../src\wxUI\dialogs\configuration.py:240 msgid "Session mute" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:104 -#: ../src\wxUI\dialogs\configuration.py:241 +#: ../src\wxUI\dialogs\configuration.py:242 msgid "Output device" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:111 -#: ../src\wxUI\dialogs\configuration.py:248 +#: ../src\wxUI\dialogs\configuration.py:249 msgid "Input device" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:119 -#: ../src\wxUI\dialogs\configuration.py:256 +#: ../src\wxUI\dialogs\configuration.py:257 msgid "Sound pack" msgstr "" @@ -1386,27 +1382,27 @@ msgid "If you've got a SndUp account, enter your API Key here. Whether the API K msgstr "" #: ../src\gtkUI\dialogs\configuration.py:151 -#: ../src\wxUI\dialogs\configuration.py:288 +#: ../src\wxUI\dialogs\configuration.py:289 msgid "Unlink your Dropbox account" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:156 ../src\sessionmanager\wxUI.py:47 -#: ../src\wxUI\dialogs\configuration.py:293 +#: ../src\wxUI\dialogs\configuration.py:294 msgid "Authorization" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:156 -#: ../src\wxUI\dialogs\configuration.py:293 +#: ../src\wxUI\dialogs\configuration.py:294 msgid "The authorization request will be opened in your browser. Copy the code from Dropbox and paste it into the text box which will appear. You only need to do this once." msgstr "" #: ../src\gtkUI\dialogs\configuration.py:159 -#: ../src\wxUI\dialogs\configuration.py:296 +#: ../src\wxUI\dialogs\configuration.py:297 msgid "Enter the code here." msgstr "" #: ../src\gtkUI\dialogs\configuration.py:159 -#: ../src\wxUI\dialogs\configuration.py:296 +#: ../src\wxUI\dialogs\configuration.py:297 msgid "Verification code" msgstr "" @@ -1421,8 +1417,8 @@ msgstr "" #: ../src\gtkUI\dialogs\configuration.py:184 #: ../src\gtkUI\dialogs\configuration.py:189 #: ../src\issueReporter\issueReporter.py:30 -#: ../src\wxUI\dialogs\configuration.py:321 -#: ../src\wxUI\dialogs\configuration.py:330 +#: ../src\wxUI\dialogs\configuration.py:322 +#: ../src\wxUI\dialogs\configuration.py:331 msgid "General" msgstr "" @@ -1431,17 +1427,17 @@ msgid "Show other buffers" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:202 -#: ../src\wxUI\dialogs\configuration.py:343 +#: ../src\wxUI\dialogs\configuration.py:344 msgid "Sound" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:205 -#: ../src\wxUI\dialogs\configuration.py:346 +#: ../src\wxUI\dialogs\configuration.py:347 msgid "Audio Services" msgstr "" #: ../src\gtkUI\dialogs\configuration.py:210 -#: ../src\wxUI\dialogs\configuration.py:351 +#: ../src\wxUI\dialogs\configuration.py:352 msgid "Save" msgstr "" @@ -1450,7 +1446,7 @@ msgstr "" #: ../src\gtkUI\dialogs\update_profile.py:35 #: ../src\gtkUI\dialogs\userActions.py:40 #: ../src\gtkUI\dialogs\userSelection.py:28 ../src\gtkUI\dialogs\utils.py:35 -#: ../src\keystrokeEditor\wx_ui.py:21 ../src\wxUI\dialogs\configuration.py:353 +#: ../src\keystrokeEditor\wx_ui.py:21 ../src\wxUI\dialogs\configuration.py:354 #: ../src\wxUI\dialogs\message.py:87 ../src\wxUI\dialogs\message.py:147 #: ../src\wxUI\dialogs\message.py:207 ../src\wxUI\dialogs\message.py:283 #: ../src\wxUI\dialogs\message.py:338 ../src\wxUI\dialogs\search.py:26 @@ -1805,7 +1801,7 @@ msgid "&Show / hide" msgstr "" #: ../src\gtkUI\sysTrayIcon.py:38 ../src\wxUI\sysTrayIcon.py:38 -#: ../src\wxUI\view.py:63 +#: ../src\wxUI\view.py:62 msgid "&Documentation" msgstr "" @@ -1821,11 +1817,11 @@ msgstr "" msgid "Manage accounts" msgstr "" -#: ../src\gtkUI\view.py:183 ../src\wxUI\view.py:159 +#: ../src\gtkUI\view.py:183 ../src\wxUI\view.py:158 msgid "Address" msgstr "" -#: ../src\gtkUI\view.py:206 ../src\wxUI\view.py:182 +#: ../src\gtkUI\view.py:206 ../src\wxUI\view.py:181 msgid "Update" msgstr "" @@ -2006,7 +2002,7 @@ msgid "Interact with the currently focused tweet." msgstr "" #: ../src\keystrokeEditor\constants.py:23 -msgid "Perform secondary interact action (open URL in browser if Codeofdusk's intelegent audio tweet handlers enabled, play audio if disabled." +msgid "Open URL" msgstr "" #: ../src\keystrokeEditor\constants.py:24 @@ -2318,6 +2314,14 @@ msgstr "" msgid "public" msgstr "" +#: ../src\twitter\utils.py:124 +msgid "Sorry, you are not authorised to see this status." +msgstr "" + +#: ../src\twitter\utils.py:126 +msgid "No status found with that ID" +msgstr "" + #: ../src\update\wxUpdater.py:9 msgid "New version for %s" msgstr "" @@ -2356,111 +2360,123 @@ msgstr "" msgid "Do you really want to close {0}?" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:33 +#: ../src\wxUI\dialogs\configuration.py:21 +msgid "ask before exiting {0}" +msgstr "" + +#: ../src\wxUI\dialogs\configuration.py:23 +msgid "Play a sound when {0} launches" +msgstr "" + +#: ../src\wxUI\dialogs\configuration.py:25 +msgid "Speak a message when {0} launches" +msgstr "" + +#: ../src\wxUI\dialogs\configuration.py:34 msgid "Keymap" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:46 +#: ../src\wxUI\dialogs\configuration.py:47 msgid "Proxy server: " msgstr "" -#: ../src\wxUI\dialogs\configuration.py:52 +#: ../src\wxUI\dialogs\configuration.py:53 msgid "Port: " msgstr "" -#: ../src\wxUI\dialogs\configuration.py:58 +#: ../src\wxUI\dialogs\configuration.py:59 msgid "User: " msgstr "" -#: ../src\wxUI\dialogs\configuration.py:64 +#: ../src\wxUI\dialogs\configuration.py:65 msgid "Password: " msgstr "" -#: ../src\wxUI\dialogs\configuration.py:76 +#: ../src\wxUI\dialogs\configuration.py:77 msgid "Autocompletion settings..." msgstr "" -#: ../src\wxUI\dialogs\configuration.py:78 +#: ../src\wxUI\dialogs\configuration.py:79 msgid "Relative timestamps" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:81 +#: ../src\wxUI\dialogs\configuration.py:82 msgid "API calls (One API call = 200 tweets, two API calls = 400 tweets, etc):" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:94 +#: ../src\wxUI\dialogs\configuration.py:95 msgid "Inverted buffers: The newest tweets will be shown at the beginning while the oldest at the end" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:96 +#: ../src\wxUI\dialogs\configuration.py:97 msgid "Retweet mode" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:102 +#: ../src\wxUI\dialogs\configuration.py:103 msgid "Number of items per buffer to cache in database (0 to disable caching, blank for unlimited)" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:112 +#: ../src\wxUI\dialogs\configuration.py:113 msgid "Buffer" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:112 +#: ../src\wxUI\dialogs\configuration.py:113 msgid "Status" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:115 +#: ../src\wxUI\dialogs\configuration.py:116 msgid "Show/hide" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:116 +#: ../src\wxUI\dialogs\configuration.py:117 msgid "Move up" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:117 +#: ../src\wxUI\dialogs\configuration.py:118 msgid "Move down" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:127 -#: ../src\wxUI\dialogs\configuration.py:184 -#: ../src\wxUI\dialogs\configuration.py:187 -#: ../src\wxUI\dialogs\configuration.py:192 +#: ../src\wxUI\dialogs\configuration.py:128 +#: ../src\wxUI\dialogs\configuration.py:185 +#: ../src\wxUI\dialogs\configuration.py:188 +#: ../src\wxUI\dialogs\configuration.py:193 msgid "Show" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:129 -#: ../src\wxUI\dialogs\configuration.py:139 -#: ../src\wxUI\dialogs\configuration.py:159 -#: ../src\wxUI\dialogs\configuration.py:185 +#: ../src\wxUI\dialogs\configuration.py:130 +#: ../src\wxUI\dialogs\configuration.py:140 +#: ../src\wxUI\dialogs\configuration.py:160 +#: ../src\wxUI\dialogs\configuration.py:186 msgid "Hide" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:137 -#: ../src\wxUI\dialogs\configuration.py:157 +#: ../src\wxUI\dialogs\configuration.py:138 +#: ../src\wxUI\dialogs\configuration.py:158 msgid "Select a buffer first." msgstr "" -#: ../src\wxUI\dialogs\configuration.py:140 -#: ../src\wxUI\dialogs\configuration.py:160 +#: ../src\wxUI\dialogs\configuration.py:141 +#: ../src\wxUI\dialogs\configuration.py:161 msgid "The buffer is hidden, show it first." msgstr "" -#: ../src\wxUI\dialogs\configuration.py:143 +#: ../src\wxUI\dialogs\configuration.py:144 msgid "The buffer is already at the top of the list." msgstr "" -#: ../src\wxUI\dialogs\configuration.py:163 +#: ../src\wxUI\dialogs\configuration.py:164 msgid "The buffer is already at the bottom of the list." msgstr "" -#: ../src\wxUI\dialogs\configuration.py:302 +#: ../src\wxUI\dialogs\configuration.py:303 msgid "Error during authorization. Try again later." msgstr "" -#: ../src\wxUI\dialogs\configuration.py:326 +#: ../src\wxUI\dialogs\configuration.py:327 msgid "Proxy" msgstr "" -#: ../src\wxUI\dialogs\configuration.py:335 +#: ../src\wxUI\dialogs\configuration.py:336 msgid "Buffers" msgstr "" @@ -2505,7 +2521,7 @@ msgstr "" msgid "E&xit" msgstr "" -#: ../src\wxUI\view.py:27 ../src\wxUI\view.py:75 +#: ../src\wxUI\view.py:27 ../src\wxUI\view.py:74 msgid "&Tweet" msgstr "" @@ -2557,79 +2573,79 @@ msgstr "" msgid "&Add to list" msgstr "" -#: ../src\wxUI\view.py:44 +#: ../src\wxUI\view.py:43 msgid "R&emove from list" msgstr "" -#: ../src\wxUI\view.py:46 +#: ../src\wxUI\view.py:45 msgid "&View lists" msgstr "" -#: ../src\wxUI\view.py:48 +#: ../src\wxUI\view.py:47 msgid "Show user &profile" msgstr "" -#: ../src\wxUI\view.py:49 +#: ../src\wxUI\view.py:48 msgid "V&iew favourites" msgstr "" -#: ../src\wxUI\view.py:53 +#: ../src\wxUI\view.py:52 msgid "New &trending topics buffer..." msgstr "" -#: ../src\wxUI\view.py:54 +#: ../src\wxUI\view.py:53 msgid "&Load previous items" msgstr "" -#: ../src\wxUI\view.py:56 +#: ../src\wxUI\view.py:55 msgid "&Mute" msgstr "" -#: ../src\wxUI\view.py:57 +#: ../src\wxUI\view.py:56 msgid "&Autoread" msgstr "" -#: ../src\wxUI\view.py:58 +#: ../src\wxUI\view.py:57 msgid "&Clear buffer" msgstr "" -#: ../src\wxUI\view.py:59 +#: ../src\wxUI\view.py:58 msgid "&Destroy" msgstr "" -#: ../src\wxUI\view.py:65 +#: ../src\wxUI\view.py:64 msgid "Sounds &tutorial" msgstr "" -#: ../src\wxUI\view.py:66 +#: ../src\wxUI\view.py:65 msgid "&What's new in this version?" msgstr "" -#: ../src\wxUI\view.py:68 +#: ../src\wxUI\view.py:67 msgid "&Check for updates" msgstr "" -#: ../src\wxUI\view.py:69 +#: ../src\wxUI\view.py:68 msgid "&Report an error" msgstr "" -#: ../src\wxUI\view.py:74 +#: ../src\wxUI\view.py:73 msgid "&Application" msgstr "" -#: ../src\wxUI\view.py:76 +#: ../src\wxUI\view.py:75 msgid "&User" msgstr "" -#: ../src\wxUI\view.py:77 +#: ../src\wxUI\view.py:76 msgid "&Buffer" msgstr "" -#: ../src\wxUI\view.py:78 +#: ../src\wxUI\view.py:77 msgid "&Help" msgstr "" -#: ../src\wxUI\view.py:182 +#: ../src\wxUI\view.py:181 msgid "Your {0} version is up to date" msgstr "" From f71506adf85aa4c2f51ce34f3c8f3b944858f2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Sat, 13 Jun 2015 07:35:04 -0500 Subject: [PATCH 3/6] Added 403 and 404 error handling for viewing tweets --- src/controller/buffersController.py | 12 ++++++++++-- src/twitter/utils.py | 7 +++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index 4d660219..72965887 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -249,14 +249,22 @@ class baseBufferController(bufferController): uri = None if tweet.has_key("long_uri"): uri = tweet["long_uri"] - tweet = self.session.twitter.twitter.show_status(id=tweet_id) + try: + tweet = self.session.twitter.twitter.show_status(id=tweet_id) + except TwythonError as e: + utils.twitter_error(e) + return if uri != None: tweet["text"] = twishort.get_full_text(uri) l = tweets.is_long(tweet) while l != False: tweetsList.append(tweet) id = tweets.get_id(l) - tweet = self.session.twitter.twitter.show_status(id=id) + try: + tweet = self.session.twitter.twitter.show_status(id=id) + except TwythonError as e: + utils.twitter_error(e) + continue l = tweets.is_long(tweet) if l == False: tweetsList.append(tweet) diff --git a/src/twitter/utils.py b/src/twitter/utils.py index 8bd7f2b7..55e3a01e 100644 --- a/src/twitter/utils.py +++ b/src/twitter/utils.py @@ -118,3 +118,10 @@ def is_allowed(tweet, clients): allowed = False log.exception("Tuit not allowed: %s" % (tweet["text"],)) return allowed + +def twitter_error(error): + if error.error_code == 403: + msg = _(u"Sorry, you are not authorised to see this status.") + elif error.error_code == 404: + msg = _(u"No status found with that ID") + output.speak(msg) \ No newline at end of file From 4896ebfffd82d289d779e5e630953f3017463512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Mon, 15 Jun 2015 04:56:36 -0500 Subject: [PATCH 4/6] Fixing strings for translation --- src/keystrokeEditor/constants.py | 2 +- src/wxUI/dialogs/configuration.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/keystrokeEditor/constants.py b/src/keystrokeEditor/constants.py index 1fef8931..e208f67b 100644 --- a/src/keystrokeEditor/constants.py +++ b/src/keystrokeEditor/constants.py @@ -20,7 +20,7 @@ actions = { "open_timeline": _(u"Open user timeline"), "remove_buffer": _(u"Destroy buffer"), "interact": _(u"Interact with the currently focused tweet."), -"secondary_interact": _(u"Perform secondary interact action (open URL in browser if Codeofdusk's intelegent audio tweet handlers enabled, play audio if disabled."), +"url": _(u"Open URL"), "volume_up": _(u"Increase volume by 5%"), "volume_down": _(u"Decrease volume by 5%"), "go_home": _(u"Jump to the first element of a buffer"), diff --git a/src/wxUI/dialogs/configuration.py b/src/wxUI/dialogs/configuration.py index c6b6f100..ed115b0a 100644 --- a/src/wxUI/dialogs/configuration.py +++ b/src/wxUI/dialogs/configuration.py @@ -18,11 +18,11 @@ class general(wx.Panel, baseDialog.BaseWXDialog): langBox.Add(language, 0, wx.ALL, 5) langBox.Add(self.language, 0, wx.ALL, 5) sizer.Add(langBox, 0, wx.ALL, 5) - self.ask_at_exit = wx.CheckBox(self, -1, _(U"ask before exiting "+application.name)) + self.ask_at_exit = wx.CheckBox(self, -1, _(U"ask before exiting {0}").format(application.name,)) sizer.Add(self.ask_at_exit, 0, wx.ALL, 5) - self.play_ready_sound = wx.CheckBox(self, -1, _(U"Play a sound when "+application.name+" launches")) + self.play_ready_sound = wx.CheckBox(self, -1, _(U"Play a sound when {0} launches").format(application.name,)) sizer.Add(self.play_ready_sound, 0, wx.ALL, 5) - self.speak_ready_msg = wx.CheckBox(self, -1, _(U"Speak a message when "+application.name+" launches")) + self.speak_ready_msg = wx.CheckBox(self, -1, _(U"Speak a message when {0} launches").format(application.name,)) sizer.Add(self.speak_ready_msg, 0, wx.ALL, 5) self.use_invisible_shorcuts = wx.CheckBox(self, -1, _(u"Use invisible interface's keyboard shortcuts while GUI is visible")) sizer.Add(self.use_invisible_shorcuts, 0, wx.ALL, 5) From cbd9718e5fbb4bd24866be1a763dbb7847550ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Mon, 15 Jun 2015 04:57:22 -0500 Subject: [PATCH 5/6] Improvements for twitter errors handling --- src/twitter/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/twitter/utils.py b/src/twitter/utils.py index 55e3a01e..be478fe0 100644 --- a/src/twitter/utils.py +++ b/src/twitter/utils.py @@ -124,4 +124,6 @@ def twitter_error(error): msg = _(u"Sorry, you are not authorised to see this status.") elif error.error_code == 404: msg = _(u"No status found with that ID") + else: + msg = _(u"Error code {0}").format(error.error_code,) output.speak(msg) \ No newline at end of file From 63d6fa62c46ce1470efa7bbb8366b724e5e01a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Mon, 15 Jun 2015 04:59:23 -0500 Subject: [PATCH 6/6] Fixed an AttributeError in URLSoundPlayer --- src/controller/buffersController.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index 72965887..bfe50be4 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -83,8 +83,6 @@ class bufferController(object): self.session.sound.play("volume_changed.ogg") def interact(self): - if hasattr(sound.URLPlayer,'stream'): - return sound.URLPlayer.stop_audio(delete=True) tweet = self.get_tweet() url=None urls = utils.find_urls(tweet) @@ -264,7 +262,7 @@ class baseBufferController(bufferController): tweet = self.session.twitter.twitter.show_status(id=id) except TwythonError as e: utils.twitter_error(e) - continue + return l = tweets.is_long(tweet) if l == False: tweetsList.append(tweet)